weapp-tailwindcss 4.10.0-beta.2 → 4.10.0-beta.4

package/dist/{chunk-7D27E7TU.mjs → chunk-QOTLDKI4.mjs}

@@ -79,6 +79,9 @@ function hasConfiguredCssEntries(ctx) {
   }
   const patcherOptions = ctx.tailwindcssPatcherOptions;
   if (patcherOptions) {
+    if (normalizeCssEntriesConfig(patcherOptions.tailwindcss?.v4?.cssEntries)) {
+      return true;
+    }
     if (normalizeCssEntriesConfig(patcherOptions.tailwind?.v4?.cssEntries)) {
       return true;
     }
@@ -232,8 +235,10 @@ function normalizeTailwindcssPatcherOptions(options) {
     if (cache !== void 0) {
       normalized.cache = cache;
     }
+    const apply = {};
+    const extract = {};
     if (patch?.overwrite !== void 0) {
-      normalized.overwrite = patch.overwrite;
+      apply.overwrite = patch.overwrite;
     }
     if (patch?.filter) {
       normalized.filter = patch.filter;
@@ -241,14 +246,12 @@ function normalizeTailwindcssPatcherOptions(options) {
     const extendLengthUnits = normalizeExtendLengthUnits(patch?.applyPatches?.extendLengthUnits);
     const exposeContext = patch?.applyPatches?.exportContext;
     if (extendLengthUnits !== void 0 || exposeContext !== void 0) {
-      normalized.features = {
-        exposeContext,
-        extendLengthUnits
-      };
+      apply.exposeContext = exposeContext;
+      apply.extendLengthUnits = extendLengthUnits;
     }
     const cwd = patch?.cwd ?? patch?.basedir;
     if (cwd) {
-      normalized.cwd = cwd;
+      normalized.projectRoot = cwd;
     }
     const tailwindOptions = patch?.tailwindcss ? { ...patch.tailwindcss } : void 0;
     const legacyResolve = patch?.resolve;
@@ -269,14 +272,92 @@ function normalizeTailwindcssPatcherOptions(options) {
         ...resolveOptions ?? {},
         ...legacyResolve ?? {}
       } : void 0;
-      normalized.tailwind = {
+      normalized.tailwindcss = {
         ...nextTailwindOptions ?? {},
         ...mergedResolve ? { resolve: mergedResolve } : {}
       };
     }
-    return normalized;
+    if (patch?.output) {
+      if (patch.output.filename !== void 0) {
+        extract.file = patch.output.filename;
+      }
+      if (patch.output.loose !== void 0) {
+        extract.pretty = patch.output.loose ? 2 : false;
+      }
+      if (patch.output.removeUniversalSelector !== void 0) {
+        extract.removeUniversalSelector = patch.output.removeUniversalSelector;
+      }
+    }
+    if (Object.keys(apply).length > 0) {
+      normalized.apply = apply;
+    }
+    if (Object.keys(extract).length > 0) {
+      normalized.extract = extract;
+    }
+    return toModernTailwindcssPatchOptions(normalized);
+  }
+  return toModernTailwindcssPatchOptions(options);
+}
+function toModernTailwindcssPatchOptions(options) {
+  if (!options) {
+    return void 0;
+  }
+  const normalized = {};
+  if (options.cache !== void 0) {
+    normalized.cache = options.cache;
+  }
+  if (options.filter) {
+    normalized.filter = options.filter;
+  }
+  const projectRoot = options.projectRoot ?? options.cwd;
+  if (projectRoot) {
+    normalized.projectRoot = projectRoot;
+  }
+  const tailwindcss = options.tailwindcss ?? options.tailwind;
+  if (tailwindcss) {
+    normalized.tailwindcss = {
+      ...tailwindcss
+    };
+  }
+  const apply = {
+    ...options.apply ?? {}
+  };
+  if (apply.overwrite === void 0 && options.overwrite !== void 0) {
+    apply.overwrite = options.overwrite;
+  }
+  if (apply.exposeContext === void 0 && options.features?.exposeContext !== void 0) {
+    apply.exposeContext = options.features.exposeContext;
+  }
+  if (apply.extendLengthUnits === void 0 && options.features?.extendLengthUnits !== void 0) {
+    apply.extendLengthUnits = options.features.extendLengthUnits;
+  }
+  if (Object.keys(apply).length > 0) {
+    normalized.apply = apply;
+  }
+  const extract = {
+    ...options.extract ?? {}
+  };
+  if (options.output) {
+    if (extract.write === void 0 && options.output.enabled !== void 0) {
+      extract.write = options.output.enabled;
+    }
+    if (extract.file === void 0 && options.output.file !== void 0) {
+      extract.file = options.output.file;
+    }
+    if (extract.format === void 0 && options.output.format !== void 0) {
+      extract.format = options.output.format;
+    }
+    if (extract.pretty === void 0 && options.output.pretty !== void 0) {
+      extract.pretty = options.output.pretty;
+    }
+    if (extract.removeUniversalSelector === void 0 && options.output.removeUniversalSelector !== void 0) {
+      extract.removeUniversalSelector = options.output.removeUniversalSelector;
+    }
+  }
+  if (Object.keys(extract).length > 0) {
+    normalized.extract = extract;
   }
-  return options;
+  return normalized;
 }
 
 // src/tailwindcss/patcher-resolve.ts
@@ -479,71 +560,74 @@ function createTailwindcssPatcher(options) {
     }
   }
   const baseOptions = {
-    cwd: normalizedBasedir,
+    projectRoot: normalizedBasedir,
     cache,
-    tailwind: baseTailwindOptions,
-    features: {
+    tailwindcss: baseTailwindOptions,
+    apply: {
       exposeContext: true,
       extendLengthUnits
     }
   };
-  const resolvedOptions = defuOverrideArray2(
+  const mergedOptions = defuOverrideArray2(
     normalizedUserOptions ?? {},
     baseOptions
   );
-  if (resolvedOptions.tailwind) {
-    const existingResolve = resolvedOptions.tailwind.resolve ?? {};
+  const resolvedOptions = toModernTailwindcssPatchOptions(mergedOptions) ?? {};
+  const resolvedTailwindOptions = resolvedOptions.tailwindcss;
+  if (resolvedTailwindOptions) {
+    const existingResolve = resolvedTailwindOptions.resolve ?? {};
     const customPaths = Array.isArray(existingResolve.paths) && existingResolve.paths.length > 0;
     const sourcePaths = customPaths ? existingResolve.paths : resolvePaths;
-    resolvedOptions.tailwind.resolve = {
+    resolvedTailwindOptions.resolve = {
       ...existingResolve,
       paths: Array.from(new Set(sourcePaths))
     };
     logger3.debug("Tailwind resolve config %O", {
-      packageName: resolvedOptions.tailwind.packageName,
-      version: resolvedOptions.tailwind.version,
-      resolve: resolvedOptions.tailwind.resolve,
-      cwd: resolvedOptions.tailwind.cwd
+      packageName: resolvedTailwindOptions.packageName,
+      version: resolvedTailwindOptions.version,
+      resolve: resolvedTailwindOptions.resolve,
+      cwd: resolvedTailwindOptions.cwd
     });
-    if (typeof resolvedOptions.tailwind.postcssPlugin === "string") {
+    if (typeof resolvedTailwindOptions.postcssPlugin === "string") {
       const resolvedPlugin = resolveModuleFromPaths(
-        resolvedOptions.tailwind.postcssPlugin,
-        resolvedOptions.tailwind.resolve?.paths ?? resolvePaths
+        resolvedTailwindOptions.postcssPlugin,
+        resolvedTailwindOptions.resolve?.paths ?? resolvePaths
       );
       if (resolvedPlugin) {
-        resolvedOptions.tailwind.postcssPlugin = resolvedPlugin;
+        resolvedTailwindOptions.postcssPlugin = resolvedPlugin;
       }
     }
     const searchRoots = /* @__PURE__ */ new Set();
-    if (resolvedOptions.tailwind.cwd) {
-      searchRoots.add(resolvedOptions.tailwind.cwd);
+    if (resolvedTailwindOptions.cwd) {
+      searchRoots.add(resolvedTailwindOptions.cwd);
     }
-    for (const resolvePath of resolvedOptions.tailwind.resolve?.paths ?? []) {
+    for (const resolvePath of resolvedTailwindOptions.resolve?.paths ?? []) {
       const parentDir = path3.dirname(resolvePath);
       searchRoots.add(parentDir);
     }
     const configPath = findTailwindConfig(searchRoots);
-    if (!resolvedOptions.tailwind.config) {
+    if (!resolvedTailwindOptions.config) {
       if (configPath) {
-        resolvedOptions.tailwind.config = configPath;
+        resolvedTailwindOptions.config = configPath;
       } else {
         const fallbackConfig = resolveTailwindConfigFallback(
-          resolvedOptions.tailwind.packageName,
-          resolvedOptions.tailwind.resolve.paths ?? resolvePaths
+          resolvedTailwindOptions.packageName,
+          resolvedTailwindOptions.resolve.paths ?? resolvePaths
         );
         if (fallbackConfig) {
-          resolvedOptions.tailwind.config = fallbackConfig;
+          resolvedTailwindOptions.config = fallbackConfig;
         }
       }
     }
-    if (!resolvedOptions.tailwind.cwd && configPath) {
-      resolvedOptions.tailwind.cwd = path3.dirname(configPath);
+    if (!resolvedTailwindOptions.cwd && configPath) {
+      resolvedTailwindOptions.cwd = path3.dirname(configPath);
     }
+    resolvedOptions.tailwindcss = resolvedTailwindOptions;
   }
   try {
     return new TailwindcssPatcher(resolvedOptions);
   } catch (error) {
-    const searchPaths = resolvedOptions.tailwind?.resolve?.paths;
+    const searchPaths = resolvedOptions.tailwindcss?.resolve?.paths;
     if (error instanceof Error && /tailwindcss not found/i.test(error.message)) {
       if (!hasLoggedMissingTailwind) {
         logger3.warn("Tailwind CSS \u672A\u5B89\u88C5\uFF0C\u5DF2\u8DF3\u8FC7 Tailwind \u76F8\u5173\u8865\u4E01\u3002\u82E5\u9700\u4F7F\u7528 Tailwind \u80FD\u529B\uFF0C\u8BF7\u5B89\u88C5 tailwindcss\u3002");
@@ -552,7 +636,7 @@ function createTailwindcssPatcher(options) {
       return createFallbackTailwindcssPatcher();
     }
     if (error instanceof Error && /unable to locate tailwind css package/i.test(error.message)) {
-      logger3.error('\u65E0\u6CD5\u5B9A\u4F4D Tailwind CSS \u5305 "%s"\uFF0C\u5DF2\u5C1D\u8BD5\u8DEF\u5F84: %O', resolvedOptions.tailwind?.packageName, searchPaths);
+      logger3.error('\u65E0\u6CD5\u5B9A\u4F4D Tailwind CSS \u5305 "%s"\uFF0C\u5DF2\u5C1D\u8BD5\u8DEF\u5F84: %O', resolvedOptions.tailwindcss?.packageName, searchPaths);
     }
     throw error;
   }
@@ -694,17 +778,19 @@ function overrideTailwindcssPatcherOptionsForBase(options, baseDir, cssEntries)
   if (!isModernTailwindcssPatchOptions(options)) {
     return options;
   }
-  if (!options.tailwind) {
+  const modernTailwind = options.tailwindcss ?? options.tailwind;
+  if (!modernTailwind) {
     return options;
   }
+  const { tailwind: _legacyTailwind, ...rest } = options;
   return {
-    ...options,
-    tailwind: {
-      ...options.tailwind,
+    ...rest,
+    tailwindcss: {
+      ...modernTailwind,
       v4: {
-        ...options.tailwind.v4 ?? {},
-        ...hasCssEntries ? {} : { base: options.tailwind.v4?.base ?? baseDir },
-        cssEntries: hasCssEntries ? cssEntries : options.tailwind.v4?.cssEntries ?? cssEntries
+        ...modernTailwind.v4 ?? {},
+        ...hasCssEntries ? {} : { base: modernTailwind.v4?.base ?? baseDir },
+        cssEntries: hasCssEntries ? cssEntries : modernTailwind.v4?.cssEntries ?? cssEntries
       }
     }
   };
@@ -843,8 +929,8 @@ function createPatcherForBase(baseDir, cssEntries, options) {
     baseDir,
     cssEntries ?? []
   );
-  const configuredPackageName = tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwind?.packageName || tailwindcssPatcherOptions?.patch?.tailwindcss?.packageName;
-  const configuredVersion = tailwindcss?.version || tailwindcssPatcherOptions?.tailwind?.version || tailwindcssPatcherOptions?.patch?.tailwindcss?.version || mergedTailwindOptions.version;
+  const configuredPackageName = tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwind?.packageName || tailwindcssPatcherOptions?.patch?.tailwindcss?.packageName;
+  const configuredVersion = tailwindcss?.version || tailwindcssPatcherOptions?.tailwindcss?.version || tailwindcssPatcherOptions?.tailwind?.version || tailwindcssPatcherOptions?.patch?.tailwindcss?.version || mergedTailwindOptions.version;
   const isTailwindcss4Package = (packageName) => Boolean(
     packageName && (packageName === "tailwindcss4" || packageName === "@tailwindcss/postcss" || packageName.includes("tailwindcss4"))
   );

package/dist/{chunk-2KAM7AAG.mjs → chunk-UELU5NFH.mjs}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-AGF55OIE.mjs";
+} from "./chunk-KAK3XMAW.mjs";
 import {
   collectRuntimeClassSet,
   createAttributeMatcher,
@@ -24,7 +24,7 @@ import {
   replaceWxml,
   toCustomAttributesEntities,
   vitePluginName
-} from "./chunk-D3I6GQUV.mjs";
+} from "./chunk-OYR4XWM4.mjs";
 import {
   resolveUniUtsPlatform
 } from "./chunk-OOHJLO5M.mjs";
@@ -661,6 +661,24 @@ function createJsHashSalt(runtimeSignature, linkedImpactSignature) {
   }
   return `${runtimeSignature}:linked:${linkedImpactSignature}`;
 }
+function hasRuntimeAffectingSourceChanges(changedByType) {
+  return changedByType.html.size > 0 || changedByType.js.size > 0;
+}
+function resolveViteStaleClassNameFallback(option, resolvedConfig) {
+  if (typeof option === "boolean") {
+    return option;
+  }
+  if (!resolvedConfig) {
+    return false;
+  }
+  if (resolvedConfig.command === "serve") {
+    return true;
+  }
+  if (resolvedConfig.command === "build" && resolvedConfig.build?.watch) {
+    return true;
+  }
+  return false;
+}
 function createGenerateBundleHook(context) {
   const state = {
     iteration: 0,
@@ -697,15 +715,18 @@ function createGenerateBundleHook(context) {
     debug2("start");
     onStart();
     const metrics = createEmptyMetrics();
-    const forceRuntimeRefresh = process2.env.WEAPP_TW_VITE_FORCE_RUNTIME_REFRESH === "1";
+    const forceRuntimeRefreshByEnv = process2.env.WEAPP_TW_VITE_FORCE_RUNTIME_REFRESH === "1";
     const disableDirtyOptimization = process2.env.WEAPP_TW_VITE_DISABLE_DIRTY === "1";
     const disableJsPrecheck = process2.env.WEAPP_TW_VITE_DISABLE_JS_PRECHECK === "1";
     const debugCssDiff = process2.env.WEAPP_TW_VITE_DEBUG_CSS_DIFF === "1";
     const entries = Object.entries(bundle);
     const dirtyEntries = computeDirtyEntries(entries, opts, state);
+    const forceRuntimeRefreshBySource = hasRuntimeAffectingSourceChanges(dirtyEntries.changedByType);
+    const forceRuntimeRefresh = forceRuntimeRefreshByEnv || forceRuntimeRefreshBySource;
     const processSets = buildProcessSets(entries, opts, dirtyEntries.changedByType, state.previousLinkedByEntry, disableDirtyOptimization);
     const processFiles = processSets.files;
     const resolvedConfig = getResolvedConfig();
+    const staleClassNameFallback = resolveViteStaleClassNameFallback(opts.staleClassNameFallback, resolvedConfig);
     const rootDir = resolvedConfig?.root ? path2.resolve(resolvedConfig.root) : process2.cwd();
     const outDir = resolvedConfig?.build?.outDir ? path2.resolve(rootDir, resolvedConfig.build.outDir) : rootDir;
     const jsEntries = /* @__PURE__ */ new Map();
@@ -720,6 +741,13 @@ function createGenerateBundleHook(context) {
     const runtimeStart = performance.now();
     const runtime = await ensureRuntimeClassSet(forceRuntimeRefresh);
     metrics.runtimeSet = measureElapsed(runtimeStart);
+    if (forceRuntimeRefreshBySource) {
+      debug2(
+        "runtimeSet forced refresh due to source changes: html=%d js=%d",
+        dirtyEntries.changedByType.html.size,
+        dirtyEntries.changedByType.js.size
+      );
+    }
     debug2("get runtimeSet, class count: %d", runtime.size);
     const runtimeSignature = getRuntimeClassSetSignature(runtimeState.twPatcher) ?? "runtime:missing";
     const handleLinkedUpdate = (fileName, previous, next) => {
@@ -741,6 +769,7 @@ function createGenerateBundleHook(context) {
     };
     const createHandlerOptions = (absoluteFilename, extra) => ({
       ...extra,
+      staleClassNameFallback: extra?.staleClassNameFallback ?? staleClassNameFallback,
       filename: absoluteFilename,
       moduleGraph: moduleGraphOptions,
       babelParserOptions: {
@@ -965,11 +994,7 @@ function createGenerateBundleHook(context) {
       apply();
     }
     state.iteration += 1;
-    const finalSourceHashByFile = /* @__PURE__ */ new Map();
-    for (const [fileName, output] of entries) {
-      finalSourceHashByFile.set(fileName, opts.cache.computeHash(readEntrySource(output)));
-    }
-    state.previousSourceHashByFile = finalSourceHashByFile;
+    state.previousSourceHashByFile = dirtyEntries.sourceHashByFile;
     state.changedByType = dirtyEntries.changedByType;
     const nextLinkedByEntry = new Map(state.previousLinkedByEntry);
     for (const [entryFile, linkedFiles] of linkedByEntry.entries()) {

package/dist/{chunk-F7FBGRWS.js → chunk-WQPYYMRL.js}

@@ -3,13 +3,13 @@
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
-var _chunkFLJBD5TWjs = require('./chunk-FLJBD5TW.js');
+var _chunkY6OZDS7Vjs = require('./chunk-Y6OZDS7V.js');
 
 
 
 
 
-var _chunkUCDOKKRHjs = require('./chunk-UCDOKKRH.js');
+var _chunkBFZDZRA5js = require('./chunk-BFZDZRA5.js');
 
 // src/bundlers/gulp/index.ts
 var _buffer = require('buffer');
@@ -17,12 +17,12 @@ var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 var _stream = require('stream'); var _stream2 = _interopRequireDefault(_stream);
-var debug = _chunkUCDOKKRHjs.createDebug.call(void 0, );
+var debug = _chunkBFZDZRA5js.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunkUCDOKKRHjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkBFZDZRA5js.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-  const patchRecorderState = _chunkFLJBD5TWjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
+  const patchRecorderState = _chunkY6OZDS7Vjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
     source: "runtime",
     cwd: _nullishCoalesce(opts.tailwindcssBasedir, () => ( _process2.default.cwd()))
   });
@@ -36,13 +36,13 @@ function createPlugins(options = {}) {
   const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"];
   let runtimeSetInitialized = false;
   async function refreshRuntimeState(force) {
-    await _chunkUCDOKKRHjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+    await _chunkBFZDZRA5js.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
   }
   async function refreshRuntimeSet(force = false) {
     if (!force && runtimeSetInitialized) {
       return runtimeSet;
     }
-    runtimeSet = await _chunkUCDOKKRHjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
+    runtimeSet = await _chunkBFZDZRA5js.ensureRuntimeClassSet.call(void 0, runtimeState, {
       forceRefresh: force,
       forceCollect: force,
       clearCache: force,

package/dist/{chunk-FIJF6OL7.mjs → chunk-XCKQ4YQM.mjs}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-AGF55OIE.mjs";
+} from "./chunk-KAK3XMAW.mjs";
 import {
   createDebug,
   ensureRuntimeClassSet,
   getCompilerContext,
   refreshTailwindRuntimeState
-} from "./chunk-D3I6GQUV.mjs";
+} from "./chunk-OYR4XWM4.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";

package/dist/{chunk-FLJBD5TW.js → chunk-Y6OZDS7V.js}

@@ -1,22 +1,22 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunkUCDOKKRHjs = require('./chunk-UCDOKKRH.js');
+var _chunkBFZDZRA5js = require('./chunk-BFZDZRA5.js');
 
 
-var _chunk3RGU475Cjs = require('./chunk-3RGU475C.js');
+var _chunk5APD2MNVjs = require('./chunk-5APD2MNV.js');
 
 // src/tailwindcss/recorder.ts
 function setupPatchRecorder(patcher, baseDir, options) {
-  const recorder = _chunkUCDOKKRHjs.createPatchTargetRecorder.call(void 0, baseDir, patcher, options);
+  const recorder = _chunkBFZDZRA5js.createPatchTargetRecorder.call(void 0, baseDir, patcher, options);
   if (_optionalChain([recorder, 'optionalAccess', _ => _.message]) && _optionalChain([options, 'optionalAccess', _2 => _2.logMessage]) !== false) {
     const prefix = _optionalChain([options, 'optionalAccess', _3 => _3.messagePrefix]) ? `${options.messagePrefix} ` : "";
-    _chunk3RGU475Cjs.logger.info("%s%s", prefix, recorder.message);
+    _chunk5APD2MNVjs.logger.info("%s%s", prefix, recorder.message);
   }
   const onPatchCompleted = _optionalChain([recorder, 'optionalAccess', _4 => _4.onPatched]) ? async () => {
     await recorder.onPatched();
   } : void 0;
-  const patchPromise = patcher ? _chunkUCDOKKRHjs.createTailwindPatchPromise.call(void 0, patcher, onPatchCompleted) : Promise.resolve();
+  const patchPromise = patcher ? _chunkBFZDZRA5js.createTailwindPatchPromise.call(void 0, patcher, onPatchCompleted) : Promise.resolve();
   return {
     recorder,
     patchPromise,