From 7f0231338aba0567ab2996f6a2970ab169ff22ff Mon Sep 17 00:00:00 2001 From: Jacek Date: Tue, 12 May 2026 14:13:41 -0500 Subject: [PATCH] chore(repo): drop tailwind-merge from templates and playground --- .changeset/drop-tailwind-merge.md | 2 ++ integration/constants.ts | 1 - integration/templates/custom-flows-react-vite/package.json | 1 - .../templates/custom-flows-react-vite/src/lib/utils.ts | 3 +-- integration/templates/tanstack-react-start/package.json | 3 +-- package.json | 1 - playground/browser-extension/package.json | 1 - playground/browser-extension/src/utils/components.ts | 3 +-- pnpm-lock.yaml | 5 ++--- 9 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 .changeset/drop-tailwind-merge.md diff --git a/.changeset/drop-tailwind-merge.md b/.changeset/drop-tailwind-merge.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/drop-tailwind-merge.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/integration/constants.ts b/integration/constants.ts index f01dc32f628..b77d3ba570c 100644 --- a/integration/constants.ts +++ b/integration/constants.ts @@ -100,6 +100,5 @@ export const TRUSTED_OVERRIDES: Record = { 'semver@<7.7.3': '7.7.4', 'chokidar@<5.0.0': '5.0.0', 'undici-types@<7.16.0': '7.24.8', - 'tailwind-merge@<3.4.0': '3.4.0', 'vite@<7.1.3': '7.3.3', }; diff --git a/integration/templates/custom-flows-react-vite/package.json b/integration/templates/custom-flows-react-vite/package.json index 31bfde81a54..96191f57c98 100644 --- a/integration/templates/custom-flows-react-vite/package.json +++ b/integration/templates/custom-flows-react-vite/package.json @@ -19,7 +19,6 @@ "react": "^19.1.1", "react-dom": "^19.1.1", "react-router": "^7.8.1", - "tailwind-merge": "^3.3.1", "tailwindcss": "^4.1.11" }, "devDependencies": { diff --git a/integration/templates/custom-flows-react-vite/src/lib/utils.ts b/integration/templates/custom-flows-react-vite/src/lib/utils.ts index 2819a830d24..1f758386e26 100644 --- a/integration/templates/custom-flows-react-vite/src/lib/utils.ts +++ b/integration/templates/custom-flows-react-vite/src/lib/utils.ts @@ -1,6 +1,5 @@ import { clsx, type ClassValue } from 'clsx'; -import { twMerge } from 'tailwind-merge'; export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); + return clsx(inputs); } diff --git a/integration/templates/tanstack-react-start/package.json b/integration/templates/tanstack-react-start/package.json index 1856d217af8..a0ad3df9648 100644 --- a/integration/templates/tanstack-react-start/package.json +++ b/integration/templates/tanstack-react-start/package.json @@ -12,8 +12,7 @@ "@tanstack/react-router-devtools": "1.163.2", "@tanstack/react-start": "1.163.2", "react": "^19.0.0", - "react-dom": "^19.0.0", - "tailwind-merge": "^2.5.4" + "react-dom": "^19.0.0" }, "devDependencies": { "@tailwindcss/vite": "^4.0.8", diff --git a/package.json b/package.json index ce54cf75eb3..d0f92ab56b7 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,6 @@ "react-dom": "catalog:react", "rolldown": "catalog:repo", "semver@<7.7.3": "7.7.4", - "tailwind-merge@<3.4.0": "3.4.0", "undici-types@<7.16.0": "7.24.8", "utf-8-validate": "5.0.10", "vite@<7.1.3": "7.3.3" diff --git a/playground/browser-extension/package.json b/playground/browser-extension/package.json index 9400e034dd7..58cf684bd4b 100644 --- a/playground/browser-extension/package.json +++ b/playground/browser-extension/package.json @@ -23,7 +23,6 @@ "react": "^19.1.0", "react-dom": "^19.1.0", "react-router-dom": "^6.27.0", - "tailwind-merge": "^2.5.4", "tailwindcss": "3.4.14", "webextension-polyfill": "^0.12.0" }, diff --git a/playground/browser-extension/src/utils/components.ts b/playground/browser-extension/src/utils/components.ts index 9ad0df4269e..b4b4fa298c7 100644 --- a/playground/browser-extension/src/utils/components.ts +++ b/playground/browser-extension/src/utils/components.ts @@ -1,6 +1,5 @@ import { type ClassValue, clsx } from 'clsx'; -import { twMerge } from 'tailwind-merge'; export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); + return clsx(inputs); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0beaf621438..f6a1f487871 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -77,14 +77,13 @@ catalogs: version: 1.6.2 overrides: + chokidar@<5.0.0: 5.0.0 react: 18.3.1 react-dom: 18.3.1 rolldown: 1.0.0-beta.47 - utf-8-validate: 5.0.10 semver@<7.7.3: 7.7.4 - chokidar@<5.0.0: 5.0.0 undici-types@<7.16.0: 7.24.8 - tailwind-merge@<3.4.0: 3.4.0 + utf-8-validate: 5.0.10 vite@<7.1.3: 7.3.3 importers: