From 5476963216ecf2a092dc248a28bd72bfc5e4eb4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 10:18:14 +0000 Subject: [PATCH] fix(deps): update dependency tailwind-merge to v3 --- package.json | 2 +- pnpm-lock.yaml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 96022d99..d62ab217 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "react-icon-cloud": "^4.1.7", "react-popper": "^2.3.0", "react-tweet": "^3.3.0", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.0.0", "tailwindcss": "^3.4.17" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2c9ff018..30878714 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -90,8 +90,8 @@ importers: specifier: ^3.3.0 version: 3.3.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.0.0 + version: 3.6.0 tailwindcss: specifier: ^3.4.17 version: 3.4.17 @@ -3744,6 +3744,7 @@ packages: glob@10.4.1: resolution: {integrity: sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==} engines: {node: '>=16 || 14 >=14.18'} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true glob@7.2.3: @@ -6460,8 +6461,8 @@ packages: peerDependencies: react: ^16.11.0 || ^17.0.0 || ^18.0.0 - tailwind-merge@2.6.0: - resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} + tailwind-merge@3.6.0: + resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==} tailwindcss@3.4.17: resolution: {integrity: sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==} @@ -15236,7 +15237,7 @@ snapshots: react: 19.0.0 use-sync-external-store: 1.2.2(react@19.0.0) - tailwind-merge@2.6.0: {} + tailwind-merge@3.6.0: {} tailwindcss@3.4.17: dependencies: