From 1c3ddf1f46fbe28a0a7f3c63a678ad75b5e967ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Nov 2023 12:06:12 +0100 Subject: [PATCH] fix(deps): update dependency tailwind-merge to v2 (#685) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [tailwind-merge](https://togithub.com/dcastil/tailwind-merge) | [`^1.14.0` -> `^2.0.0`](https://renovatebot.com/diffs/npm/tailwind-merge/1.14.0/2.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/tailwind-merge/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/tailwind-merge/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/tailwind-merge/1.14.0/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/tailwind-merge/1.14.0/2.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
dcastil/tailwind-merge (tailwind-merge) ### [`v2.0.0`](https://togithub.com/dcastil/tailwind-merge/releases/tag/v2.0.0) [Compare Source](https://togithub.com/dcastil/tailwind-merge/compare/v1.14.0...v2.0.0) The tailwind-merge v2 release has been sitting here almost finished for 2 months already. But the timing was never quite right, especially thinking about the increased support needed after the release. In the meantime, the product of the company I work at [launched in public beta](https://medium.com/@​risecal/meet-rise-the-calendar-that-works-for-you-were-launching-the-public-beta-today-bc07555a2191) and I married. Thank you for your patience. This release focuses on making it easier to configure the library for new users. Check out the [migration guide](https://togithub.com/dcastil/tailwind-merge/blob/v2.0.0/docs/changelog/v1-to-v2-migration.md) and if you have any questions, feel free to [create an issue](https://togithub.com/dcastil/tailwind-merge/issues/new/choose). ##### Breaking Changes - Fix `background-image` and `background-position` being merged incorrectly by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/300](https://togithub.com/dcastil/tailwind-merge/pull/300) - Values for `background-position` and `background-size` can look very similar and Tailwind CSS uses the same `bg-` prefix for both groups. This results in some [limitations](https://togithub.com/dcastil/tailwind-merge/blob/v2.0.0/docs/limitations.md) for tailwind-merge. If you use background position or background size with arbitrary values, please read [this section](https://togithub.com/dcastil/tailwind-merge/blob/v2.0.0/docs/limitations.md#you-need-to-use-label-in-arbitrary-background-position-and-background-size-classes) about how to use them. - Make types of available keys more strict and configurable through generics by [@​kachkaev](https://togithub.com/kachkaev) in [https://github.com/dcastil/tailwind-merge/pull/279](https://togithub.com/dcastil/tailwind-merge/pull/279) - Make it possible to override elements with `extendTailwindMerge` by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/294](https://togithub.com/dcastil/tailwind-merge/pull/294) - Separate validators better by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/292](https://togithub.com/dcastil/tailwind-merge/pull/292) - Make `conflictingClassGroupModifiers` in config non-optional by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/291](https://togithub.com/dcastil/tailwind-merge/pull/291) - Move separator to config by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/290](https://togithub.com/dcastil/tailwind-merge/pull/290) - Remove `module` field from package.json by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/289](https://togithub.com/dcastil/tailwind-merge/pull/289) - Remove deprecated exports by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/288](https://togithub.com/dcastil/tailwind-merge/pull/288) - Transpile lib to more modern JS by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/287](https://togithub.com/dcastil/tailwind-merge/pull/287) ##### New Features - Make types of available keys more strict and configurable through generics by [@​kachkaev](https://togithub.com/kachkaev) in [https://github.com/dcastil/tailwind-merge/pull/279](https://togithub.com/dcastil/tailwind-merge/pull/279) - Make it possible to override elements with `extendTailwindMerge` by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/294](https://togithub.com/dcastil/tailwind-merge/pull/294) - Separate validators better by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/292](https://togithub.com/dcastil/tailwind-merge/pull/292) - Make `conflictingClassGroupModifiers` in config non-optional by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/291](https://togithub.com/dcastil/tailwind-merge/pull/291) - Move separator to config by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/290](https://togithub.com/dcastil/tailwind-merge/pull/290) - Remove `module` field from package.json by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/289](https://togithub.com/dcastil/tailwind-merge/pull/289) - Remove deprecated exports by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/288](https://togithub.com/dcastil/tailwind-merge/pull/288) - Transpile lib to more modern JS by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/287](https://togithub.com/dcastil/tailwind-merge/pull/287) - Add ES5 bundle by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/286](https://togithub.com/dcastil/tailwind-merge/pull/286) ##### Bug Fixes - Fix touch action classes overriding each other incorrectly by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/313](https://togithub.com/dcastil/tailwind-merge/pull/313) - Fix `background-image` and `background-position` being merged incorrectly by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/300](https://togithub.com/dcastil/tailwind-merge/pull/300) - Fix number validators accidentally returning `true` for empty strings by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/295](https://togithub.com/dcastil/tailwind-merge/pull/295) - Rename lazy-initializaton.test.ts to lazy-initialization.test.ts by [@​CrutchTheClutch](https://togithub.com/CrutchTheClutch) in [https://github.com/dcastil/tailwind-merge/pull/284](https://togithub.com/dcastil/tailwind-merge/pull/284) ##### Documentation - Explain limitations of arbitrary values in `bg-size` and `bg-position` class groups in docs by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/328](https://togithub.com/dcastil/tailwind-merge/pull/328) **Full Changelog**: https://github.com/dcastil/tailwind-merge/compare/v1.14.0...v2.0.0 Thanks to [@​quezlatch](https://togithub.com/quezlatch), [@​brandonmcconnell](https://togithub.com/brandonmcconnell), [@​manavm1990](https://togithub.com/manavm1990) and [@​ErwinAI](https://togithub.com/ErwinAI) for sponsoring tailwind-merge! ❤️
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **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 [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/dotkom/monoweb). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/ui/package.json | 2 +- pnpm-lock.yaml | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/packages/ui/package.json b/packages/ui/package.json index 2e7afa99c..386e13c18 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -28,7 +28,7 @@ "cva": "npm:class-variance-authority@^0.7.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "tailwind-merge": "^1.14.0" + "tailwind-merge": "^2.0.0" }, "devDependencies": { "@dotkomonline/config": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f30cb398c..693b7a87b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -902,8 +902,8 @@ importers: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) tailwind-merge: - specifier: ^1.14.0 - version: 1.14.0 + specifier: ^2.0.0 + version: 2.0.0 devDependencies: '@dotkomonline/config': specifier: workspace:* @@ -3181,6 +3181,13 @@ packages: dependencies: regenerator-runtime: 0.13.11 + /@babel/runtime@7.23.2: + resolution: {integrity: sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.14.0 + dev: false + /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} engines: {node: '>=6.9.0'} @@ -14243,6 +14250,10 @@ packages: /regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} + /regenerator-runtime@0.14.0: + resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + dev: false + /regenerator-transform@0.15.1: resolution: {integrity: sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==} dependencies: @@ -15215,8 +15226,10 @@ packages: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} dev: false - /tailwind-merge@1.14.0: - resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==} + /tailwind-merge@2.0.0: + resolution: {integrity: sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==} + dependencies: + '@babel/runtime': 7.23.2 dev: false /tailwindcss-animate@1.0.7(tailwindcss@3.3.5):