From 0d9f07efda882a2c701611812e6007fca7682b69 Mon Sep 17 00:00:00 2001
From: Philipp Spiess
Date: Wed, 29 Jan 2025 11:51:28 +0100
Subject: [PATCH 1/4] Do not scan `tailwind-merge` sources for cadndidates
---
packages/@tailwindcss-vite/src/index.ts | 14 ++++++++++++++
playgrounds/vite/package.json | 1 +
playgrounds/vite/src/app.tsx | 4 +++-
pnpm-lock.yaml | 20 ++++++++++++++------
4 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/packages/@tailwindcss-vite/src/index.ts b/packages/@tailwindcss-vite/src/index.ts
index 2fedf73231f2..c8976c0276da 100644
--- a/packages/@tailwindcss-vite/src/index.ts
+++ b/packages/@tailwindcss-vite/src/index.ts
@@ -9,6 +9,8 @@ import type { Plugin, ResolvedConfig, Rollup, Update, ViteDevServer } from 'vite
const DEBUG = env.DEBUG
const SPECIAL_QUERY_RE = /[?&](raw|url)\b/
+const IGNORED_DEPENDENCIES = ['tailwind-merge']
+
export default function tailwindcss(): Plugin[] {
let servers: ViteDevServer[] = []
let config: ResolvedConfig | null = null
@@ -62,6 +64,18 @@ export default function tailwindcss(): Plugin[] {
})
function scanFile(id: string, content: string, extension: string, isSSR: boolean) {
+ for (let dependency of IGNORED_DEPENDENCIES) {
+ // We validated that Vite IDs always use posix style path separators, even on Windows.
+ // In dev build, Vite precompiles dependencies
+ if (id.includes(`.vite/deps/${dependency}.js`)) {
+ return
+ }
+ // In prod builds, use the node_modules path
+ if (id.includes(`/node_modules/${dependency}/`)) {
+ return
+ }
+ }
+
let updated = false
for (let candidate of moduleGraphScanner.scanFiles([{ content, extension }])) {
updated = true
diff --git a/playgrounds/vite/package.json b/playgrounds/vite/package.json
index 742893ef8b07..ae4ec471cc95 100644
--- a/playgrounds/vite/package.json
+++ b/playgrounds/vite/package.json
@@ -13,6 +13,7 @@
"@vitejs/plugin-react": "^4.3.4",
"react": "^19.0.0",
"react-dom": "^19.0.0",
+ "tailwind-merge": "^2.6.0",
"tailwindcss": "workspace:^"
},
"devDependencies": {
diff --git a/playgrounds/vite/src/app.tsx b/playgrounds/vite/src/app.tsx
index 4abc17cb52e1..190af0103c4b 100644
--- a/playgrounds/vite/src/app.tsx
+++ b/playgrounds/vite/src/app.tsx
@@ -1,7 +1,9 @@
+import { twMerge } from 'tailwind-merge'
+
export function App() {
return (
-
Hello World
+
Hello World
-
Hello World
+
Hello World