From 57f0c847a4ec538a024705e7c1ff54ce2bbdd872 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 May 2026 23:24:01 +0000 Subject: [PATCH] chore(deps): Bump tailwind-merge from 2.6.1 to 3.6.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.1 to 3.6.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.6.1...v3.6.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a3738cd..ef030d2 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "lucide-react": "^0.563.0", "nanoid": "^5.1.7", "slack-blocks-to-jsx": "^1.0.4", - "tailwind-merge": "^2.6.0" + "tailwind-merge": "^3.6.0" }, "peerDependencies": { "react": "^18.0.0 || ^19.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ea5791..2b44c9f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,8 +63,8 @@ importers: specifier: ^1.0.4 version: 1.0.4(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6) tailwind-merge: - specifier: ^2.6.0 - version: 2.6.1 + specifier: ^3.6.0 + version: 3.6.0 devDependencies: '@biomejs/biome': specifier: ^2.4.15 @@ -3180,8 +3180,8 @@ packages: symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} - tailwind-merge@2.6.1: - resolution: {integrity: sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==} + tailwind-merge@3.6.0: + resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==} tailwindcss@4.3.0: resolution: {integrity: sha512-y6nxMGB1nMW9R6k96e5gdIFzcfL/gTJRNaqGes1YvkLnPVXzWgbqFF2yLC0T8G774n24cx3Pe8XrKoniCOAH+Q==} @@ -6577,7 +6577,7 @@ snapshots: symbol-tree@3.2.4: {} - tailwind-merge@2.6.1: {} + tailwind-merge@3.6.0: {} tailwindcss@4.3.0: {}