From 63a427148f5d62de54ccbdc65c1dc9eb2cf43507 Mon Sep 17 00:00:00 2001 From: renovate <29139614+renovate@users.noreply.github.com> Date: Sat, 1 Feb 2025 14:51:47 +0000 Subject: [PATCH] chore: bump up tailwind-merge version to v3 (#9917) 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` -> `^3.0.0`](https://renovatebot.com/diffs/npm/tailwind-merge/2.6.0/3.0.1) | [![age](https://developer.mend.io/api/mc/badges/age/npm/tailwind-merge/3.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/tailwind-merge/3.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/tailwind-merge/2.6.0/3.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/tailwind-merge/2.6.0/3.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
dcastil/tailwind-merge (tailwind-merge) ### [`v3.0.1`](https://redirect.github.com/dcastil/tailwind-merge/compare/7378c16adcc261599fa2debe8c18d77071c946f4...493fa8c11046249332aa42e9269affdb786023a1) [Compare Source](https://redirect.github.com/dcastil/tailwind-merge/compare/v3.0.0...v3.0.1) ### [`v3.0.0`](https://redirect.github.com/dcastil/tailwind-merge/compare/v2.6.0...7378c16adcc261599fa2debe8c18d77071c946f4) [Compare Source](https://redirect.github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.0.0)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), 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 was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/toeverything/AFFiNE). --- packages/frontend/admin/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/frontend/admin/package.json b/packages/frontend/admin/package.json index 039724289..d9a2368b6 100644 --- a/packages/frontend/admin/package.json +++ b/packages/frontend/admin/package.json @@ -57,7 +57,7 @@ "clsx": "^2.1.1", "cross-env": "^7.0.3", "shadcn-ui": "^0.9.4", - "tailwind-merge": "^2.5.5", + "tailwind-merge": "^3.0.0", "tailwindcss": "^3.4.16", "tailwindcss-animate": "^1.0.7" }, diff --git a/yarn.lock b/yarn.lock index 6b819a927..9e1280e62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -207,7 +207,7 @@ __metadata: shadcn-ui: "npm:^0.9.4" sonner: "npm:^1.7.1" swr: "npm:^2.2.5" - tailwind-merge: "npm:^2.5.5" + tailwind-merge: "npm:^3.0.0" tailwindcss: "npm:^3.4.16" tailwindcss-animate: "npm:^1.0.7" vaul: "npm:^1.1.1" @@ -33563,10 +33563,10 @@ __metadata: languageName: node linkType: hard -"tailwind-merge@npm:^2.5.5": - version: 2.6.0 - resolution: "tailwind-merge@npm:2.6.0" - checksum: 10/a84f49d6f2cfb18ba06dc51b446b69f6b42cedcb9c9fa4e7c5f931b56e739870e513339e02b348b43f44011fa4852f02f72658a3f3e066e5101b09fc28644210 +"tailwind-merge@npm:^3.0.0": + version: 3.0.1 + resolution: "tailwind-merge@npm:3.0.1" + checksum: 10/bad61589b78530ce1d49a369b089ff606ed56d7d5aa67f57c04144751abbee3d844652a22595bfa21a4509d0d06946a9bc8c7e9ef74cd5fcf10c51925a2f14af languageName: node linkType: hard