Merge pull request #622 from ahmadk953/dependabot/npm_and_yarn/tailwind-merge-2.5.3

Bump tailwind-merge from 2.5.2 to 2.5.3
This commit is contained in:
Ahmad 2024-10-04 19:12:06 -04:00 committed by GitHub
commit 5bacbaef79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 69 deletions

View file

@ -44,7 +44,7 @@
"sharp": "^0.33.5",
"sonner": "^1.5.0",
"stripe": "^17.1.0",
"tailwind-merge": "^2.5.2",
"tailwind-merge": "^2.5.3",
"tailwindcss-animate": "^1.0.7",
"unsplash-js": "^7.0.19",
"usehooks-ts": "^3.1.0",

View file

@ -1249,29 +1249,6 @@ __metadata:
languageName: node
linkType: hard
"@radix-ui/react-dismissable-layer@npm:1.1.0":
version: 1.1.0
resolution: "@radix-ui/react-dismissable-layer@npm:1.1.0"
dependencies:
"@radix-ui/primitive": "npm:1.1.0"
"@radix-ui/react-compose-refs": "npm:1.1.0"
"@radix-ui/react-primitive": "npm:2.0.0"
"@radix-ui/react-use-callback-ref": "npm:1.1.0"
"@radix-ui/react-use-escape-keydown": "npm:1.1.0"
peerDependencies:
"@types/react": "*"
"@types/react-dom": "*"
react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
peerDependenciesMeta:
"@types/react":
optional: true
"@types/react-dom":
optional: true
checksum: 10c0/72967068ab02127b668ecfd0a1863149e2a42d9fd12d3247f51422a41f3d5faa82a147a5b0a8a6ec609eff8fe6baede6fb7d6111f76896656d13567e3ec29ba8
languageName: node
linkType: hard
"@radix-ui/react-dismissable-layer@npm:1.1.1":
version: 1.1.1
resolution: "@radix-ui/react-dismissable-layer@npm:1.1.1"
@ -1424,26 +1401,6 @@ __metadata:
languageName: node
linkType: hard
"@radix-ui/react-portal@npm:1.1.1":
version: 1.1.1
resolution: "@radix-ui/react-portal@npm:1.1.1"
dependencies:
"@radix-ui/react-primitive": "npm:2.0.0"
"@radix-ui/react-use-layout-effect": "npm:1.1.0"
peerDependencies:
"@types/react": "*"
"@types/react-dom": "*"
react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
peerDependenciesMeta:
"@types/react":
optional: true
"@types/react-dom":
optional: true
checksum: 10c0/7e7130fcb0d99197322cd97987e1d7279b6c264fb6be3d883cbfcd49267740d83ca17b431e0d98848afd6067a13ee823ca396a8b63ae68f18a728cf70398c830
languageName: node
linkType: hard
"@radix-ui/react-portal@npm:1.1.2":
version: 1.1.2
resolution: "@radix-ui/react-portal@npm:1.1.2"
@ -1464,26 +1421,6 @@ __metadata:
languageName: node
linkType: hard
"@radix-ui/react-presence@npm:1.1.0":
version: 1.1.0
resolution: "@radix-ui/react-presence@npm:1.1.0"
dependencies:
"@radix-ui/react-compose-refs": "npm:1.1.0"
"@radix-ui/react-use-layout-effect": "npm:1.1.0"
peerDependencies:
"@types/react": "*"
"@types/react-dom": "*"
react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
peerDependenciesMeta:
"@types/react":
optional: true
"@types/react-dom":
optional: true
checksum: 10c0/58acb658b15b72991ad7a234ea90995902c470b3a182aa90ad03145cbbeaa40f211700c444bfa14cf47537cbb6b732e1359bc5396182de839bd680843c11bf31
languageName: node
linkType: hard
"@radix-ui/react-presence@npm:1.1.1":
version: 1.1.1
resolution: "@radix-ui/react-presence@npm:1.1.1"
@ -6269,10 +6206,10 @@ __metadata:
languageName: node
linkType: hard
"tailwind-merge@npm:^2.5.2":
version: 2.5.2
resolution: "tailwind-merge@npm:2.5.2"
checksum: 10c0/e43a9a468f7ba4ed5b4a399558d96d6270a3d8131dca111cccc803e71cc23885060d18d721f312a24fff0a75c567dbb30b2a87c18aba25eb4255df197d8170ab
"tailwind-merge@npm:^2.5.3":
version: 2.5.3
resolution: "tailwind-merge@npm:2.5.3"
checksum: 10c0/1d3fb3eae7b5d7c30aad1e7cf74cf5e6fcb1e0319cc91bb29e266837819b23cd226d667a15e8d3f26db81b4abc30332be5d831f2c819e1bebafdcd7b2a1d4e48
languageName: node
linkType: hard
@ -6391,7 +6328,7 @@ __metadata:
sharp: "npm:^0.33.5"
sonner: "npm:^1.5.0"
stripe: "npm:^17.1.0"
tailwind-merge: "npm:^2.5.2"
tailwind-merge: "npm:^2.5.3"
tailwindcss: "npm:^3.4.13"
tailwindcss-animate: "npm:^1.0.7"
typescript: "npm:^5.6.2"