Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

chore(deps-dev): bump tailwind-merge from 2.6.1 to 3.5.0 (#1808)

dependabot[bot]b94205dd8242
diff --git a/internal/vibe-tests/package.json b/internal/vibe-tests/package.json
index 9bf8150892..9ffd6514ce 100644
--- a/internal/vibe-tests/package.json
+++ b/internal/vibe-tests/package.json
@@ -57,7 +57,7 @@
"cmdk": "^1.0.0",
"lucide-react": "^1.11.0",
"postcss": "^8.5.10",
- "tailwind-merge": "^2.3.0",
+ "tailwind-merge": "^3.5.0",
"tailwindcss": "^4.2.1",
"tsx": "^4.19.0"
}
diff --git a/yarn.lock b/yarn.lock
index ecc7949c86..01c18b1d88 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6019,10 +6019,10 @@ symbol-tree@^3.2.4:
resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-tailwind-merge@^2.3.0:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.1.tgz#a9d58240f664d21c33c379a092d9a273f833443b"
- integrity sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==
+tailwind-merge@^3.5.0:
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.5.0.tgz#06502f4496ba15151445d97d916a26564d50d1ca"
+ integrity sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==
[email protected], tailwindcss@^4, tailwindcss@^4.2.1:
version "4.2.4"