From eb304023b7d43780560fc2f96a949a33e6ee423c Mon Sep 17 00:00:00 2001 From: Pablo Lara Date: Tue, 13 May 2025 09:27:27 +0200 Subject: [PATCH] chore: bump tailwind-merge from 2.5.3 to 3.2.0 (#7722) --- ui/package-lock.json | 8 ++++---- ui/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index f86d6169d2..b00fb5b597 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -47,7 +47,7 @@ "server-only": "^0.0.1", "shadcn-ui": "^0.2.3", "sharp": "^0.33.5", - "tailwind-merge": "^2.5.3", + "tailwind-merge": "^3.2.0", "tailwindcss-animate": "^1.0.7", "uuid": "^11.0.5", "zod": "^3.23.8", @@ -14475,9 +14475,9 @@ } }, "node_modules/tailwind-merge": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.3.tgz", - "integrity": "sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.0.tgz", + "integrity": "sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==", "license": "MIT", "funding": { "type": "github", diff --git a/ui/package.json b/ui/package.json index 13a4ae147e..5d16567d19 100644 --- a/ui/package.json +++ b/ui/package.json @@ -39,7 +39,7 @@ "server-only": "^0.0.1", "shadcn-ui": "^0.2.3", "sharp": "^0.33.5", - "tailwind-merge": "^2.5.3", + "tailwind-merge": "^3.2.0", "tailwindcss-animate": "^1.0.7", "uuid": "^11.0.5", "zod": "^3.23.8",