From 839f41ff553097b7d6a08c6a75a83197795091a0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 18:16:09 +0000 Subject: [PATCH] Update dependency tailwind-merge to v3 --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a68dd5b9..1b70d4fb 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "react-dom": "19.0.0", "react-hook-form": "^7.54.2", "sharp": "^0.33.5", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.0.1", "tailwindcss": "^3.4.17", "tailwindcss-animate": "^1.0.7", "ws": "^8.18.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9737a1c5..7c1ebd92 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -173,8 +173,8 @@ importers: specifier: ^0.33.5 version: 0.33.5 tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.0.1 + version: 3.0.1 tailwindcss: specifier: ^3.4.17 version: 3.4.17(ts-node@10.9.1(@types/node@22.12.0)(typescript@5.7.2)) @@ -6155,8 +6155,8 @@ packages: tabbable@6.2.0: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} - tailwind-merge@2.6.0: - resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} + tailwind-merge@3.0.1: + resolution: {integrity: sha512-AvzE8FmSoXC7nC+oU5GlQJbip2UO7tmOhOfQyOmPhrStOGXHU08j8mZEHZ4BmCqY5dWTCo4ClWkNyRNx1wpT0g==} tailwindcss-animate@1.0.7: resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} @@ -13618,7 +13618,7 @@ snapshots: tabbable@6.2.0: {} - tailwind-merge@2.6.0: {} + tailwind-merge@3.0.1: {} tailwindcss-animate@1.0.7(tailwindcss@3.4.17(ts-node@10.9.1(@types/node@22.12.0)(typescript@5.7.2))): dependencies: