From d54aa4485849b12cc6b60e3d2b3891e05b01b204 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 10 May 2025 20:07:28 +0200 Subject: [PATCH] fix(deps): update dependency tailwind-merge to v3 (#12) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [tailwind-merge](https://github.com/dcastil/tailwind-merge) | dependencies | major | [`^2.5.2` -> `^3.0.0`](https://renovatebot.com/diffs/npm/tailwind-merge/2.6.0/3.2.0) | --- ### Release Notes
dcastil/tailwind-merge (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 [@​dcastil](https://github.com/dcastil) in 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 [@​brandonmcconnell](https://github.com/brandonmcconnell), [@​manavm1990](https://github.com/manavm1990), [@​langy](https://github.com/langy), [@​jamesreaco](https://github.com/jamesreaco), [@​roboflow](https://github.com/roboflow), [@​syntaxfm](https://github.com/syntaxfm), [@​getsentry](https://github.com/getsentry), [@​codecov](https://github.com/codecov), [@​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 [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/546 ##### Bug Fixes - Fix length variable in `via-(length:*)` class being merged with `via-` classes accidentally by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/559 ##### Documentation - Fix typo in comment in types.ts by [@​roottool](https://github.com/roottool) in https://github.com/dcastil/tailwind-merge/pull/549 - Update shadow scale recipe to tailwind merge v3 API by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/545 ##### Other - Fix metrics report action erroring on PRs from forks by [@​dcastil](https://github.com/dcastil) in 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 [@​brandonmcconnell](https://github.com/brandonmcconnell), [@​manavm1990](https://github.com/manavm1990), [@​langy](https://github.com/langy), [@​jamesreaco](https://github.com/jamesreaco), [@​roboflow](https://github.com/roboflow), [@​syntaxfm](https://github.com/syntaxfm), [@​getsentry](https://github.com/getsentry), [@​codecov](https://github.com/codecov), [@​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 [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/538 - Fix doc comment being in incorrect place in default config by [@​gjtorikian](https://github.com/gjtorikian) in 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 [@​brandonmcconnell](https://github.com/brandonmcconnell), [@​manavm1990](https://github.com/manavm1990), [@​langy](https://github.com/langy), [@​jamesreaco](https://github.com/jamesreaco), [@​roboflow](https://github.com/roboflow), [@​syntaxfm](https://github.com/syntaxfm), [@​getsentry](https://github.com/getsentry), [@​codecov](https://github.com/codecov), [@​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 [@​dcastil](https://github.com/dcastil) in [`b9c136d`](https://github.com/dcastil/tailwind-merge/commit/b9c136d) - Update incorrect link in v3 changelog by [@​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 [@​brandonmcconnell](https://github.com/brandonmcconnell), [@​manavm1990](https://github.com/manavm1990), [@​langy](https://github.com/langy), [@​jamesreaco](https://github.com/jamesreaco), [@​roboflow](https://github.com/roboflow), [@​syntaxfm](https://github.com/syntaxfm), [@​getsentry](https://github.com/getsentry), [@​codecov](https://github.com/codecov), [@​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 [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 - Theme scales keys changed and now match Tailwind CSS v4 theme variable namespace exactly by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 - `isLength` validator was removed and split into separate validators `isNumber` and `isFraction` by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 - Prefix defined in config shouldn't include combining `-` character anymore by [@​dcastil](https://github.com/dcastil) in 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 [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 - Custom separators are no longer supported by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 - New mandatory `orderSensitiveModifiers` property in config when using `createTailwindMerge` by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 - `DefaultThemeGroupIds` type union consists of different string literals than before by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 - Classes removed in Tailwind CSS v4 are not supported by tailwind-merge anymore by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 ##### New Features - Support for new important modifier position at the end of class by [@​dcastil](https://github.com/dcastil) in https://github.com/dcastil/tailwind-merge/pull/518 - Support for arbitrary CSS variable syntax by [@​dcastil](https://github.com/dcastil) in 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 [@​dcastil](https://github.com/dcastil) in 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 [@​dcastil](https://github.com/dcastil) in 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 [@​dcastil](https://github.com/dcastil) in 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 [@​brandonmcconnell](https://github.com/brandonmcconnell), [@​manavm1990](https://github.com/manavm1990), [@​langy](https://github.com/langy), [@​jamesreaco](https://github.com/jamesreaco), [@​roboflow](https://github.com/roboflow), [@​syntaxfm](https://github.com/syntaxfm), [@​getsentry](https://github.com/getsentry), [@​codecov](https://github.com/codecov), [@​sourcegraph](https://github.com/sourcegraph) and a private sponsor for sponsoring tailwind-merge! ❤️
--- ### Configuration 📅 **Schedule**: Branch creation - "every weekend" (UTC), 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](https://github.com/renovatebot/renovate). Reviewed-on: https://git.schulze.network/schulze/trackevery-day/pulls/12 Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f483ce5..f5407fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "react": "19.1.0", "react-dom": "19.1.0", "sharp": "^0.34.0", - "tailwind-merge": "^2.5.2", + "tailwind-merge": "^3.0.0", "tailwindcss-animate": "^1.0.7" }, "devDependencies": { @@ -7981,9 +7981,9 @@ } }, "node_modules/tailwind-merge": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz", - "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.1.0.tgz", + "integrity": "sha512-aV27Oj8B7U/tAOMhJsSGdWqelfmudnGMdXIlMnk1JfsjwSjts6o8HyfN7SFH3EztzH4YH8kk6GbLTHzITJO39Q==", "license": "MIT", "funding": { "type": "github", diff --git a/package.json b/package.json index 66de908..57fcd71 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "react": "19.1.0", "react-dom": "19.1.0", "sharp": "^0.34.0", - "tailwind-merge": "^2.5.2", + "tailwind-merge": "^3.0.0", "tailwindcss-animate": "^1.0.7" }, "devDependencies": {