diff --git a/package.json b/package.json index 3a6af900..a6acaa3b 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "recharts": "^2.8.0", "sharp": "^0.32.6", "stripe": "13.11.0", - "tailwind-merge": "^1.14.0", + "tailwind-merge": "^2.0.0", "tailwindcss-animate": "^1.0.7", "zod": "^3.22.4", "zod-validation-error": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 4c36e0dc..5154b904 100644 --- a/yarn.lock +++ b/yarn.lock @@ -261,7 +261,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2": +"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.1, @babel/runtime@npm:^7.23.2": version: 7.23.2 resolution: "@babel/runtime@npm:7.23.2" dependencies: @@ -5396,7 +5396,7 @@ __metadata: recharts: "npm:^2.8.0" sharp: "npm:^0.32.6" stripe: "npm:13.11.0" - tailwind-merge: "npm:^1.14.0" + tailwind-merge: "npm:^2.0.0" tailwindcss: "npm:latest" tailwindcss-animate: "npm:^1.0.7" ts-node: "npm:^10.9.1" @@ -8024,10 +8024,12 @@ __metadata: languageName: node linkType: hard -"tailwind-merge@npm:^1.14.0": - version: 1.14.0 - resolution: "tailwind-merge@npm:1.14.0" - checksum: a66f5ab1a2bb2b0f5a40a031867a6bc900de98eb3339b2a51759351221527a3d600eecb6cb5a038830aa89548eba72bb63aa3856cb9f31c9a3918b42eb3df350 +"tailwind-merge@npm:^2.0.0": + version: 2.0.0 + resolution: "tailwind-merge@npm:2.0.0" + dependencies: + "@babel/runtime": "npm:^7.23.1" + checksum: 3fa9a5c9b49be23782323961f1e0cccfddce5e75eab5d8c6b3beeeac42ebd3caefe83f6074e93f32d26758b310b75db9aa3de333220e6242c7623b9c0d96ff89 languageName: node linkType: hard