Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Upgrade tailwind-merge to v3.0.1 for tailwindcss v4 support #13

Merged
merged 2 commits into from
Feb 3, 2025

Conversation

composite
Copy link
Contributor

The current version of tailwind-merge is buggy like #7.
I found this related PR: dcastil/tailwind-merge#513 for tailwindcss v4 support. Merging tailwind classes should be fixed, such as sidebar issues.

Copy link

vercel bot commented Feb 2, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
app-tailwind-v4 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Feb 3, 2025 5:07am

@shadcn
Copy link
Owner

shadcn commented Feb 2, 2025

Thanks. I've been testing v3 for the past couple of days. Solid.

Copy link
Owner

@shadcn shadcn left a comment

Choose a reason for hiding this comment

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

Can you run pnpm install and push again?

@composite
Copy link
Contributor Author

composite commented Feb 3, 2025

I pushed changed pnpm-lock.yaml, and I tested sidebar.tsx with p-2 instead of !p-2 and it works normally. but I didn't include the sidebar because it's not the purpose of this pull request.

@shadcn shadcn merged commit 769cf36 into shadcn:main Feb 3, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants