Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/guard-dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lucide-react": "^0.539.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"tailwind-merge": "^2.6.0",
"tailwind-merge": "^3.6.0",
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Match Tailwind versions

This upgrades tailwind-merge to v3 while the same package still pins tailwindcss to v3.4.x. tailwind-merge v3 dropped Tailwind CSS v3 support and applies Tailwind v4 merge rules, so every cn() call can now remove or keep classes according to a different utility grammar than the CSS that this app builds. For example, classes affected by v3/v4 syntax or removed-utility differences can be silently merged incorrectly and render the dashboard with the wrong styles. Either keep tailwind-merge on v2 while this app stays on Tailwind v3, or upgrade Tailwind to v4 in the same change.

"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
Expand Down
Loading