chore: bump version

Author: sonofmagic

.changeset/patch-weapp-tailwindcss-v4-config.md

@@ -0,0 +1,5 @@
+---
+'weapp-tailwindcss': patch
+---
+
+修复 v4 patcher 在提供 cssEntries 時錯誤覆寫 base 導致 @config 解析失效，補充回歸確保 runtime class set 正確收集並轉義，並依賴升級至修復版 [email protected]。

apps/tailwindcss-weapp/package.json

@@ -102,7 +102,7 @@
     "prettier-plugin-tailwindcss": "^0.7.2",
     "redent": "^4.0.0",
     "strip-indent": "^4.1.1",
-    "tailwindcss": "^3.4.18",
+    "tailwindcss": "^3.4.19",
     "unplugin-auto-import": "^19.1.1",
     "vite": "5.2.8",
     "vue-eslint-parser": "^9.4.3",

packages/weapp-tailwindcss/src/tailwindcss/v4/patcher.ts

@@ -136,6 +136,8 @@ function overrideTailwindcssPatcherOptionsForBase(
   baseDir: string,
   cssEntries: string[],
 ) {
+  const hasCssEntries = cssEntries.length > 0
+
   if (!options) {
     return options
   }
@@ -151,13 +153,23 @@ function overrideTailwindcssPatcherOptionsForBase(
       cwd: patchOptions.cwd ?? baseDir,
     }
     if (patchOptions.tailwindcss) {
+      const nextV4 = {
+        ...(patchOptions.tailwindcss.v4 ?? {}),
+      }
+
+      if (hasCssEntries) {
+        nextV4.cssEntries = cssEntries
+      }
+      else {
+        nextV4.cssEntries = nextV4.cssEntries ?? cssEntries
+        if (nextV4.base === undefined) {
+          nextV4.base = baseDir
+        }
+      }
+
       nextPatch.tailwindcss = {
         ...patchOptions.tailwindcss,
-        v4: {
-          ...(patchOptions.tailwindcss.v4 ?? {}),
-          base: baseDir,
-          cssEntries,
-        },
+        v4: nextV4,
       }
     }
     return {
@@ -180,8 +192,10 @@ function overrideTailwindcssPatcherOptionsForBase(
       ...options.tailwind,
       v4: {
         ...(options.tailwind.v4 ?? {}),
-        base: baseDir,
-        cssEntries,
+        ...(hasCssEntries ? {} : { base: options.tailwind.v4?.base ?? baseDir }),
+        cssEntries: hasCssEntries
+          ? cssEntries
+          : options.tailwind.v4?.cssEntries ?? cssEntries,
       },
     },
   }

packages/weapp-tailwindcss/test/fixtures/tailwind-v4-config-import/src/app.css

@@ -0,0 +1,8 @@
+@import "tailwindcss";
+@config "../tailwind.config.js";
+
+@layer components {
+  .btn {
+    @apply px-[48rpx];
+  }
+}

packages/weapp-tailwindcss/test/fixtures/tailwind-v4-config-import/tailwind.config.js

@@ -0,0 +1,11 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: ['./src/**/*.{css,js,ts,jsx,tsx}'],
+  theme: {
+    extend: {},
+  },
+  corePlugins: {
+    preflight: false,
+  },
+  safelist: ['px-[48rpx]'],
+}

packages/weapp-tailwindcss/test/tailwindcss/v4/patcher.integration.test.ts

@@ -0,0 +1,52 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { transformLiteralText } from '@/experimental/shared'
+import { collectRuntimeClassSet } from '@/tailwindcss/runtime'
+import { createPatcherForBase } from '@/tailwindcss/v4'
+
+describe('tailwindcss/v4 patcher integration with @config + cssEntries', () => {
+  it('preserves entry base, collects class set, and escapes runtime literals', async () => {
+    const fixtureRoot = path.resolve(__dirname, '../../fixtures/tailwind-v4-config-import')
+    const cssEntry = path.resolve(fixtureRoot, 'src/app.css')
+    const fixtureModules = path.resolve(fixtureRoot, 'node_modules')
+    const tailwindcss4Path = path.resolve(process.cwd(), 'node_modules/tailwindcss4')
+    const fixtureTailwindcss = path.resolve(fixtureModules, 'tailwindcss')
+
+    await fs.mkdir(fixtureModules, { recursive: true })
+    try {
+      await fs.rm(fixtureTailwindcss, { recursive: true, force: true })
+    }
+    catch {}
+    await fs.symlink(tailwindcss4Path, fixtureTailwindcss, 'dir')
+
+    const patcher = createPatcherForBase(fixtureRoot, [cssEntry], {
+      tailwindcss: {
+        packageName: 'tailwindcss4',
+        version: 4,
+        resolve: {
+          paths: [path.resolve(process.cwd(), 'node_modules')],
+        },
+      },
+      tailwindcssPatcherOptions: undefined,
+      supportCustomLengthUnitsPatch: true,
+      appType: 'taro',
+    } as any)
+
+    await patcher.extract({ write: false })
+
+    const classSet = await collectRuntimeClassSet(patcher, { force: true })
+
+    expect(classSet.has('px-[48rpx]')).toBe(true)
+
+    const transformed = transformLiteralText('px-[48rpx] text-white', {
+      classNameSet: classSet,
+      arbitraryValues: { allowDoubleQuotes: true },
+      alwaysEscape: false,
+      unescapeUnicode: true,
+    } as any)
+
+    expect(transformed).toContain('px-_b48rpx_B')
+    expect(transformed).not.toContain('px-[48rpx]')
+  })
+})

packages/weapp-tailwindcss/test/tailwindcss/v4/patcher.test.ts

@@ -375,12 +375,31 @@ describe('tailwindcss/v4/patcher helpers', () => {
     const firstCall = createTailwindcssPatcher.mock.calls[0]?.[0] ?? {}
     const patchedV4 = firstCall.tailwindcssPatcherOptions?.patch?.tailwindcss?.v4
     expect(patchedV4).toEqual({
-      base: '/workspace/app',
       cssEntries: ['/workspace/app/src/app.css'],
     })
+    expect(patchedV4?.base).toBeUndefined()
     expect(patchedV4?.cssEntries?.length).toBe(1)
   })
 
+  it('preserves modern tailwindcssPatcherOptions v4 base when css entries are provided', async () => {
+    createTailwindcssPatcher.mockImplementation(options => options)
+    const { createPatcherForBase } = await loadModule()
+
+    const patcher = createPatcherForBase('/workspace/app', ['/workspace/app/src/app.css'], {
+      tailwindcss: undefined,
+      tailwindcssPatcherOptions: {
+        tailwind: {
+          v4: { base: '/custom/base' },
+        },
+      } as any,
+      supportCustomLengthUnitsPatch: true,
+      appType: 'taro',
+    } as unknown as InternalUserDefinedOptions) as any
+
+    expect(patcher.tailwindcssPatcherOptions?.tailwind?.v4?.base).toBe('/custom/base')
+    expect(patcher.tailwindcssPatcherOptions?.tailwind?.v4?.cssEntries).toEqual(['/workspace/app/src/app.css'])
+  })
+
   it('returns early for invalid tailwindcssPatcherOptions shapes', async () => {
     createTailwindcssPatcher.mockImplementation(options => options)
     const { createPatcherForBase } = await loadModule()