From a3c2e73f7e374cdd61f210803cb5cedd54945f0e Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Sun, 29 Mar 2026 19:16:15 +0200 Subject: [PATCH] build(web): upgrade tailwind-merge to v3 Co-Authored-By: Claude Opus 4.6 (1M context) --- webui2/package.json | 2 +- webui2/pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webui2/package.json b/webui2/package.json index 2ea4ec56872c108e04a30d5195c18e5046e59a43..2a87b39f7c30dabc91c073bb2bf46526bde14ddc 100644 --- a/webui2/package.json +++ b/webui2/package.json @@ -38,7 +38,7 @@ "rehype-slug": "^6.0.0", "remark-emoji": "^5.0.2", "remark-gfm": "^4.0.0", - "tailwind-merge": "^2.5.5", + "tailwind-merge": "^3.5.0", "tailwindcss-animate": "^1.0.7" }, "devDependencies": { diff --git a/webui2/pnpm-lock.yaml b/webui2/pnpm-lock.yaml index a50fdc458a7293d0750dc2ee666cedb0a4debc9e..668285cd80a6c84fda12183a6de52eb597f31fff 100644 --- a/webui2/pnpm-lock.yaml +++ b/webui2/pnpm-lock.yaml @@ -78,8 +78,8 @@ importers: specifier: ^4.0.0 version: 4.0.1 tailwind-merge: - specifier: ^2.5.5 - version: 2.6.1 + specifier: ^3.5.0 + version: 3.5.0 tailwindcss-animate: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.19(yaml@2.8.3)) @@ -2853,8 +2853,8 @@ packages: resolution: {integrity: sha512-IELLEvzHuCfc1uTsshPK58ViSdNqXxlml1U+fmwJIKLYKOr/rAtBrorE2RYm5IHaMpDNlmC0fr1LAvdXvyheEQ==} engines: {node: '>=18'} - tailwind-merge@2.6.1: - resolution: {integrity: sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==} + tailwind-merge@3.5.0: + resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==} tailwindcss-animate@1.0.7: resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} @@ -6069,7 +6069,7 @@ snapshots: timeout-signal: 2.0.0 whatwg-mimetype: 4.0.0 - tailwind-merge@2.6.1: {} + tailwind-merge@3.5.0: {} tailwindcss-animate@1.0.7(tailwindcss@3.4.19(yaml@2.8.3)): dependencies: