From d0496342637e6861e05d67ea93ea58122a53dfc1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Jun 2025 23:14:57 -0400 Subject: [PATCH] fix(deps): update dependency tailwind-merge to v3 (#4834) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- pnpm-lock.yaml | 9 ++------- webview-ui/package.json | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0e5c686b63..b080c9a356 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1028,8 +1028,8 @@ importers: specifier: ^6.1.13 version: 6.1.18(react-dom@18.3.1(react@18.3.1))(react@18.3.1) tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.0.0 + version: 3.3.0 tailwindcss: specifier: ^4.0.0 version: 4.1.6 @@ -8800,9 +8800,6 @@ packages: tabbable@5.3.3: resolution: {integrity: sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==} - tailwind-merge@2.6.0: - resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} - tailwind-merge@3.3.0: resolution: {integrity: sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==} @@ -18844,8 +18841,6 @@ snapshots: tabbable@5.3.3: {} - tailwind-merge@2.6.0: {} - tailwind-merge@3.3.0: {} tailwindcss-animate@1.0.7(tailwindcss@3.4.17): diff --git a/webview-ui/package.json b/webview-ui/package.json index 417749c62f..4d5e5cc821 100644 --- a/webview-ui/package.json +++ b/webview-ui/package.json @@ -68,7 +68,7 @@ "shiki": "^3.2.1", "source-map": "^0.7.4", "styled-components": "^6.1.13", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.0.0", "tailwindcss": "^4.0.0", "tailwindcss-animate": "^1.0.7", "unist-util-visit": "^5.0.0",