build(deps): bump tailwind-merge from 2.3.0 to 2.4.0 (#813)

This commit is contained in:
dependabot[bot] 2024-07-10 11:45:55 +08:00 committed by GitHub
parent 1a65400ddc
commit 727184a506
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 8 deletions

View File

@ -62,7 +62,7 @@
"solid-js": "^1.8.18", "solid-js": "^1.8.18",
"solid-toast": "^0.5.0", "solid-toast": "^0.5.0",
"sort-package-json": "^2.10.0", "sort-package-json": "^2.10.0",
"tailwind-merge": "^2.3.0", "tailwind-merge": "^2.4.0",
"tailwindcss": "^3.4.4", "tailwindcss": "^3.4.4",
"typescript": "^5.5.3", "typescript": "^5.5.3",
"typescript-eslint": "^7.15.0", "typescript-eslint": "^7.15.0",

View File

@ -153,8 +153,8 @@ importers:
specifier: ^2.10.0 specifier: ^2.10.0
version: 2.10.0 version: 2.10.0
tailwind-merge: tailwind-merge:
specifier: ^2.3.0 specifier: ^2.4.0
version: 2.3.0 version: 2.4.0
tailwindcss: tailwindcss:
specifier: ^3.4.4 specifier: ^3.4.4
version: 3.4.4 version: 3.4.4
@ -3352,8 +3352,8 @@ packages:
resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==} resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==}
engines: {node: ^14.18.0 || >=16.0.0} engines: {node: ^14.18.0 || >=16.0.0}
tailwind-merge@2.3.0: tailwind-merge@2.4.0:
resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==} resolution: {integrity: sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==}
tailwindcss@3.4.4: tailwindcss@3.4.4:
resolution: {integrity: sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==} resolution: {integrity: sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==}
@ -7084,9 +7084,7 @@ snapshots:
'@pkgr/core': 0.1.1 '@pkgr/core': 0.1.1
tslib: 2.6.3 tslib: 2.6.3
tailwind-merge@2.3.0: tailwind-merge@2.4.0: {}
dependencies:
'@babel/runtime': 7.24.7
tailwindcss@3.4.4: tailwindcss@3.4.4:
dependencies: dependencies: