Skip to content

UI Library for Design Engineers. Animated components and effects you can copy and paste into your apps. Free. Open Source.

⬆️ upgrade: bump tailwind-merge and tailwind

Dillion Vermadfdbf2ed3bd8
diff --git a/package.json b/package.json
index 99643682..f6ed0c94 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
"schema-dts": "^1.1.2",
"stripe": "^12.10.0",
"swr": "^2.2.0",
- "tailwind-merge": "^1.13.2",
+ "tailwind-merge": "^2.0.0",
"turbo": "^1.10.16",
"zod": "^3.21.4"
},
@@ -108,7 +108,7 @@
"remark": "^14.0.3",
"remark-gfm": "^3.0.1",
"shiki": "^0.14.2",
- "tailwindcss": "3.3.2",
+ "tailwindcss": "3.3.5",
"tailwindcss-animate": "^1.0.6",
"typescript": "^5.2.2",
"unist-builder": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 0859aacd..e1eae6e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -53,7 +53,7 @@
chalk "^2.4.2"
js-tokens "^4.0.0"
-"@babel/runtime@^7.13.10", "@babel/runtime@^7.16.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0":
+"@babel/runtime@^7.13.10", "@babel/runtime@^7.16.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.1":
version "7.23.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
@@ -3564,7 +3564,7 @@ [email protected]:
dependencies:
unzipper "^0.10.11"
-fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.1:
+fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
@@ -4569,7 +4569,7 @@ iterator.prototype@^1.1.2:
reflect.getprototypeof "^1.0.4"
set-function-name "^2.0.1"
-jiti@^1.18.2:
+jiti@^1.19.1:
version "1.21.0"
resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
@@ -7377,10 +7377,12 @@ swr@^2.2.0:
client-only "^0.0.1"
use-sync-external-store "^1.2.0"
-tailwind-merge@^1.13.2:
- version "1.14.0"
- resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b"
- integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==
+tailwind-merge@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.0.0.tgz#a0f3a8c874ebae5feec5595614d08245a5f88a39"
+ integrity sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==
+ dependencies:
+ "@babel/runtime" "^7.23.1"
tailwindcss-animate@^1.0.6:
version "1.0.7"
@@ -7416,20 +7418,20 @@ [email protected]:
quick-lru "^5.1.1"
resolve "^1.22.1"
- version "3.3.2"
- resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.2.tgz#2f9e35d715fdf0bbf674d90147a0684d7054a2d3"
- integrity sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==
+ version "3.3.5"
+ resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.5.tgz#22a59e2fbe0ecb6660809d9cc5f3976b077be3b8"
+ integrity sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==
dependencies:
"@alloc/quick-lru" "^5.2.0"
arg "^5.0.2"
chokidar "^3.5.3"
didyoumean "^1.2.2"
dlv "^1.1.3"
- fast-glob "^3.2.12"
+ fast-glob "^3.3.0"
glob-parent "^6.0.2"
is-glob "^4.0.3"
- jiti "^1.18.2"
+ jiti "^1.19.1"
lilconfig "^2.1.0"
micromatch "^4.0.5"
normalize-path "^3.0.0"
@@ -7441,7 +7443,6 @@ [email protected]:
postcss-load-config "^4.0.1"
postcss-nested "^6.0.1"
postcss-selector-parser "^6.0.11"
- postcss-value-parser "^4.2.0"
resolve "^1.22.2"
sucrase "^3.32.0"