From 0b3d1879b2f5b9a9b1605b32432bc259971b247a Mon Sep 17 00:00:00 2001 From: merge-check <140916359+agentHits@users.noreply.github.com> Date: Tue, 6 Oct 2026 16:45:42 -0400 Subject: [PATCH] chore(deps): upgrade tailwind-merge to v3 tailwind-merge 3 is the line that understands Tailwind CSS v4 classes (`w-(--var)`, `outline-hidden`, `field-sizing-*`, `ring-3`, ...). The project has no custom tailwind-merge config and no custom font-size tokens, so `cn` keeps using the default `twMerge`. Co-Authored-By: Claude Opus 5.5 --- apps/dokploy/package.json | 2 +- bun.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index ecbf450fa5..e2d8347269 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -141,7 +141,7 @@ "stripe": "17.2.1", "superjson": "^2.2.6", "swagger-ui-react": "^5.33.1", - "tailwind-merge": "^2.6.1", + "tailwind-merge": "^3.7.0", "tailwindcss-animate": "^1.0.7", "toml": "5.0.0", "tw-animate-css": "^1.4.0", diff --git a/bun.lock b/bun.lock index 2b24e8aa2f..6bec73cc1a 100644 --- a/bun.lock +++ b/bun.lock @@ -143,7 +143,7 @@ "stripe": "17.2.1", "superjson": "^2.2.6", "swagger-ui-react": "^5.33.1", - "tailwind-merge": "^2.6.1", + "tailwind-merge": "^3.7.0", "tailwindcss-animate": "^1.0.7", "toml": "5.0.0", "tw-animate-css": "^1.4.0", @@ -3152,7 +3152,7 @@ "systeminformation": ["systeminformation@5.33.15", "", { "os": "!aix", "bin": { "systeminformation": "lib/cli.js" } }, "sha512-s5RloL0F7xhN0ZjfHtLGnbf7EW74EI0N8NFL+1xR7Oxz9QA33obNZsl7lyfnJOhN04E/kGFPoJPlvY7TZ5fzmw=="], - "tailwind-merge": ["tailwind-merge@2.6.1", "", {}, "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ=="], + "tailwind-merge": ["tailwind-merge@3.7.0", "", {}, "sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA=="], "tailwindcss": ["tailwindcss@4.3.3", "", {}, "sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ=="],