From 2c17ca910654f6ba8b8de171e73c6e4e9d12ce5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Nov 2026 23:46:00 +0000 Subject: [PATCH] build(deps): Bump tailwind-merge from 2.6.1 to 3.7.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge/tree/HEAD/packages/tailwind-merge) from 2.6.1 to 3.7.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/commits/tailwind-merge@3.7.0/packages/tailwind-merge) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/chat/package.json | 2 +- packages/ui/package.json | 2 +- pnpm-lock.yaml | 11 +++-------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/chat/package.json b/packages/chat/package.json index dda02aa..405fd97 100644 --- a/packages/chat/package.json +++ b/packages/chat/package.json @@ -35,7 +35,7 @@ "@ai-sdk/react": "^1.0.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", - "tailwind-merge": "^2.2.0" + "tailwind-merge": "^3.7.0" }, "devDependencies": { "@types/react": "^19.0.0", diff --git a/packages/ui/package.json b/packages/ui/package.json index 1d34c17..c037848 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -61,7 +61,7 @@ "@radix-ui/react-tooltip": "^1.1.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", - "tailwind-merge": "^3.4.0" + "tailwind-merge": "^3.7.0" }, "devDependencies": { "@tailwindcss/postcss": "^4.1.18", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 057cc2f..f530024 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -130,8 +130,8 @@ importers: specifier: ^2.1.0 version: 2.1.1 tailwind-merge: - specifier: ^2.2.0 - version: 2.6.1 + specifier: ^3.7.0 + version: 3.7.0 devDependencies: '@types/react': specifier: ^19.0.0 @@ -412,7 +412,7 @@ importers: specifier: ^19.0.0 version: 19.3.1(react@19.3.1) tailwind-merge: - specifier: ^3.4.0 + specifier: ^3.7.0 version: 3.7.0 devDependencies: '@tailwindcss/postcss': @@ -2888,9 +2888,6 @@ packages: peerDependencies: react: ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - tailwind-merge@2.6.1: - resolution: {integrity: sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==} - tailwind-merge@3.7.0: resolution: {integrity: sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA==} @@ -5637,8 +5634,6 @@ snapshots: react: 19.3.1 use-sync-external-store: 1.7.0(react@19.3.1) - tailwind-merge@2.6.1: {} - tailwind-merge@3.7.0: {} tailwindcss@4.3.4: {}