diff --git a/package-lock.json b/package-lock.json index 3b7339d..0271023 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15267,8 +15267,12 @@ } }, "node_modules/tailwind-merge": { - "version": "1.14.0", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.0.0.tgz", + "integrity": "sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==", + "dependencies": { + "@babel/runtime": "^7.23.1" + }, "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" @@ -15288,6 +15292,15 @@ "tailwindcss": "*" } }, + "node_modules/tailwind-variants/node_modules/tailwind-merge": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.14.0.tgz", + "integrity": "sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/tailwindcss": { "version": "0.0.0-insiders.44fb67b", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-0.0.0-insiders.44fb67b.tgz", @@ -16632,7 +16645,7 @@ "react-aria": "^3.29.1", "react-aria-components": "^1.0.0-beta.2", "react-dom": "^18.2.0", - "tailwind-merge": "^1.14.0", + "tailwind-merge": "^2.0.0", "tailwind-variants": "^0.1.14", "tailwindcss-animate": "^1.0.7" }, diff --git "a/src/\347\254\2546\347\253\240_Tailwind_CSS\343\201\247\343\202\263\343\203\263\343\203\235\343\203\274\343\203\215\343\203\263\343\203\210\343\202\222\350\250\255\350\250\210\343\201\231\343\202\213/package.json" "b/src/\347\254\2546\347\253\240_Tailwind_CSS\343\201\247\343\202\263\343\203\263\343\203\235\343\203\274\343\203\215\343\203\263\343\203\210\343\202\222\350\250\255\350\250\210\343\201\231\343\202\213/package.json" index 3f2501b..f591a3e 100644 --- "a/src/\347\254\2546\347\253\240_Tailwind_CSS\343\201\247\343\202\263\343\203\263\343\203\235\343\203\274\343\203\215\343\203\263\343\203\210\343\202\222\350\250\255\350\250\210\343\201\231\343\202\213/package.json" +++ "b/src/\347\254\2546\347\253\240_Tailwind_CSS\343\201\247\343\202\263\343\203\263\343\203\235\343\203\274\343\203\215\343\203\263\343\203\210\343\202\222\350\250\255\350\250\210\343\201\231\343\202\213/package.json" @@ -22,7 +22,7 @@ "react-aria": "^3.29.1", "react-aria-components": "^1.0.0-beta.2", "react-dom": "^18.2.0", - "tailwind-merge": "^1.14.0", + "tailwind-merge": "^2.0.0", "tailwind-variants": "^0.1.14", "tailwindcss-animate": "^1.0.7" },