fix(deps): upgrade tailwind-merge to v3 and declare lucide-react in storefront
Some checks failed
Deploy — Staging / Lint, Typecheck & Test (push) Successful in 2m40s
Deploy — Staging / Build & push — admin (push) Successful in 3m40s
Deploy — Staging / Build & push — storefront (push) Failing after 2m39s
Deploy — Staging / Deploy to staging VPS (push) Has been skipped

- apps/admin: tailwind-merge ^2.6.1 → ^3.4.0 so root resolves to v3.x,
  satisfying @heroui/styles/node_modules/tailwind-variants peer dep (>=3.0.0)
- apps/storefront: add lucide-react ^0.400.0 as explicit dep (used in
  SearchEmptyState and SearchResultsPanel but was previously undeclared)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-03-08 10:31:29 +03:00
parent 5b0a727bce
commit 33fed9382a
3 changed files with 9 additions and 18 deletions

View File

@@ -29,7 +29,7 @@
"radix-ui": "^1.4.3", "radix-ui": "^1.4.3",
"react-hook-form": "^7.71.2", "react-hook-form": "^7.71.2",
"sonner": "^2.0.7", "sonner": "^2.0.7",
"tailwind-merge": "^2.6.1", "tailwind-merge": "^3.4.0",
"zod": "^3.25.76" "zod": "^3.25.76"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -18,6 +18,7 @@
"@repo/utils": "*", "@repo/utils": "*",
"@stripe/react-stripe-js": "^5.6.0", "@stripe/react-stripe-js": "^5.6.0",
"@stripe/stripe-js": "^8.8.0", "@stripe/stripe-js": "^8.8.0",
"framer-motion": "^11.0.0" "framer-motion": "^11.0.0",
"lucide-react": "^0.400.0"
} }
} }

22
package-lock.json generated
View File

@@ -65,7 +65,7 @@
"radix-ui": "^1.4.3", "radix-ui": "^1.4.3",
"react-hook-form": "^7.71.2", "react-hook-form": "^7.71.2",
"sonner": "^2.0.7", "sonner": "^2.0.7",
"tailwind-merge": "^2.6.1", "tailwind-merge": "^3.4.0",
"zod": "^3.25.76" "zod": "^3.25.76"
}, },
"devDependencies": { "devDependencies": {
@@ -87,7 +87,8 @@
"@repo/utils": "*", "@repo/utils": "*",
"@stripe/react-stripe-js": "^5.6.0", "@stripe/react-stripe-js": "^5.6.0",
"@stripe/stripe-js": "^8.8.0", "@stripe/stripe-js": "^8.8.0",
"framer-motion": "^11.0.0" "framer-motion": "^11.0.0",
"lucide-react": "^0.400.0"
} }
}, },
"apps/storefront/node_modules/@heroui/react": { "apps/storefront/node_modules/@heroui/react": {
@@ -16541,17 +16542,6 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/shadcn/node_modules/tailwind-merge": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
"integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
"dev": true,
"license": "MIT",
"funding": {
"type": "github",
"url": "https://github.com/sponsors/dcastil"
}
},
"node_modules/shadcn/node_modules/tsconfig-paths": { "node_modules/shadcn/node_modules/tsconfig-paths": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
@@ -17175,9 +17165,9 @@
} }
}, },
"node_modules/tailwind-merge": { "node_modules/tailwind-merge": {
"version": "2.6.1", "version": "3.5.0",
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz", "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
"integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==", "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
"license": "MIT", "license": "MIT",
"funding": { "funding": {
"type": "github", "type": "github",