From 7a98e76754c2fd1aa6c9d1c981250ea839c33c3b Mon Sep 17 00:00:00 2001 From: sanshuiyijing Date: Thu, 27 Jun 2024 10:52:24 +0800 Subject: [PATCH] fix: conflict --- pnpm-lock.yaml | 548 +------------------------------------------------ 1 file changed, 4 insertions(+), 544 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e6a32c3..7d7ab57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,10 +25,10 @@ importers: version: 10.2.0 '@testing-library/jest-dom': specifier: ^6.4.6 - version: 6.4.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.8)) + version: 6.4.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.2)) '@testing-library/react': specifier: ^16.0.0 - version: 16.0.0(@testing-library/dom@10.1.0)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 16.0.0(@testing-library/dom@10.2.0)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/jest': specifier: ^29.5.12 version: 29.5.12 @@ -52,7 +52,7 @@ importers: version: 9.0.11 jest: specifier: ^29.7.0 - version: 29.7.0(@types/node@20.14.8) + version: 29.7.0(@types/node@20.14.2) jest-environment-jsdom: specifier: ^29.7.0 version: 29.7.0 @@ -207,9 +207,6 @@ importers: specifier: workspace:^ version: link:../sql-parser devDependencies: - '@codemirror/lang-sql': - specifier: ^6.6.4 - version: 6.6.4(@codemirror/view@6.26.3) '@codemirror/state': specifier: ^6.4.1 version: 6.4.1 @@ -480,21 +477,13 @@ importers: version: 18.3.0 '@typescript-eslint/eslint-plugin': specifier: ^7.2.0 -<<<<<<< HEAD version: 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) -======= - version: 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) ->>>>>>> 3a16082 (feat: cur sql add test case) '@typescript-eslint/parser': specifier: ^7.2.0 version: 7.13.0(eslint@8.57.0)(typescript@5.4.5) '@vitejs/plugin-react': specifier: ^4.2.1 -<<<<<<< HEAD version: 4.3.1(vite@5.3.0(@types/node@20.14.2)) -======= - version: 4.2.1(vite@5.2.0(@types/node@20.14.2)) ->>>>>>> 3a16082 (feat: cur sql add test case) autoprefixer: specifier: ^10.4.19 version: 10.4.19(postcss@8.4.38) @@ -1283,12 +1272,9 @@ packages: '@codemirror/lint@6.8.0': resolution: {integrity: sha512-lsFofvaw0lnPRJlQylNsC4IRt/1lI4OD/yYslrSGVndOJfStc58v+8p9dgGiD90ktOfL7OhBWns1ZETYgz0EJA==} -<<<<<<< HEAD '@codemirror/merge@6.6.3': resolution: {integrity: sha512-sui2Y/qKyvpPs1VJysAC4Q4w9Oe6MQM8LPOLphaQzhP6wfY28Flq/xuaBBUGDRP1Rtu7Ksf6zwdHPLbMn3zuBw==} -======= ->>>>>>> 3a16082 (feat: cur sql add test case) '@codemirror/search@6.5.6': resolution: {integrity: sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==} @@ -1298,255 +1284,140 @@ packages: '@codemirror/view@6.26.3': resolution: {integrity: sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw==} -<<<<<<< HEAD '@esbuild/aix-ppc64@0.21.5': resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} -======= - '@esbuild/aix-ppc64@0.20.2': - resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [ppc64] os: [aix] -<<<<<<< HEAD '@esbuild/android-arm64@0.21.5': resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} -======= - '@esbuild/android-arm64@0.20.2': - resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [arm64] os: [android] -<<<<<<< HEAD '@esbuild/android-arm@0.21.5': resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} -======= - '@esbuild/android-arm@0.20.2': - resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [arm] os: [android] -<<<<<<< HEAD '@esbuild/android-x64@0.21.5': resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} -======= - '@esbuild/android-x64@0.20.2': - resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [x64] os: [android] -<<<<<<< HEAD '@esbuild/darwin-arm64@0.21.5': resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} -======= - '@esbuild/darwin-arm64@0.20.2': - resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [arm64] os: [darwin] -<<<<<<< HEAD '@esbuild/darwin-x64@0.21.5': resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} -======= - '@esbuild/darwin-x64@0.20.2': - resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [x64] os: [darwin] -<<<<<<< HEAD '@esbuild/freebsd-arm64@0.21.5': resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} -======= - '@esbuild/freebsd-arm64@0.20.2': - resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [arm64] os: [freebsd] -<<<<<<< HEAD '@esbuild/freebsd-x64@0.21.5': resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} -======= - '@esbuild/freebsd-x64@0.20.2': - resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [x64] os: [freebsd] -<<<<<<< HEAD '@esbuild/linux-arm64@0.21.5': resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} -======= - '@esbuild/linux-arm64@0.20.2': - resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [arm64] os: [linux] -<<<<<<< HEAD '@esbuild/linux-arm@0.21.5': resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} -======= - '@esbuild/linux-arm@0.20.2': - resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [arm] os: [linux] -<<<<<<< HEAD '@esbuild/linux-ia32@0.21.5': resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} -======= - '@esbuild/linux-ia32@0.20.2': - resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [ia32] os: [linux] -<<<<<<< HEAD '@esbuild/linux-loong64@0.21.5': resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} -======= - '@esbuild/linux-loong64@0.20.2': - resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [loong64] os: [linux] -<<<<<<< HEAD '@esbuild/linux-mips64el@0.21.5': resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} -======= - '@esbuild/linux-mips64el@0.20.2': - resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [mips64el] os: [linux] -<<<<<<< HEAD '@esbuild/linux-ppc64@0.21.5': resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} -======= - '@esbuild/linux-ppc64@0.20.2': - resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [ppc64] os: [linux] -<<<<<<< HEAD '@esbuild/linux-riscv64@0.21.5': resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} -======= - '@esbuild/linux-riscv64@0.20.2': - resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [riscv64] os: [linux] -<<<<<<< HEAD '@esbuild/linux-s390x@0.21.5': resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} -======= - '@esbuild/linux-s390x@0.20.2': - resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [s390x] os: [linux] -<<<<<<< HEAD '@esbuild/linux-x64@0.21.5': resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} -======= - '@esbuild/linux-x64@0.20.2': - resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [x64] os: [linux] -<<<<<<< HEAD '@esbuild/netbsd-x64@0.21.5': resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} -======= - '@esbuild/netbsd-x64@0.20.2': - resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [x64] os: [netbsd] -<<<<<<< HEAD '@esbuild/openbsd-x64@0.21.5': resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} -======= - '@esbuild/openbsd-x64@0.20.2': - resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [x64] os: [openbsd] -<<<<<<< HEAD '@esbuild/sunos-x64@0.21.5': resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} -======= - '@esbuild/sunos-x64@0.20.2': - resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [x64] os: [sunos] -<<<<<<< HEAD '@esbuild/win32-arm64@0.21.5': resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} -======= - '@esbuild/win32-arm64@0.20.2': - resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [arm64] os: [win32] -<<<<<<< HEAD '@esbuild/win32-ia32@0.21.5': resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} -======= - '@esbuild/win32-ia32@0.20.2': - resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [ia32] os: [win32] -<<<<<<< HEAD '@esbuild/win32-x64@0.21.5': resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} -======= - '@esbuild/win32-x64@0.20.2': - resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -1585,7 +1456,6 @@ packages: resolution: {integrity: sha512-HAbhAYKfsAC2EkTqve00ibWIZlaU74Z1EHwAjYr4PXF0YU2VEA1zSIKSSpKszRLRWwHzzRZXvK632u+uXzvsvw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} -<<<<<<< HEAD '@floating-ui/core@1.6.2': resolution: {integrity: sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg==} @@ -1594,27 +1464,12 @@ packages: '@floating-ui/react-dom@2.1.0': resolution: {integrity: sha512-lNzj5EQmEKn5FFKc04+zasr09h/uX8RtJRNj5gUXsSQIXHVWTVh+hVAg1vOMCexkX8EgvemMvIFpQfkosnVNyA==} -======= - '@floating-ui/core@1.6.3': - resolution: {integrity: sha512-1ZpCvYf788/ZXOhRQGFxnYQOVgeU+pi0i+d0Ow34La7qjIXETi6RNswGVKkA6KcDO8/+Ysu2E/CeUmmeEBDvTg==} - - '@floating-ui/dom@1.6.6': - resolution: {integrity: sha512-qiTYajAnh3P+38kECeffMSQgbvXty2VB6rS+42iWR4FPIlZjLK84E9qtLnMTLIpPz2znD/TaFqaiavMUrS+Hcw==} - - '@floating-ui/react-dom@2.1.1': - resolution: {integrity: sha512-4h84MJt3CHrtG18mGsXuLCHMrug49d7DFkU0RMIyshRveBeyV2hmV/pDaF2Uxtu8kgq5r46llp5E5FQiR0K2Yg==} ->>>>>>> 3a16082 (feat: cur sql add test case) peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' -<<<<<<< HEAD '@floating-ui/utils@0.2.2': resolution: {integrity: sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==} -======= - '@floating-ui/utils@0.2.3': - resolution: {integrity: sha512-XGndio0l5/Gvd6CLIABvsav9HHezgDFFhDfHk1bvLfr9ni8dojqLSvBbotJEjmIwNHL7vK4QzBJTdBRoB+c1ww==} ->>>>>>> 3a16082 (feat: cur sql add test case) '@humanwhocodes/config-array@0.11.14': resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} @@ -2320,13 +2175,8 @@ packages: peerDependencies: react: ^18.0.0 -<<<<<<< HEAD '@testing-library/dom@10.2.0': resolution: {integrity: sha512-CytIvb6tVOADRngTHGWNxH8LPgO/3hi/BdCEHOf7Qd2GvZVClhVP0Wo/QHzWhpki49Bk0b4VT6xpt3fx8HTSIw==} -======= - '@testing-library/dom@10.1.0': - resolution: {integrity: sha512-wdsYKy5zupPyLCW2Je5DLHSxSfbIp6h80WoHOQc+RPtmPGA52O9x5MJEkv92Sjonpq+poOAtUKhh1kBGAXBrNA==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=18'} '@testing-library/jest-dom@6.4.6': @@ -2405,12 +2255,6 @@ packages: '@types/jsdom@20.0.1': resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==} -<<<<<<< HEAD -======= - '@types/json-schema@7.0.15': - resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - ->>>>>>> 3a16082 (feat: cur sql add test case) '@types/minimist@1.2.5': resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==} @@ -2420,12 +2264,6 @@ packages: '@types/node@20.14.2': resolution: {integrity: sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==} -<<<<<<< HEAD -======= - '@types/node@20.14.8': - resolution: {integrity: sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==} - ->>>>>>> 3a16082 (feat: cur sql add test case) '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -2453,15 +2291,9 @@ packages: '@types/yargs@17.0.32': resolution: {integrity: sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==} -<<<<<<< HEAD '@typescript-eslint/eslint-plugin@7.13.0': resolution: {integrity: sha512-FX1X6AF0w8MdVFLSdqwqN/me2hyhuQg4ykN6ZpVhh1ij/80pTvDKclX1sZB9iqex8SjQfVhwMKs3JtnnMLzG9w==} engines: {node: ^18.18.0 || >=20.0.0} -======= - '@typescript-eslint/eslint-plugin@7.2.0': - resolution: {integrity: sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==} - engines: {node: ^16.0.0 || >=18.0.0} ->>>>>>> 3a16082 (feat: cur sql add test case) peerDependencies: '@typescript-eslint/parser': ^7.0.0 eslint: ^8.56.0 @@ -2470,15 +2302,9 @@ packages: typescript: optional: true -<<<<<<< HEAD '@typescript-eslint/parser@7.13.0': resolution: {integrity: sha512-EjMfl69KOS9awXXe83iRN7oIEXy9yYdqWfqdrFAYAAr6syP8eLEFI7ZE4939antx2mNgPRW/o1ybm2SFYkbTVA==} engines: {node: ^18.18.0 || >=20.0.0} -======= - '@typescript-eslint/parser@7.2.0': - resolution: {integrity: sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==} - engines: {node: ^16.0.0 || >=18.0.0} ->>>>>>> 3a16082 (feat: cur sql add test case) peerDependencies: eslint: ^8.56.0 typescript: '*' @@ -2486,7 +2312,6 @@ packages: typescript: optional: true -<<<<<<< HEAD '@typescript-eslint/scope-manager@7.13.0': resolution: {integrity: sha512-ZrMCe1R6a01T94ilV13egvcnvVJ1pxShkE0+NDjDzH4nvG1wXpwsVI5bZCvE7AEDH1mXEx5tJSVR68bLgG7Dng==} engines: {node: ^18.18.0 || >=20.0.0} @@ -2494,15 +2319,6 @@ packages: '@typescript-eslint/type-utils@7.13.0': resolution: {integrity: sha512-xMEtMzxq9eRkZy48XuxlBFzpVMDurUAfDu5Rz16GouAtXm0TaAoTFzqWUFPPuQYXI/CDaH/Bgx/fk/84t/Bc9A==} engines: {node: ^18.18.0 || >=20.0.0} -======= - '@typescript-eslint/scope-manager@7.2.0': - resolution: {integrity: sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==} - engines: {node: ^16.0.0 || >=18.0.0} - - '@typescript-eslint/type-utils@7.2.0': - resolution: {integrity: sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==} - engines: {node: ^16.0.0 || >=18.0.0} ->>>>>>> 3a16082 (feat: cur sql add test case) peerDependencies: eslint: ^8.56.0 typescript: '*' @@ -2510,7 +2326,6 @@ packages: typescript: optional: true -<<<<<<< HEAD '@typescript-eslint/types@7.13.0': resolution: {integrity: sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==} engines: {node: ^18.18.0 || >=20.0.0} @@ -2518,22 +2333,12 @@ packages: '@typescript-eslint/typescript-estree@7.13.0': resolution: {integrity: sha512-cAvBvUoobaoIcoqox1YatXOnSl3gx92rCZoMRPzMNisDiM12siGilSM4+dJAekuuHTibI2hVC2fYK79iSFvWjw==} engines: {node: ^18.18.0 || >=20.0.0} -======= - '@typescript-eslint/types@7.2.0': - resolution: {integrity: sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==} - engines: {node: ^16.0.0 || >=18.0.0} - - '@typescript-eslint/typescript-estree@7.2.0': - resolution: {integrity: sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==} - engines: {node: ^16.0.0 || >=18.0.0} ->>>>>>> 3a16082 (feat: cur sql add test case) peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true -<<<<<<< HEAD '@typescript-eslint/utils@7.13.0': resolution: {integrity: sha512-jceD8RgdKORVnB4Y6BqasfIkFhl4pajB1wVxrF4akxD2QPM8GNYjgGwEzYS+437ewlqqrg7Dw+6dhdpjMpeBFQ==} engines: {node: ^18.18.0 || >=20.0.0} @@ -2543,28 +2348,12 @@ packages: '@typescript-eslint/visitor-keys@7.13.0': resolution: {integrity: sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==} engines: {node: ^18.18.0 || >=20.0.0} -======= - '@typescript-eslint/utils@7.2.0': - resolution: {integrity: sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^8.56.0 - - '@typescript-eslint/visitor-keys@7.2.0': - resolution: {integrity: sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==} - engines: {node: ^16.0.0 || >=18.0.0} ->>>>>>> 3a16082 (feat: cur sql add test case) '@ungap/structured-clone@1.2.0': resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} -<<<<<<< HEAD '@vitejs/plugin-react@4.3.1': resolution: {integrity: sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==} -======= - '@vitejs/plugin-react@4.2.1': - resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.2.0 || ^5.0.0 @@ -2789,13 +2578,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} -<<<<<<< HEAD caniuse-lite@1.0.30001633: resolution: {integrity: sha512-6sT0yf/z5jqf8tISAgpJDrmwOpLsrpnyCdD/lOZKvKkkJK4Dn0X5i7KF7THEZhOq+30bmhwBlNEaqPUiHiKtZg==} -======= - caniuse-lite@1.0.30001636: - resolution: {integrity: sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==} ->>>>>>> 3a16082 (feat: cur sql add test case) chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -3079,13 +2863,8 @@ packages: eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} -<<<<<<< HEAD electron-to-chromium@1.4.802: resolution: {integrity: sha512-TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA==} -======= - electron-to-chromium@1.4.805: - resolution: {integrity: sha512-8W4UJwX/w9T0QSzINJckTKG6CYpAUTqsaWcWIsdud3I1FYJcMgW9QqT1/4CBff/pP/TihWh13OmiyY8neto6vw==} ->>>>>>> 3a16082 (feat: cur sql add test case) emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} @@ -3138,13 +2917,8 @@ packages: resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} engines: {node: '>= 0.4'} -<<<<<<< HEAD esbuild@0.21.5: resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} -======= - esbuild@0.20.2: - resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=12'} hasBin: true @@ -3169,24 +2943,14 @@ packages: engines: {node: '>=6.0'} hasBin: true -<<<<<<< HEAD eslint-plugin-react-hooks@4.6.2: resolution: {integrity: sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==} -======= - eslint-plugin-react-hooks@4.6.0: - resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=10'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 -<<<<<<< HEAD eslint-plugin-react-refresh@0.4.7: resolution: {integrity: sha512-yrj+KInFmwuQS2UQcg1SF83ha1tuHC1jMQbRNyuWtlEzzKRDgAl7L4Yp4NlDUZTZNlWvHEzOtJhMi40R7JxcSw==} -======= - eslint-plugin-react-refresh@0.4.6: - resolution: {integrity: sha512-NjGXdm7zgcKRkKMua34qVO9doI7VOxZ6ancSvBELJSSoX97jyndXcSoa8XBh69JoB31dNz3EEzlMcizZl7LaMA==} ->>>>>>> 3a16082 (feat: cur sql add test case) peerDependencies: eslint: '>=7' @@ -3330,13 +3094,8 @@ packages: for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} -<<<<<<< HEAD foreground-child@3.2.0: resolution: {integrity: sha512-CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA==} -======= - foreground-child@3.2.1: - resolution: {integrity: sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=14'} form-data@4.0.0: @@ -3416,13 +3175,8 @@ packages: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} -<<<<<<< HEAD glob@10.4.1: resolution: {integrity: sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==} -======= - glob@10.4.2: - resolution: {integrity: sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=16 || 14 >=14.18'} hasBin: true @@ -4059,13 +3813,6 @@ packages: minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} -<<<<<<< HEAD -======= - minimatch@9.0.3: - resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} - engines: {node: '>=16 || 14 >=14.17'} - ->>>>>>> 3a16082 (feat: cur sql add test case) minimatch@9.0.4: resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==} engines: {node: '>=16 || 14 >=14.17'} @@ -4193,12 +3940,6 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} -<<<<<<< HEAD -======= - package-json-from-dist@1.0.0: - resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==} - ->>>>>>> 3a16082 (feat: cur sql add test case) parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -4937,25 +4678,15 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} -<<<<<<< HEAD v8-to-istanbul@9.3.0: resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==} -======= - v8-to-istanbul@9.2.0: - resolution: {integrity: sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: '>=10.12.0'} validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} -<<<<<<< HEAD vite@5.3.0: resolution: {integrity: sha512-hA6vAVK977NyW1Qw+fLvqSo7xDPej7von7C3DwwqPRmnnnK36XEBC/J3j1V5lP8fbt7y0TgTKJbpNGSwM+Bdeg==} -======= - vite@5.2.0: - resolution: {integrity: sha512-xMSLJNEjNk/3DJRgWlPADDwaU9AgYRodDH2t6oENhJnIlmU9Hx1Q6VpjyXua/JdMw1WJRbnAgHJ9xgET9gnIAg==} ->>>>>>> 3a16082 (feat: cur sql add test case) engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -6183,7 +5914,6 @@ snapshots: '@codemirror/view': 6.26.3 crelt: 1.0.6 -<<<<<<< HEAD '@codemirror/merge@6.6.3': dependencies: '@codemirror/language': 6.10.2 @@ -6192,8 +5922,6 @@ snapshots: '@lezer/highlight': 1.2.0 style-mod: 4.1.2 -======= ->>>>>>> 3a16082 (feat: cur sql add test case) '@codemirror/search@6.5.6': dependencies: '@codemirror/state': 6.4.1 @@ -6208,7 +5936,6 @@ snapshots: style-mod: 4.1.2 w3c-keyname: 2.2.8 -<<<<<<< HEAD '@esbuild/aix-ppc64@0.21.5': optional: true @@ -6276,75 +6003,6 @@ snapshots: optional: true '@esbuild/win32-x64@0.21.5': -======= - '@esbuild/aix-ppc64@0.20.2': - optional: true - - '@esbuild/android-arm64@0.20.2': - optional: true - - '@esbuild/android-arm@0.20.2': - optional: true - - '@esbuild/android-x64@0.20.2': - optional: true - - '@esbuild/darwin-arm64@0.20.2': - optional: true - - '@esbuild/darwin-x64@0.20.2': - optional: true - - '@esbuild/freebsd-arm64@0.20.2': - optional: true - - '@esbuild/freebsd-x64@0.20.2': - optional: true - - '@esbuild/linux-arm64@0.20.2': - optional: true - - '@esbuild/linux-arm@0.20.2': - optional: true - - '@esbuild/linux-ia32@0.20.2': - optional: true - - '@esbuild/linux-loong64@0.20.2': - optional: true - - '@esbuild/linux-mips64el@0.20.2': - optional: true - - '@esbuild/linux-ppc64@0.20.2': - optional: true - - '@esbuild/linux-riscv64@0.20.2': - optional: true - - '@esbuild/linux-s390x@0.20.2': - optional: true - - '@esbuild/linux-x64@0.20.2': - optional: true - - '@esbuild/netbsd-x64@0.20.2': - optional: true - - '@esbuild/openbsd-x64@0.20.2': - optional: true - - '@esbuild/sunos-x64@0.20.2': - optional: true - - '@esbuild/win32-arm64@0.20.2': - optional: true - - '@esbuild/win32-ia32@0.20.2': - optional: true - - '@esbuild/win32-x64@0.20.2': ->>>>>>> 3a16082 (feat: cur sql add test case) optional: true '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)': @@ -6401,7 +6059,6 @@ snapshots: '@eslint/object-schema@2.1.3': {} -<<<<<<< HEAD '@floating-ui/core@1.6.2': dependencies: '@floating-ui/utils': 0.2.2 @@ -6412,28 +6069,12 @@ snapshots: '@floating-ui/utils': 0.2.2 '@floating-ui/react-dom@2.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': -======= - '@floating-ui/core@1.6.3': - dependencies: - '@floating-ui/utils': 0.2.3 - - '@floating-ui/dom@1.6.6': - dependencies: - '@floating-ui/core': 1.6.3 - '@floating-ui/utils': 0.2.3 - - '@floating-ui/react-dom@2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@floating-ui/dom': 1.6.5 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) -<<<<<<< HEAD '@floating-ui/utils@0.2.2': {} -======= - '@floating-ui/utils@0.2.3': {} ->>>>>>> 3a16082 (feat: cur sql add test case) '@humanwhocodes/config-array@0.11.14': dependencies: @@ -6937,11 +6578,7 @@ snapshots: '@radix-ui/react-popper@1.1.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.7 -<<<<<<< HEAD '@floating-ui/react-dom': 2.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - '@floating-ui/react-dom': 2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> 3a16082 (feat: cur sql add test case) '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.3)(react@18.3.1) '@radix-ui/react-context': 1.0.1(@types/react@18.3.3)(react@18.3.1) @@ -7208,11 +6845,7 @@ snapshots: '@tanstack/query-core': 5.45.0 react: 18.3.1 -<<<<<<< HEAD '@testing-library/dom@10.2.0': -======= - '@testing-library/dom@10.1.0': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@babel/code-frame': 7.24.7 '@babel/runtime': 7.24.7 @@ -7223,11 +6856,7 @@ snapshots: lz-string: 1.5.0 pretty-format: 27.5.1 -<<<<<<< HEAD '@testing-library/jest-dom@6.4.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.2))': -======= - '@testing-library/jest-dom@6.4.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.8))': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@adobe/css-tools': 4.4.0 '@babel/runtime': 7.24.7 @@ -7240,21 +6869,12 @@ snapshots: optionalDependencies: '@jest/globals': 29.7.0 '@types/jest': 29.5.12 -<<<<<<< HEAD jest: 29.7.0(@types/node@20.14.2) '@testing-library/react@16.0.0(@testing-library/dom@10.2.0)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.7 '@testing-library/dom': 10.2.0 -======= - jest: 29.7.0(@types/node@20.14.8) - - '@testing-library/react@16.0.0(@testing-library/dom@10.1.0)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.7 - '@testing-library/dom': 10.1.0 ->>>>>>> 3a16082 (feat: cur sql add test case) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: @@ -7290,11 +6910,7 @@ snapshots: '@types/graceful-fs@4.1.9': dependencies: -<<<<<<< HEAD '@types/node': 20.14.2 -======= - '@types/node': 20.14.8 ->>>>>>> 3a16082 (feat: cur sql add test case) '@types/istanbul-lib-coverage@2.0.6': {} @@ -7316,16 +6932,6 @@ snapshots: '@types/node': 20.14.2 '@types/tough-cookie': 4.0.5 parse5: 7.1.2 -<<<<<<< HEAD - - '@types/minimist@1.2.5': {} - - '@types/node@12.20.55': {} - - '@types/node@20.14.2': -======= - - '@types/json-schema@7.0.15': {} '@types/minimist@1.2.5': {} @@ -7335,11 +6941,6 @@ snapshots: dependencies: undici-types: 5.26.5 - '@types/node@20.14.8': ->>>>>>> 3a16082 (feat: cur sql add test case) - dependencies: - undici-types: 5.26.5 - '@types/normalize-package-data@2.4.4': {} '@types/prop-types@15.7.12': {} @@ -7365,11 +6966,7 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 -<<<<<<< HEAD '@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': -======= - '@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@eslint-community/regexpp': 4.10.1 '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@5.4.5) @@ -7387,11 +6984,7 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5)': -======= - '@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5)': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/types': 7.13.0 @@ -7404,21 +6997,12 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@typescript-eslint/scope-manager@7.13.0': dependencies: '@typescript-eslint/types': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.0 '@typescript-eslint/type-utils@7.13.0(eslint@8.57.0)(typescript@5.4.5)': -======= - '@typescript-eslint/scope-manager@7.2.0': - dependencies: - '@typescript-eslint/types': 7.2.0 - '@typescript-eslint/visitor-keys': 7.2.0 - - '@typescript-eslint/type-utils@7.2.0(eslint@8.57.0)(typescript@5.4.5)': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.4.5) '@typescript-eslint/utils': 7.13.0(eslint@8.57.0)(typescript@5.4.5) @@ -7430,15 +7014,9 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@typescript-eslint/types@7.13.0': {} '@typescript-eslint/typescript-estree@7.13.0(typescript@5.4.5)': -======= - '@typescript-eslint/types@7.2.0': {} - - '@typescript-eslint/typescript-estree@7.2.0(typescript@5.4.5)': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@typescript-eslint/types': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.0 @@ -7453,11 +7031,7 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@typescript-eslint/utils@7.13.0(eslint@8.57.0)(typescript@5.4.5)': -======= - '@typescript-eslint/utils@7.2.0(eslint@8.57.0)(typescript@5.4.5)': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@typescript-eslint/scope-manager': 7.13.0 @@ -7468,24 +7042,14 @@ snapshots: - supports-color - typescript -<<<<<<< HEAD '@typescript-eslint/visitor-keys@7.13.0': dependencies: '@typescript-eslint/types': 7.13.0 -======= - '@typescript-eslint/visitor-keys@7.2.0': - dependencies: - '@typescript-eslint/types': 7.2.0 ->>>>>>> 3a16082 (feat: cur sql add test case) eslint-visitor-keys: 3.4.3 '@ungap/structured-clone@1.2.0': {} -<<<<<<< HEAD '@vitejs/plugin-react@4.3.1(vite@5.3.0(@types/node@20.14.2))': -======= - '@vitejs/plugin-react@4.2.1(vite@5.2.0(@types/node@20.14.2))': ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@babel/core': 7.24.7 '@babel/plugin-transform-react-jsx-self': 7.24.7(@babel/core@7.24.7) @@ -7752,11 +7316,7 @@ snapshots: camelcase@6.3.0: {} -<<<<<<< HEAD caniuse-lite@1.0.30001633: {} -======= - caniuse-lite@1.0.30001636: {} ->>>>>>> 3a16082 (feat: cur sql add test case) chalk@2.4.2: dependencies: @@ -7873,11 +7433,7 @@ snapshots: dependencies: browserslist: 4.23.1 -<<<<<<< HEAD create-jest@29.7.0(@types/node@20.14.2): -======= - create-jest@29.7.0(@types/node@20.14.8): ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@jest/types': 29.6.3 chalk: 4.1.2 @@ -8032,11 +7588,7 @@ snapshots: eastasianwidth@0.2.0: {} -<<<<<<< HEAD electron-to-chromium@1.4.802: {} -======= - electron-to-chromium@1.4.805: {} ->>>>>>> 3a16082 (feat: cur sql add test case) emittery@0.13.1: {} @@ -8132,7 +7684,6 @@ snapshots: is-date-object: 1.0.5 is-symbol: 1.0.4 -<<<<<<< HEAD esbuild@0.21.5: optionalDependencies: '@esbuild/aix-ppc64': 0.21.5 @@ -8158,33 +7709,6 @@ snapshots: '@esbuild/win32-arm64': 0.21.5 '@esbuild/win32-ia32': 0.21.5 '@esbuild/win32-x64': 0.21.5 -======= - esbuild@0.20.2: - optionalDependencies: - '@esbuild/aix-ppc64': 0.20.2 - '@esbuild/android-arm': 0.20.2 - '@esbuild/android-arm64': 0.20.2 - '@esbuild/android-x64': 0.20.2 - '@esbuild/darwin-arm64': 0.20.2 - '@esbuild/darwin-x64': 0.20.2 - '@esbuild/freebsd-arm64': 0.20.2 - '@esbuild/freebsd-x64': 0.20.2 - '@esbuild/linux-arm': 0.20.2 - '@esbuild/linux-arm64': 0.20.2 - '@esbuild/linux-ia32': 0.20.2 - '@esbuild/linux-loong64': 0.20.2 - '@esbuild/linux-mips64el': 0.20.2 - '@esbuild/linux-ppc64': 0.20.2 - '@esbuild/linux-riscv64': 0.20.2 - '@esbuild/linux-s390x': 0.20.2 - '@esbuild/linux-x64': 0.20.2 - '@esbuild/netbsd-x64': 0.20.2 - '@esbuild/openbsd-x64': 0.20.2 - '@esbuild/sunos-x64': 0.20.2 - '@esbuild/win32-arm64': 0.20.2 - '@esbuild/win32-ia32': 0.20.2 - '@esbuild/win32-x64': 0.20.2 ->>>>>>> 3a16082 (feat: cur sql add test case) escalade@3.1.2: {} @@ -8202,19 +7726,11 @@ snapshots: optionalDependencies: source-map: 0.6.1 -<<<<<<< HEAD eslint-plugin-react-hooks@4.6.2(eslint@8.57.0): dependencies: eslint: 8.57.0 eslint-plugin-react-refresh@0.4.7(eslint@8.57.0): -======= - eslint-plugin-react-hooks@4.6.0(eslint@8.57.0): - dependencies: - eslint: 8.57.0 - - eslint-plugin-react-refresh@0.4.6(eslint@8.57.0): ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: eslint: 8.57.0 @@ -8452,11 +7968,7 @@ snapshots: dependencies: is-callable: 1.2.7 -<<<<<<< HEAD foreground-child@3.2.0: -======= - foreground-child@3.2.1: ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: cross-spawn: 7.0.3 signal-exit: 4.1.0 @@ -8533,11 +8045,7 @@ snapshots: dependencies: is-glob: 4.0.3 -<<<<<<< HEAD glob@10.4.1: -======= - glob@10.4.2: ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: foreground-child: 3.2.0 jackspeak: 3.4.0 @@ -8864,21 +8372,13 @@ snapshots: - babel-plugin-macros - supports-color -<<<<<<< HEAD jest-cli@29.7.0(@types/node@20.14.2): -======= - jest-cli@29.7.0(@types/node@20.14.8): ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@jest/core': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 -<<<<<<< HEAD create-jest: 29.7.0(@types/node@20.14.2) -======= - create-jest: 29.7.0(@types/node@20.14.8) ->>>>>>> 3a16082 (feat: cur sql add test case) exit: 0.1.2 import-local: 3.1.0 jest-config: 29.7.0(@types/node@20.14.2) @@ -8891,11 +8391,7 @@ snapshots: - supports-color - ts-node -<<<<<<< HEAD jest-config@29.7.0(@types/node@20.14.2): -======= - jest-config@29.7.0(@types/node@20.14.8): ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@babel/core': 7.24.7 '@jest/test-sequencer': 29.7.0 @@ -8920,11 +8416,7 @@ snapshots: slash: 3.0.0 strip-json-comments: 3.1.1 optionalDependencies: -<<<<<<< HEAD '@types/node': 20.14.2 -======= - '@types/node': 20.14.8 ->>>>>>> 3a16082 (feat: cur sql add test case) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -9159,20 +8651,12 @@ snapshots: merge-stream: 2.0.0 supports-color: 8.1.1 -<<<<<<< HEAD jest@29.7.0(@types/node@20.14.2): -======= - jest@29.7.0(@types/node@20.14.8): ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@jest/core': 29.7.0 '@jest/types': 29.6.3 import-local: 3.1.0 -<<<<<<< HEAD jest-cli: 29.7.0(@types/node@20.14.2) -======= - jest-cli: 29.7.0(@types/node@20.14.8) ->>>>>>> 3a16082 (feat: cur sql add test case) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -9388,13 +8872,6 @@ snapshots: minimatch@3.1.2: dependencies: brace-expansion: 1.1.11 -<<<<<<< HEAD -======= - - minimatch@9.0.3: - dependencies: - brace-expansion: 2.0.1 ->>>>>>> 3a16082 (feat: cur sql add test case) minimatch@9.0.4: dependencies: @@ -9508,16 +8985,9 @@ snapshots: p-limit: 3.1.0 p-map@2.1.0: {} -<<<<<<< HEAD - - p-try@2.2.0: {} -======= p-try@2.2.0: {} - package-json-from-dist@1.0.0: {} ->>>>>>> 3a16082 (feat: cur sql add test case) - parent-module@1.0.1: dependencies: callsites: 3.1.0 @@ -10261,11 +9731,7 @@ snapshots: util-deprecate@1.0.2: {} -<<<<<<< HEAD v8-to-istanbul@9.3.0: -======= - v8-to-istanbul@9.2.0: ->>>>>>> 3a16082 (feat: cur sql add test case) dependencies: '@jridgewell/trace-mapping': 0.3.25 '@types/istanbul-lib-coverage': 2.0.6 @@ -10276,15 +9742,9 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 -<<<<<<< HEAD vite@5.3.0(@types/node@20.14.2): dependencies: esbuild: 0.21.5 -======= - vite@5.2.0(@types/node@20.14.2): - dependencies: - esbuild: 0.20.2 ->>>>>>> 3a16082 (feat: cur sql add test case) postcss: 8.4.38 rollup: 4.18.0 optionalDependencies: @@ -10429,4 +9889,4 @@ snapshots: y18n: 5.0.8 yargs-parser: 21.1.1 - yocto-queue@0.1.0: {} + yocto-queue@0.1.0: {} \ No newline at end of file