Bump tailwind-merge from 1.12.0 to 2.5.4

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 1.12.0 to 2.5.4.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v1.12.0...v2.5.4)

---
updated-dependencies:
- dependency-name: tailwind-merge
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot] 2024-10-14 14:44:25 +00:00 committed by GitHub
parent 0eda041c9f
commit 91f0ca83b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions

View File

@ -26,6 +26,6 @@
}, },
"packageManager": "yarn@3.5.1", "packageManager": "yarn@3.5.1",
"dependencies": { "dependencies": {
"tailwind-merge": "^1.12.0" "tailwind-merge": "^2.5.4"
} }
} }

View File

@ -1727,7 +1727,7 @@ __metadata:
postcss: ^8.4.39 postcss: ^8.4.39
svelte: ^3.58.0 svelte: ^3.58.0
svelte-check: ^3.3.1 svelte-check: ^3.3.1
tailwind-merge: ^1.12.0 tailwind-merge: ^2.5.4
tailwindcss: ^3.3.2 tailwindcss: ^3.3.2
tslib: ^2.5.0 tslib: ^2.5.0
typescript: ^5.0.4 typescript: ^5.0.4
@ -2306,10 +2306,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"tailwind-merge@npm:^1.12.0": "tailwind-merge@npm:^2.5.4":
version: 1.12.0 version: 2.5.4
resolution: "tailwind-merge@npm:1.12.0" resolution: "tailwind-merge@npm:2.5.4"
checksum: 5ef323eec1051c4aa9626e29498f6c058dbbb242ca8156aa298de41ada3eda05a8f5f1260a57112c155f63b2e94c4b4ccab5386d60fae54de07aac6d9dbc60e4 checksum: c22adafebd23fc3c7f0ad25935791c10816d4a46460f000ebca4de8d8d22f7652a3746a3d9146599a4648aa92ab390340f6ded04b9152afd2b75fd96929399db
languageName: node languageName: node
linkType: hard linkType: hard