Skip to content

Commit 623f60a

Browse files
fix(deps): update dependency tailwind-merge to v3
1 parent a9b6b1d commit 623f60a

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"react-dom": "^19.0.0",
3232
"react-scroll-motion": "^0.3.5",
3333
"swr": "^2.3.3",
34-
"tailwind-merge": "^2.2.2",
34+
"tailwind-merge": "^3.0.0",
3535
"tailwindcss-animate": "^1.0.7",
3636
"use-mobile-detect-hook": "^1.0.5"
3737
},

yarn.lock

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77
resolved "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz"
88
integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
99

10-
"@babel/runtime@^7.24.1":
11-
version "7.24.7"
12-
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz"
13-
integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==
14-
dependencies:
15-
regenerator-runtime "^0.14.0"
16-
1710
"@babel/runtime@^7.26.10":
1811
version "7.28.4"
1912
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
@@ -3103,11 +3096,6 @@ reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
31033096
get-proto "^1.0.1"
31043097
which-builtin-type "^1.2.1"
31053098

3106-
regenerator-runtime@^0.14.0:
3107-
version "0.14.1"
3108-
resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz"
3109-
integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
3110-
31113099
regexp.prototype.flags@^1.5.3, regexp.prototype.flags@^1.5.4:
31123100
version "1.5.4"
31133101
resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz"
@@ -3528,12 +3516,10 @@ swr@^2.3.3:
35283516
dequal "^2.0.3"
35293517
use-sync-external-store "^1.4.0"
35303518

3531-
tailwind-merge@^2.2.2:
3532-
version "2.3.0"
3533-
resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.3.0.tgz"
3534-
integrity sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==
3535-
dependencies:
3536-
"@babel/runtime" "^7.24.1"
3519+
tailwind-merge@^3.0.0:
3520+
version "3.3.1"
3521+
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.3.1.tgz#a7e7db7c714f6020319e626ecfb7e7dac8393a4b"
3522+
integrity sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==
35373523

35383524
tailwindcss-animate@^1.0.7:
35393525
version "1.0.7"

0 commit comments

Comments
 (0)