Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore: Bump `tailwind-merge` (#45419)

Ivan Vasilov619182267b2f
diff --git a/apps/ui-library/package.json b/apps/ui-library/package.json
index 1e14e43890d..a79668ff679 100644
--- a/apps/ui-library/package.json
+++ b/apps/ui-library/package.json
@@ -27,7 +27,7 @@
"@tanstack/react-query": "^5.83.0",
"api-types": "workspace:*",
"axios": "^1.12.0",
- "class-variance-authority": "*",
+ "class-variance-authority": "^0.7.1",
"cmdk": "^1.1.1",
"common": "workspace:*",
"common-tags": "^1.8.2",
diff --git a/apps/www/package.json b/apps/www/package.json
index 8199a30125e..219f472836a 100644
--- a/apps/www/package.json
+++ b/apps/www/package.json
@@ -40,7 +40,7 @@
"animejs": "^4.0.2",
"class-variance-authority": "^0.7.1",
"classnames": "^2.3.1",
- "clsx": "^1.2.1",
+ "clsx": "^2.1.1",
"cobe": "^0.6.5",
"common": "workspace:*",
"common-tags": "^1.8.2",
diff --git a/blocks/vue/package.json b/blocks/vue/package.json
index 65198ec9bdd..86649e56037 100644
--- a/blocks/vue/package.json
+++ b/blocks/vue/package.json
@@ -18,7 +18,7 @@
"h3": "^1.15.10",
"lucide-vue-next": "^0.562.0",
"nuxt": "^4.4.0",
- "tailwind-merge": "^3.3.1",
+ "tailwind-merge": "^3.5.0",
"vue": "^3.5.21",
"vue-router": "^4.5.1"
},
diff --git a/packages/ui-patterns/package.json b/packages/ui-patterns/package.json
index 78732b91f48..975a6f3de69 100644
--- a/packages/ui-patterns/package.json
+++ b/packages/ui-patterns/package.json
@@ -786,8 +786,8 @@
"@supabase/sql-to-rest": "^0.1.6",
"@supabase/supabase-js": "catalog:",
"@tanstack/react-table": "^8.21.3",
- "class-variance-authority": "^0.6.0",
- "clsx": "^1.2.1",
+ "class-variance-authority": "^0.7.1",
+ "clsx": "^2.1.1",
"cmdk": "^1.1.1",
"common": "workspace:*",
"common-tags": "^1.8.2",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 09dcda85fac..a15b6fbedab 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -17,8 +17,8 @@
"dependencies": {
"@tailwindcss/forms": "^0.5.11",
"@tailwindcss/typography": "^0.5.19",
- "class-variance-authority": "^0.6.1",
- "clsx": "^1.2.1",
+ "class-variance-authority": "^0.7.1",
+ "clsx": "^2.1.1",
"cmdk": "^1.1.1",
"color": "^4.2.3",
"date-fns": "^2.30.0",
@@ -38,7 +38,7 @@
"react-resizable-panels": "^4.6.5",
"recharts": "catalog:",
"sonner": "^1.5.0",
- "tailwind-merge": "^1.13.2",
+ "tailwind-merge": "^3.5.0",
"tailwindcss": "catalog:",
"vaul": "^0.9.9"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1939a0947ef..5edbb505d1f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1395,8 +1395,8 @@ importers:
specifier: ^1.12.0
version: 1.15.0
class-variance-authority:
- specifier: '*'
- version: 0.6.1
+ specifier: ^0.7.1
+ version: 0.7.1
cmdk:
specifier: ^1.1.1
@@ -1651,8 +1651,8 @@ importers:
specifier: ^2.3.1
version: 2.3.2
clsx:
- specifier: ^1.2.1
- version: 1.2.1
+ specifier: ^2.1.1
+ version: 2.1.1
cobe:
specifier: ^0.6.5
version: 0.6.5
@@ -1907,8 +1907,8 @@ importers:
specifier: ^4.4.0
tailwind-merge:
- specifier: ^3.3.1
- version: 3.3.1
+ specifier: ^3.5.0
+ version: 3.5.0
vue:
specifier: ^3.5.21
version: 3.5.30([email protected])
@@ -2378,11 +2378,11 @@ importers:
specifier: ^0.5.19
version: 0.5.19([email protected])
class-variance-authority:
- specifier: ^0.6.1
- version: 0.6.1
+ specifier: ^0.7.1
+ version: 0.7.1
clsx:
- specifier: ^1.2.1
- version: 1.2.1
+ specifier: ^2.1.1
+ version: 2.1.1
cmdk:
specifier: ^1.1.1
@@ -2441,8 +2441,8 @@ importers:
specifier: ^1.5.0
tailwind-merge:
- specifier: ^1.13.2
- version: 1.14.0
+ specifier: ^3.5.0
+ version: 3.5.0
tailwindcss:
specifier: 'catalog:'
version: 4.2.4
@@ -2514,11 +2514,11 @@ importers:
specifier: ^8.21.3
class-variance-authority:
- specifier: ^0.6.0
- version: 0.6.1
+ specifier: ^0.7.1
+ version: 0.7.1
clsx:
- specifier: ^1.2.1
- version: 1.2.1
+ specifier: ^2.1.1
+ version: 2.1.1
cmdk:
specifier: ^1.1.1
@@ -9668,9 +9668,6 @@ packages:
resolution: {integrity: sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==}
- resolution: {integrity: sha512-eurOEGc7YVx3majOrOb099PNKgO3KnKSApOprXI4BTq6bcfbqbQXPN2u+rPPmIJ2di23bMwhk0SxCCthBmszEQ==}
-
resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
@@ -16486,11 +16483,8 @@ packages:
resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
engines: {node: '>=20'}
- resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
-
- resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}
+ resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==}
resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
@@ -26541,10 +26535,6 @@ snapshots:
- dependencies:
- clsx: 1.2.1
-
dependencies:
clsx: 2.1.1
@@ -34707,7 +34697,7 @@ snapshots:
remark-gfm: 4.0.1([email protected])
remark-math: 6.0.0([email protected])
shiki: 3.13.0
- tailwind-merge: 3.3.1
+ tailwind-merge: 3.5.0
transitivePeerDependencies:
- '@types/react'
- supports-color
@@ -35026,9 +35016,7 @@ snapshots:
-
dependencies: