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

Add support for Tailwind CSS v3.3 except line-height shorthand #210

Merged
merged 11 commits into from Mar 29, 2023

Conversation

dcastil
Copy link
Owner

@dcastil dcastil commented Mar 28, 2023

This PR will add support for all changes in Tailwind CSS v3.3 except the line-height modifier support in font-size utilities. For that one I'll need to think about more and potentially introduce a breaking change to tailwind-merge by dropping support for / in Tailwind theme keys. More on that in #211.

Tailwind release

Added

  • Support ESM and TypeScript config files (#10785)
  • Extend default color palette with new 950 shades (#10879)
  • Add line-height modifier support to font-size utilities (#9875)
  • Add support for using variables as arbitrary values without var(...) (#9880, #9962)
  • Add logical properties support for inline direction (#10166)
  • Add hyphens utilities (#10071)
  • Add from-{position}, via-{position} and to-{position} utilities (#10886)
  • Add list-style-image utilities (#10817)
  • Add caption-side utilities (#10470)
  • Add line-clamp utilities from @tailwindcss/line-clamp to core (#10768, #10876, #10862)
  • Add delay-0 and duration-0 utilities (#10294)
  • Add justify-normal and justify-stretch utilities (#10560)
  • Add content-normal and content-stretch utilities (#10645)
  • Add whitespace-break-spaces utility (#10729)
  • Add support for configuring default font-variation-settings for a font-family (#10034, #10515)

Fixed

  • Disallow using multiple selectors in arbitrary variants (#10655)
  • Sort class lists deterministically for Prettier plugin (#10672)
  • Ensure CLI builds have a non-zero exit code on failure (#10703)
  • Ensure module dependencies for value null, is an empty Set (#10877)
  • Fix format assumption when resolving module dependencies (#10878)

Changed

  • Mark rtl and ltr variants as stable and remove warnings (#10764)
  • Use inset instead of top, right, bottom, and left properties (#10765)
  • Make dark and rtl/ltr variants insensitive to DOM order (#10766)
  • Use :is to make important selector option insensitive to DOM order (#10835)

Other

  • Add v3.3 support info to README
  • Create issue for "Add line-height modifier support to font-size utilities (#9875)" and ask whether breaking change with / is okay for community.
  • Mention issue above in tailwind-merge release

@github-actions github-actions bot added the feature Is new feature label Mar 28, 2023
@github-actions
Copy link

github-actions bot commented Mar 28, 2023

size-limit report 📦

Path Size
dist/tailwind-merge.mjs 6.68 KB (+4.37% 🔺)
dist/tailwind-merge.cjs.production.min.js 6.69 KB (+4.43% 🔺)

@dcastil dcastil changed the title Add support for Tailwind CSS v3.3 Add support for Tailwind CSS v3.3 except line-height shorthand Mar 29, 2023
@dcastil dcastil added the needs changelog edit Needs edit in changelog before release label Mar 29, 2023
@dcastil dcastil marked this pull request as ready for review March 29, 2023 07:36
@dcastil dcastil merged commit 0af9546 into main Mar 29, 2023
4 checks passed
@dcastil dcastil deleted the feature/add-support-for-tailwind-3.3 branch March 29, 2023 07:36
@github-actions
Copy link

This was addressed in release v1.11.0.

@dcastil dcastil added the context-v1 Related to tailwind-merge v1 label Oct 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
context-v1 Related to tailwind-merge v1 feature Is new feature needs changelog edit Needs edit in changelog before release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant