diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 119c515..e2255e9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -41,7 +41,7 @@ "react-files": "3.0.3", "react-router-dom": "6.28.0", "recharts": "2.13.3", - "tailwind-merge": "1.14.0", + "tailwind-merge": "2.5.5", "tailwindcss": "3.4.15", "tailwindcss-animate": "1.0.7", "typescript": "5.6.3", @@ -9962,9 +9962,10 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "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==", + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.5.tgz", + "integrity": "sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/frontend/package.json b/frontend/package.json index 982eb23..6adc9c8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -40,7 +40,7 @@ "react-files": "3.0.3", "react-router-dom": "6.28.0", "recharts": "2.13.3", - "tailwind-merge": "1.14.0", + "tailwind-merge": "2.5.5", "tailwindcss": "3.4.15", "tailwindcss-animate": "1.0.7", "typescript": "5.6.3",