chore: bump version

Author: sonofmagic

.changeset/fix-tailwindcss-patch-cache-dir.md

@@ -0,0 +1,5 @@
+---
+'weapp-tailwindcss': patch
+---
+
+修复 `tailwindcss-patch` 默认缓存目录，确保其写入包级 `node_modules/.cache/tailwindcss-patch`。

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

@@ -312,24 +312,29 @@ function normalizeTailwindcssPatcherOptions(
 export function createTailwindcssPatcher(options?: CreateTailwindcssPatcherOptions): TailwindcssPatcherLike {
   const { basedir, cacheDir, supportCustomLengthUnitsPatch, tailwindcss, tailwindcssPatcherOptions } = options || {}
   const cache: TailwindCacheOptions = {}
+  const normalizedBasedir = basedir ? path.resolve(basedir) : undefined
+  const cacheRoot = findNearestPackageRoot(normalizedBasedir) ?? normalizedBasedir ?? process.cwd()
 
   if (cacheDir) {
     if (path.isAbsolute(cacheDir)) {
       cache.dir = cacheDir
     }
-    else if (basedir) {
-      cache.dir = path.resolve(basedir, cacheDir)
+    else if (normalizedBasedir) {
+      cache.dir = path.resolve(normalizedBasedir, cacheDir)
     }
     else {
       cache.dir = path.resolve(process.cwd(), cacheDir)
     }
   }
+  else {
+    cache.dir = path.join(cacheRoot, 'node_modules', '.cache', 'tailwindcss-patch')
+  }
 
-  if (basedir) {
-    cache.cwd = basedir
+  if (normalizedBasedir) {
+    cache.cwd = normalizedBasedir
   }
 
-  const resolvePaths = createDefaultResolvePaths(cache.cwd ?? basedir ?? process.cwd())
+  const resolvePaths = createDefaultResolvePaths(cache.cwd ?? normalizedBasedir ?? process.cwd())
 
   const normalizedUserOptions = normalizeTailwindcssPatcherOptions(tailwindcssPatcherOptions)
 
@@ -338,7 +343,7 @@ export function createTailwindcssPatcher(options?: CreateTailwindcssPatcherOptio
   const baseTailwindOptions = defuOverrideArray<TailwindUserOptions, Partial<TailwindUserOptions>[]>(
     (tailwindcss ?? {}) as TailwindUserOptions,
     {
-      cwd: basedir,
+      cwd: normalizedBasedir,
       resolve: {
         paths: resolvePaths,
       },
@@ -371,7 +376,7 @@ export function createTailwindcssPatcher(options?: CreateTailwindcssPatcherOptio
   }
 
   const baseOptions: TailwindcssPatchOptions = {
-    cwd: basedir,
+    cwd: normalizedBasedir,
     cache,
     tailwind: baseTailwindOptions,
     features: {

packages/weapp-tailwindcss/test/options.test.ts

@@ -1,3 +1,4 @@
+import path from 'node:path'
 import { getCompilerContext } from '@/context'
 import { defu } from '@/utils'
 
@@ -127,12 +128,15 @@ describe('get options', () => {
     })
     let cacheOptions = config.twPatcher.options?.cache
     expect(cacheOptions?.enabled).toBe(true)
-    expect(cacheOptions?.dir?.includes('node_modules/.cache/tailwindcss-patch')).toBe(true)
+    const expectedDefaultCacheDir = path.join(process.cwd(), 'node_modules', '.cache', 'tailwindcss-patch')
+    expect(cacheOptions?.dir).toBe(expectedDefaultCacheDir)
     config = getCompilerContext({
       appType: 'mpx',
     })
     cacheOptions = config.twPatcher.options?.cache
-    expect(cacheOptions?.dir?.includes('node_modules/tailwindcss-patch/.cache')).toBe(true)
+    expect(
+      cacheOptions?.dir?.endsWith(path.normalize('node_modules/tailwindcss-patch/.cache')),
+    ).toBe(true)
   })
 
   // it('customAttributes map defu merge', () => {

packages/weapp-tailwindcss/test/tailwindcss/helpers.test.ts

@@ -114,6 +114,20 @@ describe('tailwindcss helpers', () => {
     cwdSpy.mockRestore()
   })
 
+  it('defaults cache directory to package root node_modules cache', async () => {
+    const { createTailwindcssPatcher } = await import('@/tailwindcss')
+    const repoRoot = path.resolve(__dirname, '../../../..')
+    const basedir = path.join(repoRoot, 'packages', 'weapp-tailwindcss', 'src')
+
+    createTailwindcssPatcher({ basedir })
+
+    const lastCall = tailwindcssPatcherMock.mock.calls[tailwindcssPatcherMock.mock.calls.length - 1]
+    const callArgs = lastCall?.[0] as any
+    expect(callArgs.cache?.dir).toBe(
+      path.join(repoRoot, 'packages', 'weapp-tailwindcss', 'node_modules', '.cache', 'tailwindcss-patch'),
+    )
+  })
+
   it('gracefully falls back when tailwindcss is missing', async () => {
     tailwindcssPatcherMock.mockImplementationOnce(() => {
       throw new Error('tailwindcss not found')

scripts/sync-template-deps.ts

@@ -11,10 +11,15 @@ import { execa } from 'execa'
 import { minVersion } from 'semver'
 import { ROOT } from './template-utils'
 
+type PnpmConfig = Record<string, unknown> & {
+  onlyBuiltDependencies?: unknown
+}
+
 type PackageJson = Record<string, unknown> & {
   dependencies?: Record<string, string>
   devDependencies?: Record<string, string>
   packageManager?: string
+  pnpm?: PnpmConfig
 }
 
 type Manager = 'pnpm' | 'yarn' | 'npm'
@@ -30,6 +35,7 @@ interface TargetPackage {
   range: string
   addIfMissing?: 'dependencies' | 'devDependencies'
   forceInclude?: boolean
+  ensurePnpmOnlyBuilt?: boolean
 }
 
 const TEMPLATES_DIR = path.join(ROOT, 'templates')
@@ -96,6 +102,7 @@ async function resolveBaseTargets(): Promise<TargetPackage[]> {
       range: `^${mergeVersion}`,
       addIfMissing: 'dependencies',
       forceInclude: true,
+      ensurePnpmOnlyBuilt: true,
     },
     {
       name: 'weapp-ide-cli',
@@ -171,6 +178,70 @@ function ensureSection(pkg: PackageJson, field: 'dependencies' | 'devDependencie
   return created
 }
 
+function ensurePnpmOnlyBuiltDependencies(
+  pkg: PackageJson,
+  targets: TargetPackage[],
+  manager: ManagerInfo,
+): boolean {
+  if (manager.name !== 'pnpm') {
+    return false
+  }
+
+  const required = Array.from(
+    new Set(
+      targets
+        .filter(target => target.ensurePnpmOnlyBuilt)
+        .map(target => target.name),
+    ),
+  )
+
+  if (required.length === 0) {
+    return false
+  }
+
+  let changed = false
+  let pnpmConfig = pkg.pnpm
+  if (!pnpmConfig || typeof pnpmConfig !== 'object') {
+    pnpmConfig = {} as PnpmConfig
+    pkg.pnpm = pnpmConfig
+    changed = true
+  }
+
+  const config = pnpmConfig as PnpmConfig
+  const rawOnlyBuilt = config.onlyBuiltDependencies
+
+  let onlyBuilt: string[]
+  if (Array.isArray(rawOnlyBuilt)) {
+    const allStrings = rawOnlyBuilt.every(item => typeof item === 'string')
+    if (allStrings) {
+      onlyBuilt = rawOnlyBuilt as string[]
+    }
+    else {
+      onlyBuilt = rawOnlyBuilt.filter((item): item is string => typeof item === 'string')
+      changed = true
+    }
+  }
+  else {
+    onlyBuilt = []
+    if (rawOnlyBuilt !== undefined) {
+      changed = true
+    }
+  }
+
+  for (const name of required) {
+    if (!onlyBuilt.includes(name)) {
+      onlyBuilt.push(name)
+      changed = true
+    }
+  }
+
+  if (changed) {
+    config.onlyBuiltDependencies = onlyBuilt
+  }
+
+  return changed
+}
+
 function updateDependencyRange(pkg: PackageJson, targets: TargetPackage[]): boolean {
   let updated = false
   for (const field of ['dependencies', 'devDependencies'] as const) {
@@ -483,14 +554,15 @@ async function processTemplate(
   const tailwindTargets = await resolveTailwindTargets(pkg)
   const relevantTargets = dedupeTargets([...filterTargetsForPackage(pkg, baseTargets), ...tailwindTargets])
   const manager = detectManager(templateDir, pkg)
-  const changed = updateDependencyRange(pkg, relevantTargets)
+  const depsChanged = updateDependencyRange(pkg, relevantTargets)
+  const pnpmChanged = ensurePnpmOnlyBuiltDependencies(pkg, relevantTargets, manager)
   const needLock = lockNeedsUpdate(templateDir, manager, relevantTargets)
 
-  if (!changed && !needLock) {
+  if (!depsChanged && !pnpmChanged && !needLock) {
     return false
   }
 
-  if (changed) {
+  if (depsChanged || pnpmChanged) {
     writeFileSync(pkgPath, `${JSON.stringify(pkg, null, indent)}\n`)
   }