From d4d21ec78d690e7f5fa061619f342e92e027d824 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:49:42 +0000 Subject: [PATCH 1/7] fix(deps): update dependency @nextui-org/select to v2.2.5 --- _old/package-lock.json | 542 ++++++++++++++++++++++++++++++++++------- 1 file changed, 456 insertions(+), 86 deletions(-) diff --git a/_old/package-lock.json b/_old/package-lock.json index e7515f58..d3ae20a0 100644 --- a/_old/package-lock.json +++ b/_old/package-lock.json @@ -46,8 +46,8 @@ "@nextui-org/input": "^2.2.2", "@nextui-org/link": "^2.0.32", "@nextui-org/modal": "^2.0.36", - "@nextui-org/pagination": "^2.0.35", - "@nextui-org/select": "^2.2.2", + "@nextui-org/pagination": "^2.0.33", + "@nextui-org/select": "^2.2.5", "@nextui-org/skeleton": "^2.0.29", "@nextui-org/spinner": "^2.0.30", "@nextui-org/switch": "^2.0.31", @@ -5466,13 +5466,15 @@ } }, "node_modules/@nextui-org/divider": { - "version": "2.0.28", + "version": "2.0.31", + "resolved": "https://registry.npmjs.org/@nextui-org/divider/-/divider-2.0.31.tgz", + "integrity": "sha512-z9GhrpmhXhJGuW0GSO1OP01mwDTSItuIRIz0VGpKOPVTqOzOMHkXN978wgNXqJ+knWZcaiF7WHvd83O05jmbkg==", "license": "MIT", "dependencies": { - "@nextui-org/react-rsc-utils": "2.0.12", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/system-rsc": "2.1.2", - "@react-types/shared": "3.22.1" + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/system-rsc": "2.1.5", + "@react-types/shared": "3.23.1" }, "peerDependencies": { "@nextui-org/theme": ">=2.1.0", @@ -5480,11 +5482,39 @@ "react-dom": ">=18" } }, - "node_modules/@nextui-org/divider/node_modules/@react-types/shared": { - "version": "3.22.1", - "license": "Apache-2.0", + "node_modules/@nextui-org/divider/node_modules/@nextui-org/react-rsc-utils": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@nextui-org/react-rsc-utils/-/react-rsc-utils-2.0.13.tgz", + "integrity": "sha512-QewsXtoQlMsR9stThdazKEImg9oyZkPLs7wsymhrzh6/HdQCl9bTdb6tJcROg4vg5LRYKGG11USSQO2nKlfCcQ==", + "license": "MIT" + }, + "node_modules/@nextui-org/divider/node_modules/@nextui-org/shared-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-utils/-/shared-utils-2.0.7.tgz", + "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", + "license": "MIT" + }, + "node_modules/@nextui-org/divider/node_modules/@nextui-org/system-rsc": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system-rsc/-/system-rsc-2.1.5.tgz", + "integrity": "sha512-tkJLAyJu34Rr5KUMMqoB7cZjOVXB+7a/7N4ushZfuiLdoYijgmcXFMzLxjm+tbt9zA5AV+ivsfbHvscg77dJ6w==", + "license": "MIT", + "dependencies": { + "@react-types/shared": "3.23.1", + "clsx": "^1.2.1" + }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "@nextui-org/theme": ">=2.1.0", + "react": ">=18" + } + }, + "node_modules/@nextui-org/divider/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "license": "MIT", + "engines": { + "node": ">=6" } }, "node_modules/@nextui-org/framer-utils": { @@ -5582,14 +5612,16 @@ "license": "MIT" }, "node_modules/@nextui-org/listbox": { - "version": "2.1.22", + "version": "2.1.25", + "resolved": "https://registry.npmjs.org/@nextui-org/listbox/-/listbox-2.1.25.tgz", + "integrity": "sha512-WJqxhzPxADLIsenREaaoQ44bs3gQx5yqOvK86Jkiv/m9nXr0YuxZOJEsVa5GenkmyJBrEd6LkBV5cZ1TGNzbJw==", "license": "MIT", "dependencies": { - "@nextui-org/aria-utils": "2.0.21", - "@nextui-org/divider": "2.0.28", - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/use-is-mobile": "2.0.8", + "@nextui-org/aria-utils": "2.0.24", + "@nextui-org/divider": "2.0.31", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/use-is-mobile": "2.0.9", "@react-aria/focus": "3.17.1", "@react-aria/interactions": "3.21.3", "@react-aria/listbox": "3.12.1", @@ -5605,6 +5637,94 @@ "react-dom": ">=18" } }, + "node_modules/@nextui-org/listbox/node_modules/@nextui-org/aria-utils": { + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@nextui-org/aria-utils/-/aria-utils-2.0.24.tgz", + "integrity": "sha512-YD+YvT01zFqN1Ey137OeFl9SEhAYf2BoZz+ykWiIJlMjl/LY1d5WE0nkzsjMHh6MV3HgS6CExxlf7TuApN6Piw==", + "license": "MIT", + "dependencies": { + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/system": "2.2.5", + "@react-aria/utils": "3.24.1", + "@react-stately/collections": "3.10.7", + "@react-stately/overlays": "3.6.7", + "@react-types/overlays": "3.8.7", + "@react-types/shared": "3.23.1" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/@nextui-org/listbox/node_modules/@nextui-org/aria-utils/node_modules/@nextui-org/system": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system/-/system-2.2.5.tgz", + "integrity": "sha512-nrX6768aiyWtpxX3OTFBIVWR+v9nlMsC3KaBinNfek97sNm7gAfTHi7q5kylE3L5yIMpNG+DclAKpuxgDQEmvw==", + "license": "MIT", + "dependencies": { + "@internationalized/date": "^3.5.4", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/system-rsc": "2.1.5", + "@react-aria/i18n": "3.11.1", + "@react-aria/overlays": "3.22.1", + "@react-aria/utils": "3.24.1", + "@react-stately/utils": "3.10.1" + }, + "peerDependencies": { + "framer-motion": ">=10.17.0", + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/@nextui-org/listbox/node_modules/@nextui-org/react-rsc-utils": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@nextui-org/react-rsc-utils/-/react-rsc-utils-2.0.13.tgz", + "integrity": "sha512-QewsXtoQlMsR9stThdazKEImg9oyZkPLs7wsymhrzh6/HdQCl9bTdb6tJcROg4vg5LRYKGG11USSQO2nKlfCcQ==", + "license": "MIT" + }, + "node_modules/@nextui-org/listbox/node_modules/@nextui-org/react-utils": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@nextui-org/react-utils/-/react-utils-2.0.16.tgz", + "integrity": "sha512-QdDoqzhx+4t9cDTVmtw5iOrfyLvpqyKsq8PARHUniCiQQDQd1ao7FCpzHgvU9poYcEdRk+Lsna66zbeMkFBB6w==", + "license": "MIT", + "dependencies": { + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7" + }, + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/listbox/node_modules/@nextui-org/shared-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-utils/-/shared-utils-2.0.7.tgz", + "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", + "license": "MIT" + }, + "node_modules/@nextui-org/listbox/node_modules/@nextui-org/system-rsc": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system-rsc/-/system-rsc-2.1.5.tgz", + "integrity": "sha512-tkJLAyJu34Rr5KUMMqoB7cZjOVXB+7a/7N4ushZfuiLdoYijgmcXFMzLxjm+tbt9zA5AV+ivsfbHvscg77dJ6w==", + "license": "MIT", + "dependencies": { + "@react-types/shared": "3.23.1", + "clsx": "^1.2.1" + }, + "peerDependencies": { + "@nextui-org/theme": ">=2.1.0", + "react": ">=18" + } + }, + "node_modules/@nextui-org/listbox/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/@nextui-org/modal": { "version": "2.0.36", "license": "MIT", @@ -5690,16 +5810,18 @@ "license": "MIT" }, "node_modules/@nextui-org/popover": { - "version": "2.1.24", + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/@nextui-org/popover/-/popover-2.1.27.tgz", + "integrity": "sha512-UV42nqvUR9IOy7Hgc5S2Xo+2YWzBAHCcU+C/9O9SchXL0DyU/ol+IPqxuBxdJDi5fiFYr9mTBoPZgAEGDoJjDg==", "license": "MIT", "dependencies": { - "@nextui-org/aria-utils": "2.0.21", - "@nextui-org/button": "2.0.34", - "@nextui-org/framer-utils": "2.0.21", - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/use-aria-button": "2.0.9", - "@nextui-org/use-safe-layout-effect": "2.0.5", + "@nextui-org/aria-utils": "2.0.24", + "@nextui-org/button": "2.0.37", + "@nextui-org/framer-utils": "2.0.24", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/use-aria-button": "2.0.10", + "@nextui-org/use-safe-layout-effect": "2.0.6", "@react-aria/dialog": "3.5.14", "@react-aria/focus": "3.17.1", "@react-aria/interactions": "3.21.3", @@ -5718,48 +5840,164 @@ "react-dom": ">=18" } }, - "node_modules/@nextui-org/popover/node_modules/@nextui-org/button": { - "version": "2.0.34", - "resolved": "https://registry.npmjs.org/@nextui-org/button/-/button-2.0.34.tgz", - "integrity": "sha512-VeFpOs7trX6u6FqeGr0XCpuNqPhXTLqsmt4iaygvheZCbzrTKvWHd4QMqSh2CPsNH8UFUBSFJjr3oaf3a0SYWQ==", + "node_modules/@nextui-org/popover/node_modules/@nextui-org/aria-utils": { + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@nextui-org/aria-utils/-/aria-utils-2.0.24.tgz", + "integrity": "sha512-YD+YvT01zFqN1Ey137OeFl9SEhAYf2BoZz+ykWiIJlMjl/LY1d5WE0nkzsjMHh6MV3HgS6CExxlf7TuApN6Piw==", "license": "MIT", "dependencies": { - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/ripple": "2.0.30", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/spinner": "2.0.30", - "@nextui-org/use-aria-button": "2.0.9", - "@react-aria/button": "3.9.5", - "@react-aria/focus": "3.17.1", - "@react-aria/interactions": "3.21.3", + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/system": "2.2.5", "@react-aria/utils": "3.24.1", - "@react-types/button": "3.9.4", + "@react-stately/collections": "3.10.7", + "@react-stately/overlays": "3.6.7", + "@react-types/overlays": "3.8.7", "@react-types/shared": "3.23.1" }, "peerDependencies": { - "@nextui-org/system": ">=2.0.0", - "@nextui-org/theme": ">=2.1.0", + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/aria-utils/node_modules/@nextui-org/system": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system/-/system-2.2.5.tgz", + "integrity": "sha512-nrX6768aiyWtpxX3OTFBIVWR+v9nlMsC3KaBinNfek97sNm7gAfTHi7q5kylE3L5yIMpNG+DclAKpuxgDQEmvw==", + "license": "MIT", + "dependencies": { + "@internationalized/date": "^3.5.4", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/system-rsc": "2.1.5", + "@react-aria/i18n": "3.11.1", + "@react-aria/overlays": "3.22.1", + "@react-aria/utils": "3.24.1", + "@react-stately/utils": "3.10.1" + }, + "peerDependencies": { "framer-motion": ">=10.17.0", "react": ">=18", "react-dom": ">=18" } }, - "node_modules/@nextui-org/popover/node_modules/@nextui-org/spinner": { - "version": "2.0.30", - "resolved": "https://registry.npmjs.org/@nextui-org/spinner/-/spinner-2.0.30.tgz", - "integrity": "sha512-+oygL2dewHZzJiSUEIvzL0tIx+G+98mvO3ToFAMXaH0N3bOQNSiFDPwUHUx6PgAQ9pr9RKtdnb4ywstcG9j+Gg==", + "node_modules/@nextui-org/popover/node_modules/@nextui-org/framer-utils": { + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@nextui-org/framer-utils/-/framer-utils-2.0.24.tgz", + "integrity": "sha512-Fc5ugVaLsXhd3bgJg+hvw20uaaz9gAxYY2ouS/3leN7QBSRAwpy3Dl+tX8BbLeyx3ZosVrHIJ3w4bhDMzFVk9Q==", "license": "MIT", "dependencies": { - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/system-rsc": "2.1.2" + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/system": "2.2.5", + "@nextui-org/use-measure": "2.0.2" }, "peerDependencies": { - "@nextui-org/theme": ">=2.1.0", + "framer-motion": ">=10.17.0", + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/framer-utils/node_modules/@nextui-org/system": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system/-/system-2.2.5.tgz", + "integrity": "sha512-nrX6768aiyWtpxX3OTFBIVWR+v9nlMsC3KaBinNfek97sNm7gAfTHi7q5kylE3L5yIMpNG+DclAKpuxgDQEmvw==", + "license": "MIT", + "dependencies": { + "@internationalized/date": "^3.5.4", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/system-rsc": "2.1.5", + "@react-aria/i18n": "3.11.1", + "@react-aria/overlays": "3.22.1", + "@react-aria/utils": "3.24.1", + "@react-stately/utils": "3.10.1" + }, + "peerDependencies": { + "framer-motion": ">=10.17.0", "react": ">=18", "react-dom": ">=18" } }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/react-rsc-utils": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@nextui-org/react-rsc-utils/-/react-rsc-utils-2.0.13.tgz", + "integrity": "sha512-QewsXtoQlMsR9stThdazKEImg9oyZkPLs7wsymhrzh6/HdQCl9bTdb6tJcROg4vg5LRYKGG11USSQO2nKlfCcQ==", + "license": "MIT" + }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/react-utils": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@nextui-org/react-utils/-/react-utils-2.0.16.tgz", + "integrity": "sha512-QdDoqzhx+4t9cDTVmtw5iOrfyLvpqyKsq8PARHUniCiQQDQd1ao7FCpzHgvU9poYcEdRk+Lsna66zbeMkFBB6w==", + "license": "MIT", + "dependencies": { + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7" + }, + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/shared-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-utils/-/shared-utils-2.0.7.tgz", + "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", + "license": "MIT" + }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/system-rsc": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system-rsc/-/system-rsc-2.1.5.tgz", + "integrity": "sha512-tkJLAyJu34Rr5KUMMqoB7cZjOVXB+7a/7N4ushZfuiLdoYijgmcXFMzLxjm+tbt9zA5AV+ivsfbHvscg77dJ6w==", + "license": "MIT", + "dependencies": { + "@react-types/shared": "3.23.1", + "clsx": "^1.2.1" + }, + "peerDependencies": { + "@nextui-org/theme": ">=2.1.0", + "react": ">=18" + } + }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/use-aria-button": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-button/-/use-aria-button-2.0.10.tgz", + "integrity": "sha512-tUpp4QMr1zugKPevyToeRHIufTuc/g+67/r/oQLRTG0mMo3yGVmggykQuYn22fqqZPpW6nHcB9VYc+XtZZ27TQ==", + "license": "MIT", + "dependencies": { + "@react-aria/focus": "3.17.1", + "@react-aria/interactions": "3.21.3", + "@react-aria/utils": "3.24.1", + "@react-types/button": "3.9.4", + "@react-types/shared": "3.23.1" + }, + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/use-measure": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@nextui-org/use-measure/-/use-measure-2.0.2.tgz", + "integrity": "sha512-H/RSPPA9B5sZ10wiXR3jLlYFEuiVnc0O/sgLLQfrb5M0hvHoaqMThnsZpm//5iyS7tD7kxPeYNLa1EhzlQKxDA==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/popover/node_modules/@nextui-org/use-safe-layout-effect": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@nextui-org/use-safe-layout-effect/-/use-safe-layout-effect-2.0.6.tgz", + "integrity": "sha512-xzEJXf/g9GaSqjLpQ4+Z2/pw1GPq2Fc5cWRGqEXbGauEMXuH8UboRls1BmIV1RuOpqI6FgxkEmxL1EuVIRVmvQ==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/popover/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/@nextui-org/react-rsc-utils": { "version": "2.0.12", "license": "MIT" @@ -5775,51 +6013,65 @@ "react": ">=18" } }, - "node_modules/@nextui-org/ripple": { - "version": "2.0.30", + "node_modules/@nextui-org/scroll-shadow": { + "version": "2.1.19", + "resolved": "https://registry.npmjs.org/@nextui-org/scroll-shadow/-/scroll-shadow-2.1.19.tgz", + "integrity": "sha512-od5AnhX6iO0sHoTAVReWv1O1dbNCEeOBOFdnyzFins6ZC5EnAl/oBPR/KLd8glHtgM3Jt8dvIVlBXPEPZKZwaw==", "license": "MIT", "dependencies": { - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/shared-utils": "2.0.5" + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/use-data-scroll-overflow": "2.1.6" }, "peerDependencies": { "@nextui-org/system": ">=2.0.0", "@nextui-org/theme": ">=2.1.0", - "framer-motion": ">=10.17.0", "react": ">=18", "react-dom": ">=18" } }, - "node_modules/@nextui-org/scroll-shadow": { - "version": "2.1.17", + "node_modules/@nextui-org/scroll-shadow/node_modules/@nextui-org/react-rsc-utils": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@nextui-org/react-rsc-utils/-/react-rsc-utils-2.0.13.tgz", + "integrity": "sha512-QewsXtoQlMsR9stThdazKEImg9oyZkPLs7wsymhrzh6/HdQCl9bTdb6tJcROg4vg5LRYKGG11USSQO2nKlfCcQ==", + "license": "MIT" + }, + "node_modules/@nextui-org/scroll-shadow/node_modules/@nextui-org/react-utils": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@nextui-org/react-utils/-/react-utils-2.0.16.tgz", + "integrity": "sha512-QdDoqzhx+4t9cDTVmtw5iOrfyLvpqyKsq8PARHUniCiQQDQd1ao7FCpzHgvU9poYcEdRk+Lsna66zbeMkFBB6w==", "license": "MIT", "dependencies": { - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/use-data-scroll-overflow": "2.1.4" + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7" }, "peerDependencies": { - "@nextui-org/system": ">=2.0.0", - "@nextui-org/theme": ">=2.1.0", - "react": ">=18", - "react-dom": ">=18" + "react": ">=18" } }, + "node_modules/@nextui-org/scroll-shadow/node_modules/@nextui-org/shared-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-utils/-/shared-utils-2.0.7.tgz", + "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", + "license": "MIT" + }, "node_modules/@nextui-org/select": { - "version": "2.2.2", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@nextui-org/select/-/select-2.2.5.tgz", + "integrity": "sha512-Il1eigjSXOBgJ745nhn6TDPD1jj1avrnvk9WV/DCjOsFRwfstRnDzsS1aNpZKHqJgHhFRQZ1ivz8hA4x3Zgasg==", "license": "MIT", "dependencies": { - "@nextui-org/aria-utils": "2.0.21", - "@nextui-org/listbox": "2.1.22", - "@nextui-org/popover": "2.1.24", - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/scroll-shadow": "2.1.17", - "@nextui-org/shared-icons": "2.0.8", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/spinner": "2.0.30", - "@nextui-org/use-aria-button": "2.0.9", - "@nextui-org/use-aria-multiselect": "2.2.2", - "@nextui-org/use-safe-layout-effect": "2.0.5", + "@nextui-org/aria-utils": "2.0.24", + "@nextui-org/listbox": "2.1.25", + "@nextui-org/popover": "2.1.27", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/scroll-shadow": "2.1.19", + "@nextui-org/shared-icons": "2.0.9", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/spinner": "2.0.33", + "@nextui-org/use-aria-button": "2.0.10", + "@nextui-org/use-aria-multiselect": "2.2.3", + "@nextui-org/use-safe-layout-effect": "2.0.6", "@react-aria/focus": "3.17.1", "@react-aria/form": "3.0.5", "@react-aria/interactions": "3.21.3", @@ -5835,22 +6087,128 @@ "react-dom": ">=18" } }, - "node_modules/@nextui-org/select/node_modules/@nextui-org/spinner": { - "version": "2.0.30", - "resolved": "https://registry.npmjs.org/@nextui-org/spinner/-/spinner-2.0.30.tgz", - "integrity": "sha512-+oygL2dewHZzJiSUEIvzL0tIx+G+98mvO3ToFAMXaH0N3bOQNSiFDPwUHUx6PgAQ9pr9RKtdnb4ywstcG9j+Gg==", + "node_modules/@nextui-org/select/node_modules/@nextui-org/aria-utils": { + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@nextui-org/aria-utils/-/aria-utils-2.0.24.tgz", + "integrity": "sha512-YD+YvT01zFqN1Ey137OeFl9SEhAYf2BoZz+ykWiIJlMjl/LY1d5WE0nkzsjMHh6MV3HgS6CExxlf7TuApN6Piw==", "license": "MIT", "dependencies": { - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/system-rsc": "2.1.2" + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/system": "2.2.5", + "@react-aria/utils": "3.24.1", + "@react-stately/collections": "3.10.7", + "@react-stately/overlays": "3.6.7", + "@react-types/overlays": "3.8.7", + "@react-types/shared": "3.23.1" }, "peerDependencies": { - "@nextui-org/theme": ">=2.1.0", "react": ">=18", "react-dom": ">=18" } }, + "node_modules/@nextui-org/select/node_modules/@nextui-org/aria-utils/node_modules/@nextui-org/system": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system/-/system-2.2.5.tgz", + "integrity": "sha512-nrX6768aiyWtpxX3OTFBIVWR+v9nlMsC3KaBinNfek97sNm7gAfTHi7q5kylE3L5yIMpNG+DclAKpuxgDQEmvw==", + "license": "MIT", + "dependencies": { + "@internationalized/date": "^3.5.4", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/system-rsc": "2.1.5", + "@react-aria/i18n": "3.11.1", + "@react-aria/overlays": "3.22.1", + "@react-aria/utils": "3.24.1", + "@react-stately/utils": "3.10.1" + }, + "peerDependencies": { + "framer-motion": ">=10.17.0", + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/@nextui-org/select/node_modules/@nextui-org/react-rsc-utils": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@nextui-org/react-rsc-utils/-/react-rsc-utils-2.0.13.tgz", + "integrity": "sha512-QewsXtoQlMsR9stThdazKEImg9oyZkPLs7wsymhrzh6/HdQCl9bTdb6tJcROg4vg5LRYKGG11USSQO2nKlfCcQ==", + "license": "MIT" + }, + "node_modules/@nextui-org/select/node_modules/@nextui-org/react-utils": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@nextui-org/react-utils/-/react-utils-2.0.16.tgz", + "integrity": "sha512-QdDoqzhx+4t9cDTVmtw5iOrfyLvpqyKsq8PARHUniCiQQDQd1ao7FCpzHgvU9poYcEdRk+Lsna66zbeMkFBB6w==", + "license": "MIT", + "dependencies": { + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7" + }, + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/select/node_modules/@nextui-org/shared-icons": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-icons/-/shared-icons-2.0.9.tgz", + "integrity": "sha512-WG3yinVY7Tk9VqJgcdF4V8Ok9+fcm5ey7S1els7kujrfqLYxtqoKywgiY/7QHwZlfQkzpykAfy+NAlHkTP5hMg==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/select/node_modules/@nextui-org/shared-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-utils/-/shared-utils-2.0.7.tgz", + "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", + "license": "MIT" + }, + "node_modules/@nextui-org/select/node_modules/@nextui-org/system-rsc": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system-rsc/-/system-rsc-2.1.5.tgz", + "integrity": "sha512-tkJLAyJu34Rr5KUMMqoB7cZjOVXB+7a/7N4ushZfuiLdoYijgmcXFMzLxjm+tbt9zA5AV+ivsfbHvscg77dJ6w==", + "license": "MIT", + "dependencies": { + "@react-types/shared": "3.23.1", + "clsx": "^1.2.1" + }, + "peerDependencies": { + "@nextui-org/theme": ">=2.1.0", + "react": ">=18" + } + }, + "node_modules/@nextui-org/select/node_modules/@nextui-org/use-aria-button": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-button/-/use-aria-button-2.0.10.tgz", + "integrity": "sha512-tUpp4QMr1zugKPevyToeRHIufTuc/g+67/r/oQLRTG0mMo3yGVmggykQuYn22fqqZPpW6nHcB9VYc+XtZZ27TQ==", + "license": "MIT", + "dependencies": { + "@react-aria/focus": "3.17.1", + "@react-aria/interactions": "3.21.3", + "@react-aria/utils": "3.24.1", + "@react-types/button": "3.9.4", + "@react-types/shared": "3.23.1" + }, + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/select/node_modules/@nextui-org/use-safe-layout-effect": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@nextui-org/use-safe-layout-effect/-/use-safe-layout-effect-2.0.6.tgz", + "integrity": "sha512-xzEJXf/g9GaSqjLpQ4+Z2/pw1GPq2Fc5cWRGqEXbGauEMXuH8UboRls1BmIV1RuOpqI6FgxkEmxL1EuVIRVmvQ==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/select/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/@nextui-org/shared-icons": { "version": "2.0.8", "license": "MIT", @@ -6104,7 +6462,9 @@ } }, "node_modules/@nextui-org/use-aria-multiselect": { - "version": "2.2.2", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-multiselect/-/use-aria-multiselect-2.2.3.tgz", + "integrity": "sha512-VeRoyyUUVgJ7DrdfzU6onjohHxJfG7bmwpIfQyurMzvTZcmcVUGTnddAnRPVEoOro68tTAj4IuPs/4xkf1aXxg==", "license": "MIT", "dependencies": { "@react-aria/i18n": "3.11.1", @@ -6138,15 +6498,23 @@ } }, "node_modules/@nextui-org/use-data-scroll-overflow": { - "version": "2.1.4", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@nextui-org/use-data-scroll-overflow/-/use-data-scroll-overflow-2.1.6.tgz", + "integrity": "sha512-z9XzBF64qjTSp6jTttMDEPku7Xpgci/tYTokEQHWgydRg3FZEaBqRgOOMeiXAV1Py/kQB062MjPSneUtwYlozA==", "license": "MIT", "dependencies": { - "@nextui-org/shared-utils": "2.0.5" + "@nextui-org/shared-utils": "2.0.7" }, "peerDependencies": { "react": ">=18" } }, + "node_modules/@nextui-org/use-data-scroll-overflow/node_modules/@nextui-org/shared-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-utils/-/shared-utils-2.0.7.tgz", + "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", + "license": "MIT" + }, "node_modules/@nextui-org/use-disclosure": { "version": "2.0.9", "license": "MIT", @@ -6181,7 +6549,9 @@ } }, "node_modules/@nextui-org/use-is-mobile": { - "version": "2.0.8", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@nextui-org/use-is-mobile/-/use-is-mobile-2.0.9.tgz", + "integrity": "sha512-u5pRmPV0wacdpOcAkQnWwE30yNBl2uk1WvbWkrSELxIVRN22+fTIYn8ynnHK0JbJFTA6/5zh7uIfETQu3L6KjA==", "license": "MIT", "dependencies": { "@react-aria/ssr": "3.9.4" From aa9ffc1764ef771c6bf52d0013314be99a5ca6d5 Mon Sep 17 00:00:00 2001 From: rharkor Date: Wed, 4 Sep 2024 08:46:50 +0200 Subject: [PATCH 2/7] refactor: task --- .../src/utils/template-config/apply.ts | 66 ++++++++++++------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/packages/scripts/src/utils/template-config/apply.ts b/packages/scripts/src/utils/template-config/apply.ts index 3a348b47..3669daaf 100644 --- a/packages/scripts/src/utils/template-config/apply.ts +++ b/packages/scripts/src/utils/template-config/apply.ts @@ -10,29 +10,38 @@ export const applyConfigurationTask = async ({ configFileName, pluginsDirectory, root, + noTask, }: { pluginsDirectory: string configFileName: string root: string + noTask: boolean }) => { - const applyConfigTask = await task.startTask({ - name: "Apply template config... 🧰", - }) + let applyConfigTask: null | Awaited> = null + if (!noTask) { + applyConfigTask = await task.startTask({ + name: "Apply template config... 🧰", + }) + } //* Check if the plugins directory exists - applyConfigTask.log("Checking if the plugins directory exists") + if (applyConfigTask) applyConfigTask.log("Checking if the plugins directory exists") + else logger.info("Checking if the plugins directory exists") if (!(await fs.exists(pluginsDirectory))) { - applyConfigTask.error(`The plugins directory doesn't exist at ${pluginsDirectory}`) - applyConfigTask.stop() + if (applyConfigTask) applyConfigTask.error(`The plugins directory doesn't exist at ${pluginsDirectory}`) + else logger.error(`The plugins directory doesn't exist at ${pluginsDirectory}`) + applyConfigTask?.stop() throw new Error(`The plugins directory doesn't exist at ${pluginsDirectory}`) } //* Retrieve config - applyConfigTask.log("Retrieving the config") + if (applyConfigTask) applyConfigTask.log("Retrieving the config") + else logger.info("Retrieving the config") const configPath = !root.endsWith(configFileName) ? path.join(root, configFileName) : root if (!(await fs.exists(configPath))) { - applyConfigTask.error(`The config file ${configPath} doesn't exist`) - applyConfigTask.stop() + if (applyConfigTask) applyConfigTask.error(`The config file ${configPath} doesn't exist`) + else logger.error(`The config file ${configPath} doesn't exist`) + applyConfigTask?.stop() throw new Error(`The config file ${configPath} doesn't exist`) } @@ -40,21 +49,24 @@ export const applyConfigurationTask = async ({ try { configSchema.parse(config) } catch (error) { - applyConfigTask.error(`The config file ${configPath} is not valid`) - applyConfigTask.stop() + if (applyConfigTask) applyConfigTask.error(`The config file ${configPath} is not valid`) + else logger.error(`The config file ${configPath} is not valid`) + applyConfigTask?.stop() logger.error(error) throw error } //* Apply plugins - applyConfigTask.log("Applying plugins") + if (applyConfigTask) applyConfigTask.log("Applying plugins") + else logger.info("Applying plugins") for (const plugin of config.plugins) { const pluginName = typeof plugin === "string" ? plugin : plugin.name const pluginPath = path.join(pluginsDirectory, pluginName) if (!(await fs.exists(pluginPath))) { - applyConfigTask.error(`The plugin ${pluginName} doesn't exist at ${pluginPath}`) - applyConfigTask.stop() + if (applyConfigTask) applyConfigTask.error(`The plugin ${pluginName} doesn't exist at ${pluginPath}`) + else logger.error(`The plugin ${pluginName} doesn't exist at ${pluginPath}`) + applyConfigTask?.stop() throw new Error(`The plugin ${pluginName} doesn't exist at ${pluginPath}`) } const pluginConfigPath = path.join(pluginPath, configFileName) @@ -62,16 +74,20 @@ export const applyConfigurationTask = async ({ try { pluginConfigSchema.parse(pluginConfig) } catch (error) { - applyConfigTask.error(`The plugin config file ${pluginConfigPath} is not valid. Contact developer`) - applyConfigTask.stop() + if (applyConfigTask) + applyConfigTask.error(`The plugin config file ${pluginConfigPath} is not valid. Contact developer`) + else logger.error(`The plugin config file ${pluginConfigPath} is not valid. Contact developer`) + applyConfigTask?.stop() logger.error(error) throw error } //? Check if the plugin config exists if (!(await fs.exists(pluginConfigPath))) { - applyConfigTask.error(`The plugin config for ${pluginName} doesn't exist at ${pluginConfigPath}`) - applyConfigTask.stop() + if (applyConfigTask) + applyConfigTask.error(`The plugin config for ${pluginName} doesn't exist at ${pluginConfigPath}`) + else logger.error(`The plugin config for ${pluginName} doesn't exist at ${pluginConfigPath}`) + applyConfigTask?.stop() throw new Error(`The plugin config for ${pluginName} doesn't exist at ${pluginConfigPath}`) } @@ -81,15 +97,17 @@ export const applyConfigurationTask = async ({ for (const relativeDestinationPath of relativeDestinationPaths) { const destinationPath = path.join(root, relativeDestinationPath) if (await fs.exists(destinationPath)) { - applyConfigTask.error(`A file/folder already exists at the destination ${destinationPath}`) - applyConfigTask.stop() + if (applyConfigTask) applyConfigTask.error(`A file/folder already exists at the destination ${destinationPath}`) + else logger.error(`A file/folder already exists at the destination ${destinationPath}`) + applyConfigTask?.stop() throw new Error(`A file/folder already exists at the destination ${destinationPath}`) } } } //* Apply the plugins - applyConfigTask.log("Applying the plugins") + if (applyConfigTask) applyConfigTask.log("Applying the plugins") + else logger.info("Applying the plugins") for (const plugin of config.plugins) { const pluginName = typeof plugin === "string" ? plugin : plugin.name const pluginPath = path.join(pluginsDirectory, pluginName) @@ -99,7 +117,8 @@ export const applyConfigurationTask = async ({ for (const { from, to } of pluginConfig.paths) { const sourcePath = path.join(pluginPath, from) const destinationPath = path.join(root, to) - applyConfigTask.log(`Copying the plugin ${pluginName} to the destination ${destinationPath}`) + if (applyConfigTask) applyConfigTask.log(`Copying the plugin ${pluginName} to the destination ${destinationPath}`) + else logger.info(`Copying the plugin ${pluginName} to the destination ${destinationPath}`) await fs.copy(sourcePath, destinationPath) } } @@ -108,6 +127,7 @@ export const applyConfigurationTask = async ({ // applyConfigTask.log("Deleting the config file") // await fs.remove(configPath) - applyConfigTask.stop("The template config has been applied! 🎉") + if (applyConfigTask) applyConfigTask.stop("The template config has been applied! 🎉") + else logger.success("The template config has been applied! 🎉") logger.info("You can now delete the config file if you want") } From c353b54c570a08603f8892b7cfb4ff4bc67c3279 Mon Sep 17 00:00:00 2001 From: rharkor Date: Wed, 4 Sep 2024 08:56:25 +0200 Subject: [PATCH 3/7] fix: plugins apply --- .../app/src/api/configuration/mutations.ts | 1 + .../src/app/src/lib/configuration/index.ts | 4 ++-- .../cli/src/functions/apply-config/index.ts | 1 + .../src/utils/template-config/apply.ts | 5 +++-- .../src/utils/template-config/index.ts | 19 ++++++++++++------- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/packages/cli/src/app/src/api/configuration/mutations.ts b/packages/cli/src/app/src/api/configuration/mutations.ts index a7c9cd4a..f1ca7f32 100644 --- a/packages/cli/src/app/src/api/configuration/mutations.ts +++ b/packages/cli/src/app/src/api/configuration/mutations.ts @@ -48,6 +48,7 @@ export const applyConfiguration = async ({}: apiInputFromSchema> = { configuration } diff --git a/packages/cli/src/app/src/lib/configuration/index.ts b/packages/cli/src/app/src/lib/configuration/index.ts index cd5d7745..8cf768c6 100644 --- a/packages/cli/src/app/src/lib/configuration/index.ts +++ b/packages/cli/src/app/src/lib/configuration/index.ts @@ -31,13 +31,13 @@ const webConfigToApiConfig = (webConfig: TConfiguration): z.infer { return { name: plugin.sourcePath, - paths: plugin.paths.map((p) => p.to), + paths: plugin.paths, } }), }) return content } catch (error) { - logger.error(error) + logger.error("Failed to convert the web configuration", error) throw new TRPCError({ message: `Failed to convert the web configuration`, code: "INTERNAL_SERVER_ERROR", diff --git a/packages/cli/src/functions/apply-config/index.ts b/packages/cli/src/functions/apply-config/index.ts index d1c71d89..8ac6a23a 100644 --- a/packages/cli/src/functions/apply-config/index.ts +++ b/packages/cli/src/functions/apply-config/index.ts @@ -37,6 +37,7 @@ export const applyConfig = async () => { configFileName, pluginsDirectory, root, + noTask: false, }).catch(() => { process.exit(1) }) diff --git a/packages/scripts/src/utils/template-config/apply.ts b/packages/scripts/src/utils/template-config/apply.ts index 3669daaf..95292d33 100644 --- a/packages/scripts/src/utils/template-config/apply.ts +++ b/packages/scripts/src/utils/template-config/apply.ts @@ -56,7 +56,7 @@ export const applyConfigurationTask = async ({ throw error } - //* Apply plugins + //* Verify plugins if (applyConfigTask) applyConfigTask.log("Applying plugins") else logger.info("Applying plugins") @@ -114,7 +114,8 @@ export const applyConfigurationTask = async ({ const pluginConfigPath = path.join(pluginPath, configFileName) const pluginConfig = (await fs.readJson(pluginConfigPath)) as TPluginConfig // Copy the plugin to the destination - for (const { from, to } of pluginConfig.paths) { + for (const { from, to: defaultTo } of pluginConfig.paths) { + const to = typeof plugin === "string" ? defaultTo : (plugin.paths.find((p) => p.from === from)?.to ?? defaultTo) const sourcePath = path.join(pluginPath, from) const destinationPath = path.join(root, to) if (applyConfigTask) applyConfigTask.log(`Copying the plugin ${pluginName} to the destination ${destinationPath}`) diff --git a/packages/scripts/src/utils/template-config/index.ts b/packages/scripts/src/utils/template-config/index.ts index b035d386..4f838456 100644 --- a/packages/scripts/src/utils/template-config/index.ts +++ b/packages/scripts/src/utils/template-config/index.ts @@ -17,21 +17,26 @@ export function isPathInCurrentScope(filePath: string): boolean { export const fullPluginSchema = z.object({ name: z.string(), paths: z.array( - z - .string() - .optional() - .refine( + z.object({ + from: z.string().refine( (value) => { - if (value === undefined) { - return true + if (!isPathInCurrentScope(value)) { + return false } + return true + }, + { message: "The path should be relative and in the current directory" } + ), + to: z.string().refine( + (value) => { if (!isPathInCurrentScope(value)) { return false } return true }, { message: "The path should be relative and in the current directory" } - ) + ), + }) ), }) From 1a31f5bd51075dcfd5fc111452e375a7d8488f31 Mon Sep 17 00:00:00 2001 From: rharkor Date: Wed, 4 Sep 2024 09:18:58 +0200 Subject: [PATCH 4/7] fix: update conf --- .../app/components/current-configuration.tsx | 91 +++++++++++-------- .../src/app/src/lib/configuration/index.ts | 22 ++++- .../src/utils/template-config/index.ts | 13 +++ 3 files changed, 85 insertions(+), 41 deletions(-) diff --git a/packages/cli/src/app/src/app/components/current-configuration.tsx b/packages/cli/src/app/src/app/components/current-configuration.tsx index 9fc59c7e..f5d13bbb 100644 --- a/packages/cli/src/app/src/app/components/current-configuration.tsx +++ b/packages/cli/src/app/src/app/components/current-configuration.tsx @@ -256,17 +256,35 @@ function Plugin({ onClose: onEditClose, } = useDisclosure() - const [overridedTo, setOverridedTo] = useState>({}) + const onEdit = async (e: React.FormEvent) => { + e.preventDefault() + await _onEdit(plugin) + onEditClose() + } - const onEdit = async () => { - await _onEdit({ - ...plugin, - paths: plugin.paths.map((p) => ({ - from: plugin.sourcePath, - to: overridedTo[p.to] ?? p.to, - })), + const [overridedTo, setOverridedTo] = useState>( + plugin.paths.reduce( + (acc, p) => { + acc[p.from] = p.overridedTo ?? p.to + return acc + }, + {} as Record + ) + ) + const editPath = (fromKey: string) => (to: string) => { + setOverridedTo((prev) => ({ + ...prev, + [fromKey]: to, + })) + plugin.paths = plugin.paths.map((p) => { + if (p.from === fromKey) { + return { + ...p, + overridedTo: to, + } + } + return p }) - onEditClose() } return ( @@ -352,35 +370,32 @@ function Plugin({ {(onClose) => ( <> {dictionary.pluginSettings} - - {plugin.paths.map((p, i) => ( - - {i !== 0 && } -
- - { - setOverridedTo((prev) => ({ - ...prev, - [p.to]: value, - })) - }} - placeholder={p.to} - label={dictionary.outputPath} - /> -
- - ))} - - - - - +
+ + {plugin.paths.map((p, i) => ( + + {i !== 0 && } +
+ + +
+ + ))} + + + + + +
)} diff --git a/packages/cli/src/app/src/lib/configuration/index.ts b/packages/cli/src/app/src/lib/configuration/index.ts index 8cf768c6..546c708d 100644 --- a/packages/cli/src/app/src/lib/configuration/index.ts +++ b/packages/cli/src/app/src/lib/configuration/index.ts @@ -29,10 +29,18 @@ const webConfigToApiConfig = (webConfig: TConfiguration): z.infer { - return { + const fullP = { name: plugin.sourcePath, - paths: plugin.paths, + paths: plugin.paths.map((p) => ({ + from: p.from, + to: p.overridedTo || p.to, + })), + } + //? If there's no override, or the override is the same as the original path, return the name + if (!plugin.paths.some((p) => p.overridedTo) || plugin.paths.every((p) => p.to === p.overridedTo)) { + return fullP.name } + return fullP }), }) return content @@ -76,7 +84,15 @@ const apiConfigToWebConfig = async (apiConfig: z.infer { + const overridedTo = + typeof plugin === "string" ? undefined : plugin.paths.find((p) => p.from === path.from)?.to + return { + from: path.from, + to: path.to, + overridedTo, + } + }), } }), } diff --git a/packages/scripts/src/utils/template-config/index.ts b/packages/scripts/src/utils/template-config/index.ts index 4f838456..cd8d1122 100644 --- a/packages/scripts/src/utils/template-config/index.ts +++ b/packages/scripts/src/utils/template-config/index.ts @@ -76,6 +76,19 @@ export const pluginConfigSchema = z.object({ }, { message: "The path should be relative and in the current directory" } ), + overridedTo: z + .string() + .optional() + .refine( + (value) => { + if (value === undefined) return true + if (!isPathInCurrentScope(value)) { + return false + } + return true + }, + { message: "The path should be relative and in the current directory" } + ), }) ) .refine( From f118a5bcdae441d8190184c1239088b04f03e60a Mon Sep 17 00:00:00 2001 From: rharkor Date: Wed, 4 Sep 2024 09:26:50 +0200 Subject: [PATCH 5/7] fix: handle apply error --- packages/cli/src/app/.env.example | 3 ++- packages/cli/src/app/.gitignore | 3 ++- .../cli/src/app/src/app/components/current-configuration.tsx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/app/.env.example b/packages/cli/src/app/.env.example index 5e025e66..ef304eb6 100644 --- a/packages/cli/src/app/.env.example +++ b/packages/cli/src/app/.env.example @@ -1,2 +1,3 @@ LOGGER_ENV=development -ROOT_PATH=/workspace/packages/cli/src/app \ No newline at end of file +ENV=development +ROOT_PATH=/workspace/packages/cli/src/app/out \ No newline at end of file diff --git a/packages/cli/src/app/.gitignore b/packages/cli/src/app/.gitignore index 0cffcb34..b6a7c111 100644 --- a/packages/cli/src/app/.gitignore +++ b/packages/cli/src/app/.gitignore @@ -1 +1,2 @@ -config.json \ No newline at end of file +config.json +out \ No newline at end of file diff --git a/packages/cli/src/app/src/app/components/current-configuration.tsx b/packages/cli/src/app/src/app/components/current-configuration.tsx index f5d13bbb..ea73ece3 100644 --- a/packages/cli/src/app/src/app/components/current-configuration.tsx +++ b/packages/cli/src/app/src/app/components/current-configuration.tsx @@ -59,7 +59,7 @@ export default function CurrentConfiguration({ } const applyConfigurationMutation = trpc.configuration.applyConfiguration.useMutation({ - onSettled: async () => { + onSuccess: async () => { toast.success(dictionary.configurationApplied) }, }) From 38b371d4fd5853c765457517752392f2711ecb72 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 07:30:54 +0000 Subject: [PATCH 6/7] fix(deps): update dependency @nextui-org/input to v2.2.4 --- _old/package-lock.json | 59 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/_old/package-lock.json b/_old/package-lock.json index d3ae20a0..fdeabcb4 100644 --- a/_old/package-lock.json +++ b/_old/package-lock.json @@ -43,11 +43,11 @@ "@nextui-org/button": "^2.0.34", "@nextui-org/card": "^2.0.31", "@nextui-org/checkbox": "^2.1.2", - "@nextui-org/input": "^2.2.2", + "@nextui-org/input": "^2.2.4", "@nextui-org/link": "^2.0.32", "@nextui-org/modal": "^2.0.36", "@nextui-org/pagination": "^2.0.33", - "@nextui-org/select": "^2.2.5", + "@nextui-org/select": "^2.2.2", "@nextui-org/skeleton": "^2.0.29", "@nextui-org/spinner": "^2.0.30", "@nextui-org/switch": "^2.0.31", @@ -5532,13 +5532,15 @@ } }, "node_modules/@nextui-org/input": { - "version": "2.2.2", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@nextui-org/input/-/input-2.2.4.tgz", + "integrity": "sha512-CVeTwwUJn9pEJC+kq3Jg0nAFeYVGBbIU7U2YFSG8XJK2X75odj8RSQdVd3Dt2U/b5Mtwt5sBh9gMzCedtjffWg==", "license": "MIT", "dependencies": { - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/shared-icons": "2.0.8", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/use-safe-layout-effect": "2.0.5", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/shared-icons": "2.0.9", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/use-safe-layout-effect": "2.0.6", "@react-aria/focus": "3.17.1", "@react-aria/interactions": "3.21.3", "@react-aria/textfield": "3.14.5", @@ -5555,6 +5557,49 @@ "react-dom": ">=18" } }, + "node_modules/@nextui-org/input/node_modules/@nextui-org/react-rsc-utils": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@nextui-org/react-rsc-utils/-/react-rsc-utils-2.0.13.tgz", + "integrity": "sha512-QewsXtoQlMsR9stThdazKEImg9oyZkPLs7wsymhrzh6/HdQCl9bTdb6tJcROg4vg5LRYKGG11USSQO2nKlfCcQ==", + "license": "MIT" + }, + "node_modules/@nextui-org/input/node_modules/@nextui-org/react-utils": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@nextui-org/react-utils/-/react-utils-2.0.16.tgz", + "integrity": "sha512-QdDoqzhx+4t9cDTVmtw5iOrfyLvpqyKsq8PARHUniCiQQDQd1ao7FCpzHgvU9poYcEdRk+Lsna66zbeMkFBB6w==", + "license": "MIT", + "dependencies": { + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7" + }, + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/input/node_modules/@nextui-org/shared-icons": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-icons/-/shared-icons-2.0.9.tgz", + "integrity": "sha512-WG3yinVY7Tk9VqJgcdF4V8Ok9+fcm5ey7S1els7kujrfqLYxtqoKywgiY/7QHwZlfQkzpykAfy+NAlHkTP5hMg==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/input/node_modules/@nextui-org/shared-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-utils/-/shared-utils-2.0.7.tgz", + "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", + "license": "MIT" + }, + "node_modules/@nextui-org/input/node_modules/@nextui-org/use-safe-layout-effect": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@nextui-org/use-safe-layout-effect/-/use-safe-layout-effect-2.0.6.tgz", + "integrity": "sha512-xzEJXf/g9GaSqjLpQ4+Z2/pw1GPq2Fc5cWRGqEXbGauEMXuH8UboRls1BmIV1RuOpqI6FgxkEmxL1EuVIRVmvQ==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, "node_modules/@nextui-org/link": { "version": "2.0.34", "resolved": "https://registry.npmjs.org/@nextui-org/link/-/link-2.0.34.tgz", From f65dc02ce075e7115cbfcaab15bd869c1d43d1cd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 07:31:09 +0000 Subject: [PATCH 7/7] fix(deps): update dependency @nextui-org/modal to v2.0.39 --- _old/package-lock.json | 229 ++++++++++++++++++++++++----------------- 1 file changed, 137 insertions(+), 92 deletions(-) diff --git a/_old/package-lock.json b/_old/package-lock.json index d3ae20a0..a4736ae2 100644 --- a/_old/package-lock.json +++ b/_old/package-lock.json @@ -45,9 +45,9 @@ "@nextui-org/checkbox": "^2.1.2", "@nextui-org/input": "^2.2.2", "@nextui-org/link": "^2.0.32", - "@nextui-org/modal": "^2.0.36", + "@nextui-org/modal": "^2.0.39", "@nextui-org/pagination": "^2.0.33", - "@nextui-org/select": "^2.2.5", + "@nextui-org/select": "^2.2.2", "@nextui-org/skeleton": "^2.0.29", "@nextui-org/spinner": "^2.0.30", "@nextui-org/switch": "^2.0.31", @@ -5294,22 +5294,6 @@ "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", "license": "MIT" }, - "node_modules/@nextui-org/button/node_modules/@nextui-org/use-aria-button": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-button/-/use-aria-button-2.0.10.tgz", - "integrity": "sha512-tUpp4QMr1zugKPevyToeRHIufTuc/g+67/r/oQLRTG0mMo3yGVmggykQuYn22fqqZPpW6nHcB9VYc+XtZZ27TQ==", - "license": "MIT", - "dependencies": { - "@react-aria/focus": "3.17.1", - "@react-aria/interactions": "3.21.3", - "@react-aria/utils": "3.24.1", - "@react-types/button": "3.9.4", - "@react-types/shared": "3.23.1" - }, - "peerDependencies": { - "react": ">=18" - } - }, "node_modules/@nextui-org/card": { "version": "2.0.33", "resolved": "https://registry.npmjs.org/@nextui-org/card/-/card-2.0.33.tgz", @@ -5376,22 +5360,6 @@ "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", "license": "MIT" }, - "node_modules/@nextui-org/card/node_modules/@nextui-org/use-aria-button": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-button/-/use-aria-button-2.0.10.tgz", - "integrity": "sha512-tUpp4QMr1zugKPevyToeRHIufTuc/g+67/r/oQLRTG0mMo3yGVmggykQuYn22fqqZPpW6nHcB9VYc+XtZZ27TQ==", - "license": "MIT", - "dependencies": { - "@react-aria/focus": "3.17.1", - "@react-aria/interactions": "3.21.3", - "@react-aria/utils": "3.24.1", - "@react-types/button": "3.9.4", - "@react-types/shared": "3.23.1" - }, - "peerDependencies": { - "react": ">=18" - } - }, "node_modules/@nextui-org/checkbox": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nextui-org/checkbox/-/checkbox-2.1.4.tgz", @@ -5444,18 +5412,6 @@ "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", "license": "MIT" }, - "node_modules/@nextui-org/checkbox/node_modules/@nextui-org/use-callback-ref": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@nextui-org/use-callback-ref/-/use-callback-ref-2.0.6.tgz", - "integrity": "sha512-2WcwWuK1L/wIpTbibnLrysmmkzWomvkVIcgWayB6n/w+bpPrPCG7Zyg2WHzmMmDhe6imV//KKBgNKRi8Xhu/VA==", - "license": "MIT", - "dependencies": { - "@nextui-org/use-safe-layout-effect": "2.0.6" - }, - "peerDependencies": { - "react": ">=18" - } - }, "node_modules/@nextui-org/checkbox/node_modules/@nextui-org/use-safe-layout-effect": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@nextui-org/use-safe-layout-effect/-/use-safe-layout-effect-2.0.6.tgz", @@ -5726,16 +5682,18 @@ } }, "node_modules/@nextui-org/modal": { - "version": "2.0.36", + "version": "2.0.39", + "resolved": "https://registry.npmjs.org/@nextui-org/modal/-/modal-2.0.39.tgz", + "integrity": "sha512-b0G5IRNrfQumx8mQQO92rn2iC2ueUuk4XKvxYYmYNpx3/qpdEP9tckozw+s0QFyZocRPY+yYa0pBtMBGC2lWGQ==", "license": "MIT", "dependencies": { - "@nextui-org/framer-utils": "2.0.21", - "@nextui-org/react-utils": "2.0.14", - "@nextui-org/shared-icons": "2.0.8", - "@nextui-org/shared-utils": "2.0.5", - "@nextui-org/use-aria-button": "2.0.9", - "@nextui-org/use-aria-modal-overlay": "2.0.10", - "@nextui-org/use-disclosure": "2.0.9", + "@nextui-org/framer-utils": "2.0.24", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/shared-icons": "2.0.9", + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/use-aria-button": "2.0.10", + "@nextui-org/use-aria-modal-overlay": "2.0.11", + "@nextui-org/use-disclosure": "2.0.10", "@react-aria/dialog": "3.5.14", "@react-aria/focus": "3.17.1", "@react-aria/interactions": "3.21.3", @@ -5752,6 +5710,108 @@ "react-dom": ">=18" } }, + "node_modules/@nextui-org/modal/node_modules/@nextui-org/framer-utils": { + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@nextui-org/framer-utils/-/framer-utils-2.0.24.tgz", + "integrity": "sha512-Fc5ugVaLsXhd3bgJg+hvw20uaaz9gAxYY2ouS/3leN7QBSRAwpy3Dl+tX8BbLeyx3ZosVrHIJ3w4bhDMzFVk9Q==", + "license": "MIT", + "dependencies": { + "@nextui-org/shared-utils": "2.0.7", + "@nextui-org/system": "2.2.5", + "@nextui-org/use-measure": "2.0.2" + }, + "peerDependencies": { + "framer-motion": ">=10.17.0", + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/@nextui-org/modal/node_modules/@nextui-org/framer-utils/node_modules/@nextui-org/system": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system/-/system-2.2.5.tgz", + "integrity": "sha512-nrX6768aiyWtpxX3OTFBIVWR+v9nlMsC3KaBinNfek97sNm7gAfTHi7q5kylE3L5yIMpNG+DclAKpuxgDQEmvw==", + "license": "MIT", + "dependencies": { + "@internationalized/date": "^3.5.4", + "@nextui-org/react-utils": "2.0.16", + "@nextui-org/system-rsc": "2.1.5", + "@react-aria/i18n": "3.11.1", + "@react-aria/overlays": "3.22.1", + "@react-aria/utils": "3.24.1", + "@react-stately/utils": "3.10.1" + }, + "peerDependencies": { + "framer-motion": ">=10.17.0", + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/@nextui-org/modal/node_modules/@nextui-org/react-rsc-utils": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@nextui-org/react-rsc-utils/-/react-rsc-utils-2.0.13.tgz", + "integrity": "sha512-QewsXtoQlMsR9stThdazKEImg9oyZkPLs7wsymhrzh6/HdQCl9bTdb6tJcROg4vg5LRYKGG11USSQO2nKlfCcQ==", + "license": "MIT" + }, + "node_modules/@nextui-org/modal/node_modules/@nextui-org/react-utils": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@nextui-org/react-utils/-/react-utils-2.0.16.tgz", + "integrity": "sha512-QdDoqzhx+4t9cDTVmtw5iOrfyLvpqyKsq8PARHUniCiQQDQd1ao7FCpzHgvU9poYcEdRk+Lsna66zbeMkFBB6w==", + "license": "MIT", + "dependencies": { + "@nextui-org/react-rsc-utils": "2.0.13", + "@nextui-org/shared-utils": "2.0.7" + }, + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/modal/node_modules/@nextui-org/shared-icons": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-icons/-/shared-icons-2.0.9.tgz", + "integrity": "sha512-WG3yinVY7Tk9VqJgcdF4V8Ok9+fcm5ey7S1els7kujrfqLYxtqoKywgiY/7QHwZlfQkzpykAfy+NAlHkTP5hMg==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/modal/node_modules/@nextui-org/shared-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@nextui-org/shared-utils/-/shared-utils-2.0.7.tgz", + "integrity": "sha512-FxY3N0i1Al7Oz3yOQN0dSpG8UUrLIP3iYh3ubD7BhdQoZLl5xbG6++q1gqOzZXV+ZWeUFMY/or0ofzWxGHiOow==", + "license": "MIT" + }, + "node_modules/@nextui-org/modal/node_modules/@nextui-org/system-rsc": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nextui-org/system-rsc/-/system-rsc-2.1.5.tgz", + "integrity": "sha512-tkJLAyJu34Rr5KUMMqoB7cZjOVXB+7a/7N4ushZfuiLdoYijgmcXFMzLxjm+tbt9zA5AV+ivsfbHvscg77dJ6w==", + "license": "MIT", + "dependencies": { + "@react-types/shared": "3.23.1", + "clsx": "^1.2.1" + }, + "peerDependencies": { + "@nextui-org/theme": ">=2.1.0", + "react": ">=18" + } + }, + "node_modules/@nextui-org/modal/node_modules/@nextui-org/use-measure": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@nextui-org/use-measure/-/use-measure-2.0.2.tgz", + "integrity": "sha512-H/RSPPA9B5sZ10wiXR3jLlYFEuiVnc0O/sgLLQfrb5M0hvHoaqMThnsZpm//5iyS7tD7kxPeYNLa1EhzlQKxDA==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, + "node_modules/@nextui-org/modal/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/@nextui-org/pagination": { "version": "2.0.35", "resolved": "https://registry.npmjs.org/@nextui-org/pagination/-/pagination-2.0.35.tgz", @@ -5955,22 +6015,6 @@ "react": ">=18" } }, - "node_modules/@nextui-org/popover/node_modules/@nextui-org/use-aria-button": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-button/-/use-aria-button-2.0.10.tgz", - "integrity": "sha512-tUpp4QMr1zugKPevyToeRHIufTuc/g+67/r/oQLRTG0mMo3yGVmggykQuYn22fqqZPpW6nHcB9VYc+XtZZ27TQ==", - "license": "MIT", - "dependencies": { - "@react-aria/focus": "3.17.1", - "@react-aria/interactions": "3.21.3", - "@react-aria/utils": "3.24.1", - "@react-types/button": "3.9.4", - "@react-types/shared": "3.23.1" - }, - "peerDependencies": { - "react": ">=18" - } - }, "node_modules/@nextui-org/popover/node_modules/@nextui-org/use-measure": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@nextui-org/use-measure/-/use-measure-2.0.2.tgz", @@ -6175,22 +6219,6 @@ "react": ">=18" } }, - "node_modules/@nextui-org/select/node_modules/@nextui-org/use-aria-button": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-button/-/use-aria-button-2.0.10.tgz", - "integrity": "sha512-tUpp4QMr1zugKPevyToeRHIufTuc/g+67/r/oQLRTG0mMo3yGVmggykQuYn22fqqZPpW6nHcB9VYc+XtZZ27TQ==", - "license": "MIT", - "dependencies": { - "@react-aria/focus": "3.17.1", - "@react-aria/interactions": "3.21.3", - "@react-aria/utils": "3.24.1", - "@react-types/button": "3.9.4", - "@react-types/shared": "3.23.1" - }, - "peerDependencies": { - "react": ">=18" - } - }, "node_modules/@nextui-org/select/node_modules/@nextui-org/use-safe-layout-effect": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@nextui-org/use-safe-layout-effect/-/use-safe-layout-effect-2.0.6.tgz", @@ -6418,7 +6446,9 @@ } }, "node_modules/@nextui-org/use-aria-button": { - "version": "2.0.9", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-button/-/use-aria-button-2.0.10.tgz", + "integrity": "sha512-tUpp4QMr1zugKPevyToeRHIufTuc/g+67/r/oQLRTG0mMo3yGVmggykQuYn22fqqZPpW6nHcB9VYc+XtZZ27TQ==", "license": "MIT", "dependencies": { "@react-aria/focus": "3.17.1", @@ -6448,7 +6478,9 @@ } }, "node_modules/@nextui-org/use-aria-modal-overlay": { - "version": "2.0.10", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@nextui-org/use-aria-modal-overlay/-/use-aria-modal-overlay-2.0.11.tgz", + "integrity": "sha512-crMOCHyGIiBJiihxqidJCNR3AHH62uewfImDLEwyE/SlIkhAqW5jteUhkq0QfCSH4U/ydWisQ14niWDEgtzxXg==", "license": "MIT", "dependencies": { "@react-aria/overlays": "3.22.1", @@ -6488,15 +6520,26 @@ } }, "node_modules/@nextui-org/use-callback-ref": { - "version": "2.0.5", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@nextui-org/use-callback-ref/-/use-callback-ref-2.0.6.tgz", + "integrity": "sha512-2WcwWuK1L/wIpTbibnLrysmmkzWomvkVIcgWayB6n/w+bpPrPCG7Zyg2WHzmMmDhe6imV//KKBgNKRi8Xhu/VA==", "license": "MIT", "dependencies": { - "@nextui-org/use-safe-layout-effect": "2.0.5" + "@nextui-org/use-safe-layout-effect": "2.0.6" }, "peerDependencies": { "react": ">=18" } }, + "node_modules/@nextui-org/use-callback-ref/node_modules/@nextui-org/use-safe-layout-effect": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@nextui-org/use-safe-layout-effect/-/use-safe-layout-effect-2.0.6.tgz", + "integrity": "sha512-xzEJXf/g9GaSqjLpQ4+Z2/pw1GPq2Fc5cWRGqEXbGauEMXuH8UboRls1BmIV1RuOpqI6FgxkEmxL1EuVIRVmvQ==", + "license": "MIT", + "peerDependencies": { + "react": ">=18" + } + }, "node_modules/@nextui-org/use-data-scroll-overflow": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/@nextui-org/use-data-scroll-overflow/-/use-data-scroll-overflow-2.1.6.tgz", @@ -6516,10 +6559,12 @@ "license": "MIT" }, "node_modules/@nextui-org/use-disclosure": { - "version": "2.0.9", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@nextui-org/use-disclosure/-/use-disclosure-2.0.10.tgz", + "integrity": "sha512-s2I58d7x2f1JRriZnNm9ZoxrGmxF+DnC9BXM1sD99Wq1VNMd0dhitmx0mUWfUB7l5HLyZgKOeiSLG+ugy1F1Yw==", "license": "MIT", "dependencies": { - "@nextui-org/use-callback-ref": "2.0.5", + "@nextui-org/use-callback-ref": "2.0.6", "@react-aria/utils": "3.24.1", "@react-stately/utils": "3.10.1" },