From e0dd6fbf6a0b4ae117974155ee7b28ea21ad8d52 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Feb 2026 04:02:55 +0000 Subject: [PATCH] Update dependency tailwind-merge to v3 --- package-lock.json | 19 +++++++++++++++---- package.json | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75aed861..0b9ced61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -67,7 +67,7 @@ "react-responsive": "^9.0.2", "react-virtuoso": "^4.9.0", "swr": "^2.2.4", - "tailwind-merge": "^1.14.0", + "tailwind-merge": "^3.0.0", "tailwindcss-animate": "^1.0.7", "typescript": "^5" }, @@ -4853,6 +4853,16 @@ "tailwindcss": "^3" } }, + "node_modules/flowbite-react/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==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -7843,9 +7853,10 @@ "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" }, "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": "3.5.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", + "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/package.json b/package.json index b63bac9c..208af8b8 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "react-responsive": "^9.0.2", "react-virtuoso": "^4.9.0", "swr": "^2.2.4", - "tailwind-merge": "^1.14.0", + "tailwind-merge": "^3.0.0", "tailwindcss-animate": "^1.0.7", "typescript": "^5" },