From 6ea48a0ef267f3aab0ca9f3c95d5185d3a9a9f15 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2024 16:43:11 +0000 Subject: [PATCH] fix(deps): update dependency tailwind-merge to v2.4.0 (#771) 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) | [`2.3.0` -> `2.4.0`](https://renovatebot.com/diffs/npm/tailwind-merge/2.3.0/2.4.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/tailwind-merge/2.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/tailwind-merge/2.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/tailwind-merge/2.3.0/2.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/tailwind-merge/2.3.0/2.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
dcastil/tailwind-merge (tailwind-merge) ### [`v2.4.0`](https://togithub.com/dcastil/tailwind-merge/releases/tag/v2.4.0) [Compare Source](https://togithub.com/dcastil/tailwind-merge/compare/v2.3.0...v2.4.0) ##### New Features - Allow hooking into class parsing logic (experimental) by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/444](https://togithub.com/dcastil/tailwind-merge/pull/444) - There is no info to this in the docs because this is experimental, but there is a new `experimentalParseClassName` property in the config that allows you to customize how tailwind-merge recognizes classes. If you're interested, you can read how to use it in the [inline JSDocs](https://togithub.com/dcastil/tailwind-merge/pull/444/files#diff-b8b77f5be18cf56dca425b3a5b8e9d2e754dd37fe0e3612b95cd4e9bccda08a5) and subscribe to [https://github.com/dcastil/tailwind-merge/issues/385](https://togithub.com/dcastil/tailwind-merge/issues/385) for upcoming more powerful low-level functionality. - Create security policy by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/439](https://togithub.com/dcastil/tailwind-merge/pull/439) - Added documentation on how to report potential vulnerabilities - Avoid `@babel/runtime` dependency by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/431](https://togithub.com/dcastil/tailwind-merge/pull/431) - Now no dependencies in tailwind-merge anymore. This dependency was only used in the `tailwind-merge/es5` bundle anyway which I don't optimize for. ##### Documentation - Comment/typo fixes by [@​barvian](https://togithub.com/barvian) in [https://github.com/dcastil/tailwind-merge/pull/443](https://togithub.com/dcastil/tailwind-merge/pull/443) - Fix typo in doc/recipes.md by [@​dsernst](https://togithub.com/dsernst) in [https://github.com/dcastil/tailwind-merge/pull/428](https://togithub.com/dcastil/tailwind-merge/pull/428) - docs: add tailwind-merge-dotnet to similar packages by [@​desmondinho](https://togithub.com/desmondinho) in [https://github.com/dcastil/tailwind-merge/pull/415](https://togithub.com/dcastil/tailwind-merge/pull/415) ##### Other - Added GitHub Action that adds context-v2 label to every issue, discussion and PR by [@​Pritam1211](https://togithub.com/Pritam1211) in [https://github.com/dcastil/tailwind-merge/pull/434](https://togithub.com/dcastil/tailwind-merge/pull/434) - Replace size-limit action with own metrics-report action by [@​dcastil](https://togithub.com/dcastil) in [https://github.com/dcastil/tailwind-merge/pull/433](https://togithub.com/dcastil/tailwind-merge/pull/433) **Full Changelog**: https://github.com/dcastil/tailwind-merge/compare/v2.3.0...v2.4.0 Thanks to [@​brandonmcconnell](https://togithub.com/brandonmcconnell), [@​manavm1990](https://togithub.com/manavm1990), [@​langy](https://togithub.com/langy), [@​jamesreaco](https://togithub.com/jamesreaco) and [@​microsoft](https://togithub.com/microsoft) 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/technifit/tasker). --- packages/ui/package.json | 2 +- pnpm-lock.yaml | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/ui/package.json b/packages/ui/package.json index 2381e82d..a2f1aeda 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -360,7 +360,7 @@ "react-wrap-balancer": "1.1.1", "remix-hook-form": "5.0.1", "sonner": "1.5.0", - "tailwind-merge": "2.3.0", + "tailwind-merge": "2.4.0", "vaul": "0.9.1", "zod": "3.23.8" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5d363e82..226933f5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -471,8 +471,8 @@ importers: specifier: 1.5.0 version: 1.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) tailwind-merge: - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.4.0 + version: 2.4.0 vaul: specifier: 0.9.1 version: 0.9.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -6359,8 +6359,8 @@ packages: tailwind-merge@1.14.0: resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==} - tailwind-merge@2.3.0: - resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==} + tailwind-merge@2.4.0: + resolution: {integrity: sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==} tailwindcss-animate@1.0.7: resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} @@ -13482,9 +13482,7 @@ snapshots: tailwind-merge@1.14.0: {} - tailwind-merge@2.3.0: - dependencies: - '@babel/runtime': 7.24.4 + tailwind-merge@2.4.0: {} tailwindcss-animate@1.0.7(tailwindcss@3.4.4): dependencies: