Skip to content

Commit 72b018c

Browse files
fix(deps): update dependency tailwind-merge to v2
1 parent 85cf605 commit 72b018c

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"next": "13.5.4",
2424
"react": "18.2.0",
2525
"react-dom": "18.2.0",
26-
"tailwind-merge": "^1.13.2",
26+
"tailwind-merge": "^2.0.0",
2727
"tailwindcss": "^3.3.2",
2828
"tailwindcss-animate": "^1.0.6",
2929
"typescript": "5.2.2"

yarn.lock

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
dependencies:
2727
regenerator-runtime "^0.13.11"
2828

29+
"@babel/runtime@^7.23.1":
30+
version "7.23.2"
31+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
32+
integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
33+
dependencies:
34+
regenerator-runtime "^0.14.0"
35+
2936
"@eslint-community/eslint-utils@^4.2.0":
3037
version "4.4.0"
3138
resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -2783,10 +2790,12 @@ synckit@^0.8.5:
27832790
"@pkgr/utils" "^2.3.1"
27842791
tslib "^2.5.0"
27852792

2786-
tailwind-merge@^1.13.2:
2787-
version "1.14.0"
2788-
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b"
2789-
integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==
2793+
tailwind-merge@^2.0.0:
2794+
version "2.0.0"
2795+
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.0.0.tgz#a0f3a8c874ebae5feec5595614d08245a5f88a39"
2796+
integrity sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==
2797+
dependencies:
2798+
"@babel/runtime" "^7.23.1"
27902799

27912800
tailwindcss-animate@^1.0.6:
27922801
version "1.0.7"

0 commit comments

Comments
 (0)