diff --git a/.changeset/retire-tailwind-merge-override.md b/.changeset/retire-tailwind-merge-override.md new file mode 100644 index 00000000000..4eee81aded2 --- /dev/null +++ b/.changeset/retire-tailwind-merge-override.md @@ -0,0 +1,4 @@ +--- +--- + +Bump `tailwind-merge` direct dependencies to `^3.4.0` across templates and playgrounds, then retire the `tailwind-merge@<3.4.0` entry from `pnpm.overrides` and `TRUSTED_OVERRIDES`. 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..f29e368e202 100644 --- a/integration/templates/custom-flows-react-vite/package.json +++ b/integration/templates/custom-flows-react-vite/package.json @@ -19,7 +19,7 @@ "react": "^19.1.1", "react-dom": "^19.1.1", "react-router": "^7.8.1", - "tailwind-merge": "^3.3.1", + "tailwind-merge": "^3.4.0", "tailwindcss": "^4.1.11" }, "devDependencies": { diff --git a/integration/templates/tanstack-react-start/package.json b/integration/templates/tanstack-react-start/package.json index 1856d217af8..9647445afb1 100644 --- a/integration/templates/tanstack-react-start/package.json +++ b/integration/templates/tanstack-react-start/package.json @@ -13,7 +13,7 @@ "@tanstack/react-start": "1.163.2", "react": "^19.0.0", "react-dom": "^19.0.0", - "tailwind-merge": "^2.5.4" + "tailwind-merge": "^3.4.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..1c49a025b12 100644 --- a/playground/browser-extension/package.json +++ b/playground/browser-extension/package.json @@ -23,7 +23,7 @@ "react": "^19.1.0", "react-dom": "^19.1.0", "react-router-dom": "^6.27.0", - "tailwind-merge": "^2.5.4", + "tailwind-merge": "^3.4.0", "tailwindcss": "3.4.14", "webextension-polyfill": "^0.12.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0beaf621438..fb9e4049076 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: @@ -2729,7 +2728,7 @@ packages: '@expo/bunyan@4.0.1': resolution: {integrity: sha512-+Lla7nYSiHZirgK+U/uYzsLv/X+HaJienbD5AKX1UQZHYfWaP+9uuQluRB4GrEVWF0GZ7vEVp/jzaOT9k/SQlg==} - engines: {node: '>=0.10.0'} + engines: {'0': node >=0.10.0} '@expo/cli@0.22.28': resolution: {integrity: sha512-lvt72KNitGuixYD2l3SZmRKVu2G4zJpmg5V7WfUBNpmUU5oODBw/6qmiJ6kSLAlfDozscUk+BBGknBBzxUrwrA==}