From 43c16509b755ef79c16df07464c23fdeb09a0b7a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Nov 2023 01:32:14 +0530 Subject: [PATCH] fix(deps): update dependency tailwind-merge to v2 (#37) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](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.13.2` -> `^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/xkrishguptaa/study-web3). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index dddfa46..2b0d741 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "next": "13.5.4", "react": "18.2.0", "react-dom": "18.2.0", - "tailwind-merge": "^1.13.2", + "tailwind-merge": "^2.0.0", "tailwindcss": "^3.3.2", "tailwindcss-animate": "^1.0.6", "typescript": "5.2.2" diff --git a/yarn.lock b/yarn.lock index 9b3853f..15664a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26,6 +26,13 @@ dependencies: regenerator-runtime "^0.13.11" +"@babel/runtime@^7.23.1": + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885" + integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg== + dependencies: + regenerator-runtime "^0.14.0" + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -2783,10 +2790,12 @@ synckit@^0.8.5: "@pkgr/utils" "^2.3.1" tslib "^2.5.0" -tailwind-merge@^1.13.2: - version "1.14.0" - resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b" - integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ== +tailwind-merge@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.0.0.tgz#a0f3a8c874ebae5feec5595614d08245a5f88a39" + integrity sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw== + dependencies: + "@babel/runtime" "^7.23.1" tailwindcss-animate@^1.0.6: version "1.0.7"