pv/sloan
1
1
Fork 0
Code Pull requests 18 Releases 1 Packages 1 Activity

Update dependency tailwind-merge to v3 #79

Open
pv wants to merge 1 commit from renovate/tailwind-merge-3.x into master
pull from: renovate/tailwind-merge-3.x
merge into: pv:master
Conversation 1 Commits 1 Files changed 1 +1 -1
pv commented 2025-01-31 09:06:35 +01:00
Owner
Copy link

This PR contains the following updates:

Package Type Update Change
tailwind-merge dependencies major ^2.2.2 -> ^3.0.0

Release Notes

dcastil/tailwind-merge (tailwind-merge)

v3.3.1

Compare Source

Bug Fixes
  • Fix arbitrary value using color-mix() not being detected as color by @​dcastil in #​591

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.3.0...v3.3.1

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, @​sourcegraph, a private sponsor, @​block and @​shawt3000 for sponsoring tailwind-merge! ❤️

v3.3.0

Compare Source

New Features

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.2.0...v3.3.0

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, @​sourcegraph, a private sponsor and @​block for sponsoring tailwind-merge! ❤️

v3.2.0

Compare Source

New Features

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.1.0...v3.2.0

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​jamesreaco, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, @​sourcegraph and a private sponsor for sponsoring tailwind-merge! ❤️

v3.1.0

Compare Source

New Features
Bug Fixes
  • Fix length variable in via-(length:*) class being merged with via-<color> classes accidentally by @​dcastil in #​559
Documentation
Other

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.0.2...v3.1.0

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​jamesreaco, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, @​sourcegraph and a private sponsor for sponsoring tailwind-merge! ❤️

v3.0.2

Compare Source

Bug Fixes

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.0.1...v3.0.2

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​jamesreaco, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, @​sourcegraph and a private sponsor for sponsoring tailwind-merge! ❤️

v3.0.1

Compare Source

Bug Fixes

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v3.0.0...v3.0.1

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​jamesreaco, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, @​sourcegraph and a private sponsor for sponsoring tailwind-merge! ❤️

v3.0.0

Compare Source

Tailwind CSS v4 is here and it's time to upgrade tailwind-merge to support it. tailwind-merge v3.0.0 is more accurate than ever and follows the Tailwind CSS spec more closely than in v2. That is thanks to Tailwind CSS v4 being more consistent than ever.

This release drops support for Tailwind CSS v3 and in turn adds support for Tailwind CSS v4. That means you should upgrade to Tailwind CSS v4 and tailwind-merge v3 together. All breaking changes are related to the Tailwind CSS v4 support.

Check out the migration guide and if you have any questions, feel free to create an issue.

Breaking Changes
  • Dropping support for Tailwind CSS v3 in favor of support for Tailwind CSS v4 by @​dcastil in #​518
  • Theme scales keys changed and now match Tailwind CSS v4 theme variable namespace exactly by @​dcastil in #​518
  • isLength validator was removed and split into separate validators isNumber and isFraction by @​dcastil in #​518
  • Prefix defined in config shouldn't include combining - character anymore by @​dcastil in #​518
  • Tailwind CSS v3 prefix position in class not supported anymore in favor of Tailwind CSS v4 position by @​dcastil in #​518
  • Custom separators are no longer supported by @​dcastil in #​518
  • New mandatory orderSensitiveModifiers property in config when using createTailwindMerge by @​dcastil in #​518
  • DefaultThemeGroupIds type union consists of different string literals than before by @​dcastil in #​518
  • Classes removed in Tailwind CSS v4 are not supported by tailwind-merge anymore by @​dcastil in #​518
New Features
  • Support for new important modifier position at the end of class by @​dcastil in #​518
  • Support for arbitrary CSS variable syntax by @​dcastil in #​518
  • There are a bunch of new validators used by tailwind-merge, primarily for new Tailwind CSS v4 features like arbitrary CSS variables by @​dcastil in #​518
Bug Fixes
  • Previously some order-sensitive modifiers like before: were treated as not order-sensitive. This is now fixed by @​dcastil in #​518
Documentation

Full Changelog: https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.0.0

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​jamesreaco, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, @​sourcegraph and a private sponsor for sponsoring tailwind-merge! ❤️

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.

  • If you want to rebase/retry this PR, check this box

This PR has been generated by Renovate Bot.

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [tailwind-merge](https://github.com/dcastil/tailwind-merge) | dependencies | major | [`^2.2.2` -> `^3.0.0`](https://renovatebot.com/diffs/npm/tailwind-merge/2.6.0/3.3.1) | --- ### Release Notes <details> <summary>dcastil/tailwind-merge (tailwind-merge)</summary> ### [`v3.3.1`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.3.1) [Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.3.0...v3.3.1) ##### Bug Fixes - Fix arbitrary value using `color-mix()` not being detected as color by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;591](https://github.com/dcastil/tailwind-merge/pull/591) **Full Changelog**: <https://github.com/dcastil/tailwind-merge/compare/v3.3.0...v3.3.1> Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph), a private sponsor, [@&#8203;block](https://github.com/block) and [@&#8203;shawt3000](https://github.com/shawt3000) for sponsoring tailwind-merge! ❤️ ### [`v3.3.0`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.3.0) [Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.2.0...v3.3.0) ##### New Features - Add support for tailwind CSS v4.1.5 by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;575](https://github.com/dcastil/tailwind-merge/pull/575) **Full Changelog**: <https://github.com/dcastil/tailwind-merge/compare/v3.2.0...v3.3.0> Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph), a private sponsor and [@&#8203;block](https://github.com/block) for sponsoring tailwind-merge! ❤️ ### [`v3.2.0`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.2.0) [Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.1.0...v3.2.0) ##### New Features - Add support for Tailwind CSS v4.1 by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;565](https://github.com/dcastil/tailwind-merge/pull/565) **Full Changelog**: <https://github.com/dcastil/tailwind-merge/compare/v3.1.0...v3.2.0> Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️ ### [`v3.1.0`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.1.0) [Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.0.2...v3.1.0) ##### New Features - Add support for Tailwind CSS v4.0.10 by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;546](https://github.com/dcastil/tailwind-merge/pull/546) ##### Bug Fixes - Fix length variable in `via-(length:*)` class being merged with `via-<color>` classes accidentally by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;559](https://github.com/dcastil/tailwind-merge/pull/559) ##### Documentation - Fix typo in comment in types.ts by [@&#8203;roottool](https://github.com/roottool) in [#&#8203;549](https://github.com/dcastil/tailwind-merge/pull/549) - Update shadow scale recipe to tailwind merge v3 API by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;545](https://github.com/dcastil/tailwind-merge/pull/545) ##### Other - Fix metrics report action erroring on PRs from forks by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;551](https://github.com/dcastil/tailwind-merge/pull/551) **Full Changelog**: <https://github.com/dcastil/tailwind-merge/compare/v3.0.2...v3.1.0> Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️ ### [`v3.0.2`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.0.2) [Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.0.1...v3.0.2) ##### Bug Fixes - Fix `px` value not being recognized for some class groups by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;538](https://github.com/dcastil/tailwind-merge/pull/538) - Fix doc comment being in incorrect place in default config by [@&#8203;gjtorikian](https://github.com/gjtorikian) in [#&#8203;526](https://github.com/dcastil/tailwind-merge/pull/526) **Full Changelog**: <https://github.com/dcastil/tailwind-merge/compare/v3.0.1...v3.0.2> Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️ ### [`v3.0.1`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.0.1) [Compare Source](https://github.com/dcastil/tailwind-merge/compare/v3.0.0...v3.0.1) ##### Bug Fixes - Update info about supported Tailwind CSS version in README by [@&#8203;dcastil](https://github.com/dcastil) in [`b9c136d`](https://github.com/dcastil/tailwind-merge/commit/b9c136d) - Update incorrect link in v3 changelog by [@&#8203;dcastil](https://github.com/dcastil) in [`e22885e`](https://github.com/dcastil/tailwind-merge/commit/e22885e) **Full Changelog**: <https://github.com/dcastil/tailwind-merge/compare/v3.0.0...v3.0.1> Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️ ### [`v3.0.0`](https://github.com/dcastil/tailwind-merge/releases/tag/v3.0.0) [Compare Source](https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.0.0) [Tailwind CSS v4 is here](https://tailwindcss.com/blog/tailwindcss-v4) and it's time to upgrade tailwind-merge to support it. tailwind-merge v3.0.0 is more accurate than ever and follows the Tailwind CSS spec more closely than in v2. That is thanks to Tailwind CSS v4 being more consistent than ever. This release drops support for Tailwind CSS v3 and in turn adds support for Tailwind CSS v4. That means you should upgrade to Tailwind CSS v4 and tailwind-merge v3 together. All breaking changes are related to the Tailwind CSS v4 support. Check out the [migration guide](https://github.com/dcastil/tailwind-merge/blob/v3.0.0/docs/changelog/v2-to-v3-migration.md) and if you have any questions, feel free to [create an issue](https://github.com/dcastil/tailwind-merge/issues/new/choose). ##### Breaking Changes - Dropping support for Tailwind CSS v3 in favor of support for Tailwind CSS v4 by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - Theme scales keys changed and now match Tailwind CSS v4 theme variable namespace exactly by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - `isLength` validator was removed and split into separate validators `isNumber` and `isFraction` by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - Prefix defined in config shouldn't include combining `-` character anymore by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - Tailwind CSS v3 prefix position in class not supported anymore in favor of Tailwind CSS v4 position by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - Custom separators are no longer supported by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - New mandatory `orderSensitiveModifiers` property in config when using `createTailwindMerge` by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - `DefaultThemeGroupIds` type union consists of different string literals than before by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - Classes removed in Tailwind CSS v4 are not supported by tailwind-merge anymore by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) ##### New Features - Support for new important modifier position at the end of class by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - Support for arbitrary CSS variable syntax by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) - There are a bunch of new validators used by tailwind-merge, primarily for new Tailwind CSS v4 features like arbitrary CSS variables by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) ##### Bug Fixes - Previously some order-sensitive modifiers like `before:` were treated as not order-sensitive. This is now fixed by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) ##### Documentation - Added section explaining order-sensitive modifiers to [configuration docs](https://github.com/dcastil/tailwind-merge/blob/v3.0.0/docs/configuration.md#order-sensitive-modifiers) by [@&#8203;dcastil](https://github.com/dcastil) in [#&#8203;518](https://github.com/dcastil/tailwind-merge/pull/518) **Full Changelog**: <https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.0.0> Thanks to [@&#8203;brandonmcconnell](https://github.com/brandonmcconnell), [@&#8203;manavm1990](https://github.com/manavm1990), [@&#8203;langy](https://github.com/langy), [@&#8203;jamesreaco](https://github.com/jamesreaco), [@&#8203;roboflow](https://github.com/roboflow), [@&#8203;syntaxfm](https://github.com/syntaxfm), [@&#8203;getsentry](https://github.com/getsentry), [@&#8203;codecov](https://github.com/codecov), [@&#8203;sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️ </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNDYuNCIsInVwZGF0ZWRJblZlciI6IjQxLjkzLjAiLCJ0YXJnZXRCcmFuY2giOiJtYXN0ZXIiLCJsYWJlbHMiOltdfQ==-->
Update dependency tailwind-merge to v3
Some checks failed
renovate/artifacts Artifact file update failure
fac859cdaa
pv commented 2025-01-31 09:06:36 +01:00
Author
Owner
Copy link

⚠️ Artifact update problem

Renovate failed to update an artifact related to this branch. You probably do not want to merge this PR as-is.

♻ Renovate will retry this branch, including artifacts, only when one of the following happens:

  • any of the package files in this branch needs updating, or
  • the branch becomes conflicted, or
  • you click the rebase/retry checkbox if found above, or
  • you rename this PR's title to start with "rebase!" to trigger it manually

The artifact failure details are included below:

File name: web-extension/bun.lockb
No tool releases found.
### ⚠️ Artifact update problem Renovate failed to update an artifact related to this branch. You probably do not want to merge this PR as-is. ♻ Renovate will retry this branch, including artifacts, only when one of the following happens: - any of the package files in this branch needs updating, or - the branch becomes conflicted, or - you click the rebase/retry checkbox if found above, or - you rename this PR's title to start with "rebase!" to trigger it manually The artifact failure details are included below: ##### File name: web-extension/bun.lockb ``` No tool releases found. ```
Some checks failed
renovate/artifacts Artifact file update failure
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin renovate/tailwind-merge-3.x:renovate/tailwind-merge-3.x
git switch renovate/tailwind-merge-3.x

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff renovate/tailwind-merge-3.x
git switch renovate/tailwind-merge-3.x
git rebase master
git switch master
git merge --ff-only renovate/tailwind-merge-3.x
git switch renovate/tailwind-merge-3.x
git rebase master
git switch master
git merge --no-ff renovate/tailwind-merge-3.x
git switch master
git merge --squash renovate/tailwind-merge-3.x
git switch master
git merge --ff-only renovate/tailwind-merge-3.x
git switch master
git merge renovate/tailwind-merge-3.x
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: pv/sloan#79
No description provided.
Delete branch "renovate/tailwind-merge-3.x"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?