From 706aaa65c279bc38ea0132fc402964ccf521205e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:50:32 +0000 Subject: [PATCH] Update dependency tailwind-merge to ^2.6.0 (#21950) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [tailwind-merge](https://redirect.github.com/dcastil/tailwind-merge) | [`^2.5.5` -> `^2.6.0`](https://renovatebot.com/diffs/npm/tailwind-merge/2.5.5/2.6.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/tailwind-merge/2.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/tailwind-merge/2.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/tailwind-merge/2.5.5/2.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/tailwind-merge/2.5.5/2.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
dcastil/tailwind-merge (tailwind-merge) ### [`v2.6.0`](https://redirect.github.com/dcastil/tailwind-merge/releases/tag/v2.6.0) [Compare Source](https://redirect.github.com/dcastil/tailwind-merge/compare/v2.5.5...v2.6.0) ##### New Features - Export ConfigExtension type from package by [@​dcastil](https://redirect.github.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/505](https://redirect.github.com/dcastil/tailwind-merge/pull/505) **Full Changelog**: https://github.com/dcastil/tailwind-merge/compare/v2.5.5...v2.6.0 Thanks to [@​brandonmcconnell](https://redirect.github.com/brandonmcconnell), [@​manavm1990](https://redirect.github.com/manavm1990), [@​langy](https://redirect.github.com/langy), [@​jamesreaco](https://redirect.github.com/jamesreaco), [@​roboflow](https://redirect.github.com/roboflow), [@​syntaxfm](https://redirect.github.com/syntaxfm), [@​getsentry](https://redirect.github.com/getsentry), [@​codecov](https://redirect.github.com/codecov), [@​sourcegraph](https://redirect.github.com/sourcegraph), a private sponsor and more via [@​thnxdev](https://redirect.github.com/thnxdev) for sponsoring tailwind-merge! ❤️
--- ### Configuration 📅 **Schedule**: Branch creation - "* * * * 1-5" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, 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 was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/TryGhost/Ghost). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- apps/shade/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/shade/package.json b/apps/shade/package.json index 6429adea5e..7ab8096865 100644 --- a/apps/shade/package.json +++ b/apps/shade/package.json @@ -89,7 +89,7 @@ "react-colorful": "5.6.1", "react-hot-toast": "2.4.1", "react-select": "5.8.2", - "tailwind-merge": "^2.5.5", + "tailwind-merge": "^2.6.0", "tailwindcss": "3.4.14", "tailwindcss-animate": "^1.0.7" }, diff --git a/yarn.lock b/yarn.lock index 7dc76d74b9..124f5e4a8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30048,10 +30048,10 @@ table@^6.0.9, table@^6.8.1: string-width "^4.2.3" strip-ansi "^6.0.1" -tailwind-merge@^2.5.5: - version "2.5.5" - resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.5.tgz#98167859b856a2a6b8d2baf038ee171b9d814e39" - integrity sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA== +tailwind-merge@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz#ac5fb7e227910c038d458f396b7400d93a3142d5" + integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA== tailwindcss-animate@^1.0.7: version "1.0.7"