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

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-KKT2DKMW.mjs → chunk-RED7Y22U.mjs}

@@ -5,12 +5,13 @@ import {
   ensureMpxTailwindcssAliases,
   getCacheKey,
   hasLoaderEntry,
+  hasWatchChanges,
   injectMpxCssRewritePreRules,
   isCssLikeModuleResource,
   isMpx,
   patchMpxLoaderResolve,
   setupMpxTailwindcssRedirect
-} from "./chunk-R6KEYO3F.mjs";
+} from "./chunk-SJ3SG6DU.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-HADJCWHU.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-R6KEYO3F.mjs → chunk-SJ3SG6DU.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-F2CKKG6Q.mjs";
 import {
   pluginName
-} from "./chunk-FZNYV7VH.mjs";
+} from "./chunk-HADJCWHU.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-JBM3HGHP.mjs → chunk-UCUAXK7F.mjs}

@@ -1,15 +1,13 @@
 import {
   processCachedTask
-} from "./chunk-RRHPTTCP.mjs";
-import {
-  setupPatchRecorder
-} from "./chunk-QYZCRG7F.mjs";
+} from "./chunk-76S2EME4.mjs";
 import {
   createDebug,
   ensureRuntimeClassSet,
   getCompilerContext,
-  refreshTailwindRuntimeState
-} from "./chunk-FZNYV7VH.mjs";
+  refreshTailwindRuntimeState,
+  setupPatchRecorder
+} from "./chunk-HADJCWHU.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";