chore(deps): bump tailwind-merge from 1.14.0 to 2.0.0 (#441)

This commit is contained in:
dependabot[bot] 2023-10-31 09:33:55 +08:00 committed by GitHub
parent fd6174eb01
commit 7c273c1c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions

View File

@ -64,7 +64,7 @@
"solid-js": "^1.8.5",
"solid-toast": "^0.5.0",
"sort-package-json": "^2.6.0",
"tailwind-merge": "^1.14.0",
"tailwind-merge": "^2.0.0",
"tailwindcss": "^3.3.5",
"typescript": "^5.2.2",
"uuid": "^9.0.1",

View File

@ -156,8 +156,8 @@ dependencies:
specifier: ^2.6.0
version: 2.6.0
tailwind-merge:
specifier: ^1.14.0
version: 1.14.0
specifier: ^2.0.0
version: 2.0.0
tailwindcss:
specifier: ^3.3.5
version: 3.3.5
@ -1388,6 +1388,13 @@ packages:
regenerator-runtime: 0.14.0
dev: false
/@babel/runtime@7.23.2:
resolution: {integrity: sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==}
engines: {node: '>=6.9.0'}
dependencies:
regenerator-runtime: 0.14.0
dev: false
/@babel/template@7.22.15:
resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==}
engines: {node: '>=6.9.0'}
@ -5905,8 +5912,10 @@ packages:
tslib: 2.6.2
dev: false
/tailwind-merge@1.14.0:
resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
/tailwind-merge@2.0.0:
resolution: {integrity: sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==}
dependencies:
'@babel/runtime': 7.23.2
dev: false
/tailwindcss@3.3.5: