Skip to content

Commit ce477c3

Browse files
Bump tailwind-merge from 2.5.5 to 3.0.2
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.5.5 to 3.0.2. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](dcastil/tailwind-merge@v2.5.5...v3.0.2) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent 56d003f commit ce477c3

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

examples/react-client/fishjam-chat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"react-dom": "^19.0.0",
3434
"react-hook-form": "^7.54.2",
3535
"sonner": "^2.0.1",
36-
"tailwind-merge": "^2.5.5",
36+
"tailwind-merge": "^3.0.2",
3737
"tailwindcss-animate": "^1.0.7"
3838
},
3939
"devDependencies": {

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ __metadata:
823823
react-dom: "npm:^19.0.0"
824824
react-hook-form: "npm:^7.54.2"
825825
sonner: "npm:^2.0.1"
826-
tailwind-merge: "npm:^2.5.5"
826+
tailwind-merge: "npm:^3.0.2"
827827
tailwindcss: "npm:^3.4.17"
828828
tailwindcss-animate: "npm:^1.0.7"
829829
typescript: "npm:^5.7.3"
@@ -7681,10 +7681,10 @@ __metadata:
76817681
languageName: node
76827682
linkType: hard
76837683

7684-
"tailwind-merge@npm:^2.5.5":
7685-
version: 2.5.5
7686-
resolution: "tailwind-merge@npm:2.5.5"
7687-
checksum: 10c0/32614dd2b4ddd4fab070d5ec569e6da00e2b34269b9ac2f2ff16733cef29a076c8e2210fbfc1904d7983a8fdb6b3e63d18ca117645f21b12ca7bcf8fe3507241
7684+
"tailwind-merge@npm:^3.0.2":
7685+
version: 3.0.2
7686+
resolution: "tailwind-merge@npm:3.0.2"
7687+
checksum: 10c0/73f528345e5130e7690c5c57701155849ae4f0834e0a4bf56bc03e25d4563d45d4905ff9c487a7dce9efdfa18689a223e78365962105ad0e2f2d1226216c66ef
76887688
languageName: node
76897689
linkType: hard
76907690

0 commit comments

Comments
 (0)