Skip to content

Commit 5d3d31a

Browse files
authored
chore(repo): drop tailwind-merge from templates and playground (#8536)
1 parent 31b8f9c commit 5d3d31a

7 files changed

Lines changed: 6 additions & 10 deletions

File tree

.changeset/drop-tailwind-merge.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

integration/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,5 @@ export const TRUSTED_OVERRIDES: Record<string, string> = {
100100
'semver@<7.7.3': '7.7.4',
101101
'chokidar@<5.0.0': '5.0.0',
102102
'undici-types@<7.16.0': '7.24.8',
103-
'tailwind-merge@<3.4.0': '3.4.0',
104103
'vite@<7.1.3': '7.3.3',
105104
};

integration/templates/custom-flows-react-vite/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"react": "^19.1.1",
2020
"react-dom": "^19.1.1",
2121
"react-router": "^7.8.1",
22-
"tailwind-merge": "^3.3.1",
2322
"tailwindcss": "^4.1.11"
2423
},
2524
"devDependencies": {
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { clsx, type ClassValue } from 'clsx';
2-
import { twMerge } from 'tailwind-merge';
32

43
export function cn(...inputs: ClassValue[]) {
5-
return twMerge(clsx(inputs));
4+
return clsx(inputs);
65
}

integration/templates/tanstack-react-start/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"@tanstack/react-router-devtools": "1.163.2",
1313
"@tanstack/react-start": "1.163.2",
1414
"react": "^19.0.0",
15-
"react-dom": "^19.0.0",
16-
"tailwind-merge": "^2.5.4"
15+
"react-dom": "^19.0.0"
1716
},
1817
"devDependencies": {
1918
"@tailwindcss/vite": "^4.0.8",

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
"react-dom": "catalog:react",
167167
"rolldown": "catalog:repo",
168168
"semver@<7.7.3": "7.7.4",
169-
"tailwind-merge@<3.4.0": "3.4.0",
170169
"undici-types@<7.16.0": "7.24.8",
171170
"utf-8-validate": "5.0.10",
172171
"vite@<7.1.3": "7.3.3"

pnpm-lock.yaml

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)