Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/drop-tailwind-merge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
1 change: 0 additions & 1 deletion integration/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,5 @@ export const TRUSTED_OVERRIDES: Record<string, string> = {
'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',
};
1 change: 0 additions & 1 deletion integration/templates/custom-flows-react-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
3 changes: 1 addition & 2 deletions integration/templates/tanstack-react-start/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading