weapp-tailwindcss 4.11.0-alpha.1 → 4.11.0-alpha.3

package/dist/{chunk-KKT2DKMW.mjs → chunk-NYDCSSXH.mjs}

@@ -5,12 +5,13 @@ import {
   ensureMpxTailwindcssAliases,
   getCacheKey,
   hasLoaderEntry,
+  hasWatchChanges,
   injectMpxCssRewritePreRules,
   isCssLikeModuleResource,
   isMpx,
   patchMpxLoaderResolve,
   setupMpxTailwindcssRedirect
-} from "./chunk-R6KEYO3F.mjs";
+} from "./chunk-QO7CF2RF.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveDisabledOptions,
@@ -20,23 +21,24 @@ import {
 } from "./chunk-F2CKKG6Q.mjs";
 import {
   processCachedTask
-} from "./chunk-RRHPTTCP.mjs";
-import {
-  setupPatchRecorder
-} from "./chunk-QYZCRG7F.mjs";
+} from "./chunk-76S2EME4.mjs";
 import {
   createDebug,
   ensureRuntimeClassSet,
   getCompilerContext,
+  pluginName,
+  setupPatchRecorder
+} from "./chunk-NAW56TSQ.mjs";
+import {
   getRuntimeClassSetSignature,
-  pluginName
-} from "./chunk-FZNYV7VH.mjs";
+  resolveTailwindcssOptions
+} from "./chunk-EW2K6CO5.mjs";
 import {
   getGroupedEntries
 } from "./chunk-OOHJLO5M.mjs";
 import {
   __dirname
-} from "./chunk-DOH7FULQ.mjs";
+} from "./chunk-EFBQ4SQR.mjs";
 
 // src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
 import process3 from "process";
@@ -56,6 +58,9 @@ function setupWebpackV5ProcessAssetsHook(options) {
     options: compilerOptions,
     appType,
     runtimeState,
+    getRuntimeRefreshRequirement,
+    refreshRuntimeMetadata,
+    consumeRuntimeRefreshRequirement,
     debug: debug2
   } = options;
   const { Compilation, sources } = compiler.webpack;
@@ -153,12 +158,18 @@ function setupWebpackV5ProcessAssetsHook(options) {
           return created;
         };
         const staleClassNameFallback = resolveWebpackStaleClassNameFallback(compilerOptions.staleClassNameFallback, compiler);
+        const forceRuntimeRefresh = getRuntimeRefreshRequirement();
+        debug2("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
         const runtimeSet = await ensureRuntimeClassSet(runtimeState, {
+          forceRefresh: forceRuntimeRefresh,
           // webpack 的 script-only 热更新可能不会触发 runtime classset loader，
           // 这里强制收集可避免沿用上轮 class set，保证 JS 仅按最新集合精确命中。
           forceCollect: true,
+          clearCache: forceRuntimeRefresh,
           allowEmpty: false
         });
+        await refreshRuntimeMetadata(forceRuntimeRefresh);
+        consumeRuntimeRefreshRequirement();
         const defaultTemplateHandlerOptions = {
           runtimeSet
         };
@@ -302,6 +313,7 @@ function setupWebpackV5Loaders(options) {
     runtimeLoaderPath,
     runtimeCssImportRewriteLoaderPath,
     getClassSetInLoader,
+    getRuntimeWatchDependencies,
     debug: debug2
   } = options;
   const isMpxApp = isMpx(appType);
@@ -317,7 +329,8 @@ function setupWebpackV5Loaders(options) {
     appType
   } : void 0;
   const classSetLoaderOptions = {
-    getClassSet: getClassSetInLoader
+    getClassSet: getClassSetInLoader,
+    getWatchDependencies: getRuntimeWatchDependencies
   };
   const { findRewriteAnchor, findClassSetAnchor } = createLoaderAnchorFinders(appType);
   const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? {
@@ -445,9 +458,63 @@ var UnifiedWebpackPluginV5 = class {
     };
     let runtimeSetPrepared = false;
     let runtimeSetSignature;
+    let runtimeRefreshRequiredForCompilation = false;
+    const runtimeWatchDependencyFiles = /* @__PURE__ */ new Set();
+    const runtimeWatchDependencyContexts = /* @__PURE__ */ new Set();
+    let runtimeMetadataPrepared = false;
+    const updateRuntimeWatchDependencies = async () => {
+      runtimeWatchDependencyFiles.clear();
+      runtimeWatchDependencyContexts.clear();
+      const tailwindOptions = resolveTailwindcssOptions(runtimeState.twPatcher.options);
+      if (tailwindOptions?.config) {
+        runtimeWatchDependencyFiles.add(tailwindOptions.config);
+      }
+      for (const entry of tailwindOptions?.v4?.cssEntries ?? []) {
+        runtimeWatchDependencyFiles.add(entry);
+      }
+      for (const source of tailwindOptions?.v4?.sources ?? []) {
+        if (source?.base) {
+          runtimeWatchDependencyContexts.add(source.base);
+        }
+      }
+      if (typeof runtimeState.twPatcher.collectContentTokens !== "function") {
+        return;
+      }
+      try {
+        const report = await runtimeState.twPatcher.collectContentTokens();
+        for (const entry of report.entries ?? []) {
+          if (entry.file) {
+            runtimeWatchDependencyFiles.add(entry.file);
+          }
+        }
+        for (const source of report.sources ?? []) {
+          if (source?.base) {
+            runtimeWatchDependencyContexts.add(source.base);
+          }
+        }
+      } catch (error) {
+        debug("collect runtime watch dependencies failed: %O", error);
+      }
+    };
+    const ensureRuntimeMetadata = async (force = false) => {
+      if (runtimeMetadataPrepared && !force) {
+        return;
+      }
+      await updateRuntimeWatchDependencies();
+      runtimeMetadataPrepared = true;
+    };
+    const syncRuntimeRefreshRequirement = () => {
+      runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasWatchChanges(compiler);
+    };
     const resetRuntimePreparation = () => {
       runtimeSetPrepared = false;
+      runtimeMetadataPrepared = false;
+      syncRuntimeRefreshRequirement();
     };
+    compiler.hooks.invalid?.tap?.(pluginName, () => {
+      runtimeRefreshRequiredForCompilation = true;
+    });
+    compiler.hooks.watchRun?.tap?.(pluginName, syncRuntimeRefreshRequirement);
     if (compiler.hooks.thisCompilation?.tap) {
       compiler.hooks.thisCompilation.tap(pluginName, resetRuntimePreparation);
     } else if (compiler.hooks.compilation?.tap) {
@@ -458,7 +525,8 @@ var UnifiedWebpackPluginV5 = class {
         return;
       }
       const signature = getRuntimeClassSetSignature(runtimeState.twPatcher);
-      const forceRefresh = signature !== runtimeSetSignature;
+      const forceRefresh = runtimeRefreshRequiredForCompilation || signature !== runtimeSetSignature;
+      debug("runtime loader ensure class set forceRefresh=%s watchDirty=%s signatureChanged=%s", forceRefresh, runtimeRefreshRequiredForCompilation, signature !== runtimeSetSignature);
       runtimeSetPrepared = true;
       await ensureRuntimeClassSet(runtimeState, {
         forceRefresh,
@@ -466,7 +534,9 @@ var UnifiedWebpackPluginV5 = class {
         clearCache: forceRefresh,
         allowEmpty: true
       });
+      await ensureRuntimeMetadata(forceRefresh);
       runtimeSetSignature = signature;
+      runtimeRefreshRequiredForCompilation = false;
     }
     onLoad();
     setupWebpackV5Loaders({
@@ -478,6 +548,12 @@ var UnifiedWebpackPluginV5 = class {
       runtimeLoaderPath,
       runtimeCssImportRewriteLoaderPath,
       getClassSetInLoader,
+      getRuntimeWatchDependencies() {
+        return {
+          files: runtimeWatchDependencyFiles,
+          contexts: runtimeWatchDependencyContexts
+        };
+      },
       debug
     });
     setupWebpackV5ProcessAssetsHook({
@@ -485,6 +561,11 @@ var UnifiedWebpackPluginV5 = class {
       options: this.options,
       appType: this.appType,
       runtimeState,
+      getRuntimeRefreshRequirement: () => runtimeRefreshRequiredForCompilation,
+      refreshRuntimeMetadata: ensureRuntimeMetadata,
+      consumeRuntimeRefreshRequirement() {
+        runtimeRefreshRequiredForCompilation = false;
+      },
       debug
     });
   }

package/dist/{chunk-LTJQUORK.js → chunk-OF6MFURR.js}

@@ -4,6 +4,7 @@ async function processCachedTask({
   cacheKey,
   hashKey = cacheKey,
   rawSource,
+  hash,
   readCache,
   applyResult,
   transform,
@@ -14,6 +15,7 @@ async function processCachedTask({
     key: cacheKey,
     hashKey,
     rawSource,
+    hash,
     resolveCache: readCache,
     async onCacheHit(value) {
       cacheHit = true;

package/dist/{chunk-R6KEYO3F.mjs → chunk-QO7CF2RF.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-F2CKKG6Q.mjs";
 import {
   pluginName
-} from "./chunk-FZNYV7VH.mjs";
+} from "./chunk-NAW56TSQ.mjs";
 
 // src/shared/mpx.ts
 import path2 from "path";
@@ -235,6 +235,9 @@ function createAssetHashByChunkMap(chunks) {
   }
   return hashByFile;
 }
+function hasWatchChanges(compiler) {
+  return (compiler.modifiedFiles?.size ?? 0) > 0 || (compiler.removedFiles?.size ?? 0) > 0;
+}
 
 // src/bundlers/webpack/shared/loader-anchors.ts
 var MPX_STRIP_CONDITIONAL_LOADER = "@mpxjs/webpack-plugin/lib/style-compiler/strip-conditional-loader";
@@ -284,5 +287,6 @@ export {
   isCssLikeModuleResource,
   hasLoaderEntry,
   createAssetHashByChunkMap,
+  hasWatchChanges,
   createLoaderAnchorFinders
 };

package/dist/{chunk-LD7LZ4IK.mjs → chunk-SRMDDOZQ.mjs}

@@ -9,10 +9,7 @@ import {
 } from "./chunk-F2CKKG6Q.mjs";
 import {
   processCachedTask
-} from "./chunk-RRHPTTCP.mjs";
-import {
-  setupPatchRecorder
-} from "./chunk-QYZCRG7F.mjs";
+} from "./chunk-76S2EME4.mjs";
 import {
   babelParse,
   collectRuntimeClassSet,
@@ -20,17 +17,19 @@ import {
   createDebug,
   generateCode,
   getCompilerContext,
-  getRuntimeClassSetSignature,
   refreshTailwindRuntimeState,
   replaceWxml,
+  setupPatchRecorder,
   toCustomAttributesEntities,
   traverse,
   vitePluginName
-} from "./chunk-FZNYV7VH.mjs";
+} from "./chunk-NAW56TSQ.mjs";
 import {
   findNearestPackageRoot,
-  findTailwindConfig
-} from "./chunk-IEZ5RBMG.mjs";
+  findTailwindConfig,
+  getRuntimeClassSetSignature,
+  resolveTailwindcssOptions
+} from "./chunk-EW2K6CO5.mjs";
 import {
   resolveUniUtsPlatform
 } from "./chunk-OOHJLO5M.mjs";
@@ -420,6 +419,8 @@ function createUniAppXAssetTask(file, originalSource, outDir, options) {
 // src/bundlers/vite/generate-bundle.ts
 import path2 from "path";
 import process2 from "process";
+import { logger } from "@weapp-tailwindcss/logger";
+import { splitCode } from "@weapp-tailwindcss/shared/extractors";
 
 // src/bundlers/vite/bundle-entries.ts
 import { Buffer } from "buffer";
@@ -707,34 +708,6 @@ function buildBundleSnapshot(bundle, opts, outDir, state, forceAll = false) {
     linkedImpactsByEntry
   };
 }
-function buildBundleSnapshotForBuild(bundle, opts, outDir) {
-  const processFiles = createProcessFiles();
-  const jsEntries = /* @__PURE__ */ new Map();
-  const entries = [];
-  for (const [file, output] of Object.entries(bundle)) {
-    const type = classifyBundleEntry(file, opts);
-    const source = readEntrySource(output);
-    markProcessFile(type, file, processFiles);
-    collectJsEntries(file, output, outDir, jsEntries);
-    entries.push({
-      file,
-      output,
-      source,
-      type
-    });
-  }
-  return {
-    entries,
-    jsEntries,
-    sourceHashByFile: /* @__PURE__ */ new Map(),
-    runtimeAffectingSignatureByFile: /* @__PURE__ */ new Map(),
-    runtimeAffectingHashByFile: /* @__PURE__ */ new Map(),
-    changedByType: createChangedByType(),
-    runtimeAffectingChangedByType: createChangedByType(),
-    processFiles,
-    linkedImpactsByEntry: /* @__PURE__ */ new Map()
-  };
-}
 function invertLinkedByEntry(linkedByEntry) {
   const dependentsByLinkedFile = /* @__PURE__ */ new Map();
   for (const [entryFile, linkedFiles] of linkedByEntry.entries()) {
@@ -749,12 +722,22 @@ function invertLinkedByEntry(linkedByEntry) {
   }
   return dependentsByLinkedFile;
 }
-function updateBundleBuildState(state, snapshot, linkedByEntry) {
+function updateBundleBuildState(state, snapshot, linkedByEntry, options = {}) {
+  const incremental = options.incremental === true;
   state.iteration += 1;
-  state.sourceHashByFile = snapshot.sourceHashByFile;
-  state.runtimeAffectingHashByFile = snapshot.runtimeAffectingHashByFile;
-  state.linkedByEntry = linkedByEntry;
-  state.dependentsByLinkedFile = invertLinkedByEntry(linkedByEntry);
+  state.sourceHashByFile = incremental ? new Map([
+    ...state.sourceHashByFile,
+    ...snapshot.sourceHashByFile
+  ]) : snapshot.sourceHashByFile;
+  state.runtimeAffectingHashByFile = incremental ? new Map([
+    ...state.runtimeAffectingHashByFile,
+    ...snapshot.runtimeAffectingHashByFile
+  ]) : snapshot.runtimeAffectingHashByFile;
+  state.linkedByEntry = incremental ? new Map([
+    ...state.linkedByEntry,
+    ...linkedByEntry
+  ]) : linkedByEntry;
+  state.dependentsByLinkedFile = invertLinkedByEntry(state.linkedByEntry);
 }
 
 // src/bundlers/vite/js-precheck.ts
@@ -862,6 +845,39 @@ function hasRuntimeAffectingSourceChanges(changedByType) {
 function canShareCssTransformResult(rawSource) {
   return !rawSource.includes("@import") && !rawSource.includes("url(");
 }
+function hasOmittedKnownBundleFiles(currentBundleFiles, previousBundleFiles) {
+  const currentFileSet = new Set(currentBundleFiles);
+  for (const file of previousBundleFiles) {
+    if (!currentFileSet.has(file)) {
+      return true;
+    }
+  }
+  return false;
+}
+var MUSTACHE_EXPRESSION_RE = /\{\{[\s\S]*?\}\}/g;
+var QUOTED_LITERAL_RE = /'([^']*)'|"([^"]*)"|`([^`]*)`/g;
+function isArbitraryValueCandidate(candidate) {
+  return candidate.includes("[") && candidate.includes("]");
+}
+function collectUnescapedDynamicCandidates(source) {
+  const matches = /* @__PURE__ */ new Set();
+  for (const expression of source.match(MUSTACHE_EXPRESSION_RE) ?? []) {
+    QUOTED_LITERAL_RE.lastIndex = 0;
+    let quoted = QUOTED_LITERAL_RE.exec(expression);
+    while (quoted !== null) {
+      const literal = quoted[1] ?? quoted[2] ?? quoted[3] ?? "";
+      for (const candidate of splitCode(literal, true)) {
+        const normalized = candidate.trim();
+        if (!normalized || !isArbitraryValueCandidate(normalized)) {
+          continue;
+        }
+        matches.add(normalized);
+      }
+      quoted = QUOTED_LITERAL_RE.exec(expression);
+    }
+  }
+  return [...matches];
+}
 function createGenerateBundleHook(context) {
   const state = createBundleBuildState();
   const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
@@ -914,10 +930,12 @@ function createGenerateBundleHook(context) {
     const disableJsPrecheck = process2.env.WEAPP_TW_VITE_DISABLE_JS_PRECHECK === "1";
     const debugCssDiff = process2.env.WEAPP_TW_VITE_DEBUG_CSS_DIFF === "1";
     const resolvedConfig = getResolvedConfig();
-    const useIncrementalMode = resolvedConfig?.command !== "build";
+    const bundleFiles = Object.keys(bundle);
+    const buildCommand = resolvedConfig?.command === "build";
+    const useIncrementalMode = !buildCommand || hasOmittedKnownBundleFiles(bundleFiles, state.sourceHashByFile.keys());
     const rootDir = resolvedConfig?.root ? path2.resolve(resolvedConfig.root) : process2.cwd();
     const outDir = resolvedConfig?.build?.outDir ? path2.resolve(rootDir, resolvedConfig.build.outDir) : rootDir;
-    const snapshot = useIncrementalMode ? buildBundleSnapshot(bundle, opts, outDir, state, disableDirtyOptimization) : buildBundleSnapshotForBuild(bundle, opts, outDir);
+    const snapshot = buildBundleSnapshot(bundle, opts, outDir, state, disableDirtyOptimization || !useIncrementalMode);
     const useBundleRuntimeClassSet = useIncrementalMode || runtimeState.twPatcher.majorVersion === 4;
     const forceRuntimeRefreshBySource = useIncrementalMode && hasRuntimeAffectingSourceChanges(snapshot.runtimeAffectingChangedByType);
     const processFiles = snapshot.processFiles;
@@ -1026,7 +1044,27 @@ function createGenerateBundleHook(context) {
             },
             async transform() {
               const start = performance.now();
-              const transformed = await templateHandler(rawSource, defaultTemplateHandlerOptions);
+              let transformed = await templateHandler(rawSource, defaultTemplateHandlerOptions);
+              let unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
+              if (unresolvedDynamicCandidates.length > 0) {
+                logger.warn(
+                  "\u68C0\u6D4B\u5230 WXML \u52A8\u6001\u7C7B\u540D\u672A\u5B8C\u6210\u8F6C\u8BD1\uFF0C\u5DF2\u56DE\u9000\u5230\u5B8C\u6574 runtimeSet \u91CD\u8BD5: %s -> %O",
+                  file,
+                  unresolvedDynamicCandidates
+                );
+                const fullRuntimeSet = await context.ensureRuntimeClassSet(true);
+                transformed = await templateHandler(rawSource, {
+                  runtimeSet: fullRuntimeSet
+                });
+                unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
+                if (unresolvedDynamicCandidates.length > 0) {
+                  logger.warn(
+                    "WXML \u52A8\u6001\u7C7B\u540D\u5728\u5B8C\u6574 runtimeSet \u91CD\u8BD5\u540E\u4ECD\u672A\u5B8C\u6210\u8F6C\u8BD1: %s -> %O",
+                    file,
+                    unresolvedDynamicCandidates
+                  );
+                }
+              }
               metrics.html.elapsed += measureElapsed(start);
               metrics.html.transformed++;
               onUpdate(file, rawSource, transformed);
@@ -1241,9 +1279,12 @@ function createGenerateBundleHook(context) {
     for (const apply of pendingLinkedUpdates) {
       apply();
     }
-    if (useIncrementalMode) {
-      updateBundleBuildState(state, snapshot, linkedByEntry ?? /* @__PURE__ */ new Map());
-    }
+    updateBundleBuildState(
+      state,
+      snapshot,
+      useIncrementalMode ? linkedByEntry ?? /* @__PURE__ */ new Map() : /* @__PURE__ */ new Map(),
+      { incremental: useIncrementalMode }
+    );
     debug3(
       "metrics iteration=%d runtime=%sms html(total=%d transform=%d hit=%d rate=%s elapsed=%sms) js(total=%d transform=%d hit=%d rate=%s elapsed=%sms) css(total=%d transform=%d hit=%d rate=%s elapsed=%sms)",
       useIncrementalMode ? state.iteration : 0,
@@ -1293,7 +1334,7 @@ function isPostcssPluginImportTarget(value) {
   return value === "@tailwindcss/postcss" || value === "@tailwindcss/postcss7-compat" || value.includes("/postcss");
 }
 function resolveTailwindCssImportTarget(patcher) {
-  const tailwindOptions = patcher.options?.tailwind;
+  const tailwindOptions = resolveTailwindcssOptions(patcher.options);
   const cssEntries = tailwindOptions?.v4?.cssEntries?.filter((item) => typeof item === "string" && item.length > 0);
   if (cssEntries && cssEntries.length > 0) {
     return createCssImportSource(cssEntries);
@@ -1336,7 +1377,7 @@ function resolveMaybeAbsolute(base, value) {
 }
 async function resolveTailwindCssSource(patcher) {
   const projectRoot = getProjectRoot(patcher);
-  const tailwindOptions = patcher.options?.tailwind;
+  const tailwindOptions = resolveTailwindcssOptions(patcher.options);
   const configuredBase = resolveMaybeAbsolute(projectRoot, tailwindOptions?.v4?.base);
   const configDir = tailwindOptions?.config ? path3.dirname(tailwindOptions.config) : void 0;
   const sharedFallbacks = [
@@ -1763,7 +1804,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   let runtimeRefreshOptionsKey;
   const bundleRuntimeClassSetManager = createBundleRuntimeClassSetManager();
   function resolveRuntimeRefreshOptions() {
-    const configPath = runtimeState.twPatcher.options?.tailwind?.config;
+    const configPath = resolveTailwindcssOptions(runtimeState.twPatcher.options)?.config;
     const signature = getRuntimeClassSetSignature(runtimeState.twPatcher);
     const optionsKey = JSON.stringify({
       appType,