build(deps): bump tailwind-merge from 2.4.0 to 2.5.2 (#911)

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.4.0 to 2.5.2.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.4.0...v2.5.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
dependabot[bot] 2024-08-13 10:47:11 +08:00 committed by GitHub
parent 2389734854
commit 1114c9c7cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions

View File

@ -62,7 +62,7 @@
"solid-js": "^1.8.20",
"solid-toast": "^0.5.0",
"sort-package-json": "^2.10.0",
"tailwind-merge": "^2.4.0",
"tailwind-merge": "^2.5.2",
"tailwindcss": "^3.4.9",
"typescript": "^5.5.4",
"typescript-eslint": "^8.0.1",

View File

@ -153,8 +153,8 @@ importers:
specifier: ^2.10.0
version: 2.10.0
tailwind-merge:
specifier: ^2.4.0
version: 2.4.0
specifier: ^2.5.2
version: 2.5.2
tailwindcss:
specifier: ^3.4.9
version: 3.4.9
@ -3399,8 +3399,8 @@ packages:
resolution: {integrity: sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==}
engines: {node: ^14.18.0 || >=16.0.0}
tailwind-merge@2.4.0:
resolution: {integrity: sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==}
tailwind-merge@2.5.2:
resolution: {integrity: sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==}
tailwindcss@3.4.9:
resolution: {integrity: sha512-1SEOvRr6sSdV5IDf9iC+NU4dhwdqzF4zKKq3sAbasUWHEM6lsMhX+eNN5gkPx1BvLFEnZQEUFbXnGj8Qlp83Pg==}
@ -7176,7 +7176,7 @@ snapshots:
'@pkgr/core': 0.1.1
tslib: 2.6.3
tailwind-merge@2.4.0: {}
tailwind-merge@2.5.2: {}
tailwindcss@3.4.9:
dependencies: