weapp-tailwindcss 4.8.7 → 4.8.9

package/dist/{chunk-U4WEDSBF.js → chunk-XQKBWIFI.js}

@@ -3,13 +3,13 @@
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
-var _chunk5F64FE7Kjs = require('./chunk-5F64FE7K.js');
+var _chunk6UW6DOPIjs = require('./chunk-6UW6DOPI.js');
 
 
 
 
 
-var _chunk7BASRP3Pjs = require('./chunk-7BASRP3P.js');
+var _chunkZTGB2D5Wjs = require('./chunk-ZTGB2D5W.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 = _chunk7BASRP3Pjs.createDebug.call(void 0, );
+var debug = _chunkZTGB2D5Wjs.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunk7BASRP3Pjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkZTGB2D5Wjs.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-  const patchRecorderState = _chunk5F64FE7Kjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
+  const patchRecorderState = _chunk6UW6DOPIjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
     source: "runtime",
     cwd: _nullishCoalesce(opts.tailwindcssBasedir, () => ( _process2.default.cwd()))
   });
@@ -36,7 +36,7 @@ function createPlugins(options = {}) {
   const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"];
   let runtimeSetInitialized = false;
   async function refreshRuntimeState(force) {
-    await _chunk7BASRP3Pjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+    await _chunkZTGB2D5Wjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
   }
   async function refreshRuntimeSet(force = false) {
     await refreshRuntimeState(force);
@@ -44,7 +44,7 @@ function createPlugins(options = {}) {
     if (!force && runtimeSetInitialized && runtimeSet.size > 0) {
       return runtimeSet;
     }
-    runtimeSet = await _chunk7BASRP3Pjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force, skipRefresh: force });
+    runtimeSet = await _chunkZTGB2D5Wjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force, skipRefresh: force });
     runtimeSetInitialized = true;
     return runtimeSet;
   }

package/dist/{chunk-WUJAJ42W.js → chunk-Z366CKKB.js}

@@ -1,26 +1,34 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } 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 _chunkWYXD5IW7js = require('./chunk-WYXD5IW7.js');
 
 
 
+var _chunk4KBHUV2Cjs = require('./chunk-4KBHUV2C.js');
 
 
-var _chunk322IEI2Kjs = require('./chunk-322IEI2K.js');
+
+
+
+
+
+
+
+
+var _chunkJ25ZFRYMjs = require('./chunk-J25ZFRYM.js');
 
 
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
-var _chunk5F64FE7Kjs = require('./chunk-5F64FE7K.js');
+var _chunk6UW6DOPIjs = require('./chunk-6UW6DOPI.js');
 
 
 
 
 
 
-var _chunk7BASRP3Pjs = require('./chunk-7BASRP3P.js');
+var _chunkZTGB2D5Wjs = require('./chunk-ZTGB2D5W.js');
 
 
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
@@ -29,15 +37,15 @@ var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
 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 debug = _chunk7BASRP3Pjs.createDebug.call(void 0, );
-var weappTailwindcssPackageDir = _chunk322IEI2Kjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
+var debug = _chunkZTGB2D5Wjs.createDebug.call(void 0, );
+var weappTailwindcssPackageDir = _chunkJ25ZFRYMjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var UnifiedWebpackPluginV5 = class {
   constructor(options = {}) {
-    this.options = _chunk7BASRP3Pjs.getCompilerContext.call(void 0, options);
-    this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
+    this.options = _chunkZTGB2D5Wjs.getCompilerContext.call(void 0, options);
     this.appType = this.options.appType;
   }
   apply(compiler) {
+    compiler.options = compiler.options || {};
     const {
       mainCssChunkMatcher,
       disabled,
@@ -49,6 +57,7 @@ var UnifiedWebpackPluginV5 = class {
       templateHandler,
       jsHandler,
       runtimeLoaderPath,
+      runtimeCssImportRewriteLoaderPath,
       cache,
       twPatcher: initialTwPatcher,
       refreshTailwindcssPatcher
@@ -56,14 +65,18 @@ var UnifiedWebpackPluginV5 = class {
     if (disabled) {
       return;
     }
-    const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4);
+    const isTailwindcssV4 = (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4;
+    const shouldRewriteCssImports = isTailwindcssV4 && this.options.rewriteCssImports !== false;
+    const isMpxApp = _chunkJ25ZFRYMjs.isMpx.call(void 0, this.appType);
     if (shouldRewriteCssImports) {
-      _chunkWYXD5IW7js.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+      _chunk4KBHUV2Cjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
         pkgDir: weappTailwindcssPackageDir,
-        enabled: true
+        enabled: true,
+        appType: this.appType
       });
+      _chunkJ25ZFRYMjs.setupMpxTailwindcssRedirect.call(void 0, weappTailwindcssPackageDir, isMpxApp);
     }
-    const patchRecorderState = _chunk5F64FE7Kjs.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
+    const patchRecorderState = _chunk6UW6DOPIjs.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
       source: "runtime",
       cwd: _nullishCoalesce(this.options.tailwindcssBasedir, () => ( _process2.default.cwd()))
     });
@@ -74,52 +87,110 @@ var UnifiedWebpackPluginV5 = class {
       onPatchCompleted: patchRecorderState.onPatchCompleted
     };
     const refreshRuntimeState = async (force) => {
-      await _chunk7BASRP3Pjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+      await _chunkZTGB2D5Wjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
     };
     const { Compilation, sources, NormalModule } = compiler.webpack;
     const { ConcatSource } = sources;
     async function getClassSetInLoader() {
       await refreshRuntimeState(true);
       await runtimeState.patchPromise;
-      await _chunk7BASRP3Pjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+      await _chunkZTGB2D5Wjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
     }
-    onLoad();
-    const loader = _nullishCoalesce(runtimeLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-runtime-loader.js")));
-    const isExisted = _fs2.default.existsSync(loader);
+    const runtimeClassSetLoader = _nullishCoalesce(runtimeLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js")));
+    const runtimeCssImportRewriteLoader = shouldRewriteCssImports ? _nullishCoalesce(runtimeCssImportRewriteLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js"))) : void 0;
+    const runtimeClassSetLoaderExists = _fs2.default.existsSync(runtimeClassSetLoader);
+    const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? _fs2.default.existsSync(runtimeCssImportRewriteLoader) : false;
     const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
-      pkgDir: weappTailwindcssPackageDir
+      pkgDir: weappTailwindcssPackageDir,
+      appType: this.appType
     } : void 0;
-    const runtimeLoaderOptions = {
-      getClassSet: getClassSetInLoader,
-      rewriteCssImports: runtimeLoaderRewriteOptions
+    const classSetLoaderOptions = {
+      getClassSet: getClassSetInLoader
     };
-    const createRuntimeLoaderEntry = () => ({
-      loader,
-      options: runtimeLoaderOptions,
+    const { findRewriteAnchor, findClassSetAnchor } = _chunk4KBHUV2Cjs.createLoaderAnchorFinders.call(void 0, this.appType);
+    const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? {
+      rewriteCssImports: runtimeLoaderRewriteOptions
+    } : void 0;
+    onLoad();
+    if (shouldRewriteCssImports && isMpxApp) {
+      _chunkJ25ZFRYMjs.ensureMpxTailwindcssAliases.call(void 0, compiler, weappTailwindcssPackageDir);
+    }
+    if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) {
+      _chunkJ25ZFRYMjs.injectMpxCssRewritePreRules.call(void 0, compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
+    }
+    const createRuntimeClassSetLoaderEntry = () => ({
+      loader: runtimeClassSetLoader,
+      options: classSetLoaderOptions,
       ident: null,
       type: null
     });
-    compiler.hooks.compilation.tap(_chunk7BASRP3Pjs.pluginName, (compilation) => {
-      NormalModule.getCompilationHooks(compilation).loader.tap(_chunk7BASRP3Pjs.pluginName, (_loaderContext, module) => {
-        if (!isExisted) {
+    const createCssImportRewriteLoaderEntry = () => {
+      if (!runtimeCssImportRewriteLoader) {
+        return null;
+      }
+      return {
+        loader: runtimeCssImportRewriteLoader,
+        options: cssImportRewriteLoaderOptions,
+        ident: null,
+        type: null
+      };
+    };
+    compiler.hooks.compilation.tap(_chunkZTGB2D5Wjs.pluginName, (compilation) => {
+      NormalModule.getCompilationHooks(compilation).loader.tap(_chunkZTGB2D5Wjs.pluginName, (_loaderContext, module) => {
+        const hasRuntimeLoader = runtimeClassSetLoaderExists || runtimeCssImportRewriteLoaderExists;
+        if (!hasRuntimeLoader) {
           return;
         }
+        _chunkJ25ZFRYMjs.patchMpxLoaderResolve.call(void 0, _loaderContext, weappTailwindcssPackageDir, shouldRewriteCssImports && isMpxApp);
         const loaderEntries = module.loaders || [];
-        const idx = loaderEntries.findIndex((entry) => {
-          if (!_optionalChain([entry, 'optionalAccess', _ => _.loader])) {
-            return false;
-          }
-          return entry.loader.includes("postcss-loader");
-        });
-        if (idx === -1) {
+        let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
+        const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
+        const isCssModule = _chunk4KBHUV2Cjs.isCssLikeModuleResource.call(void 0, module.resource, this.options.cssMatcher, this.appType);
+        if (_process2.default.env.WEAPP_TW_LOADER_DEBUG && isCssModule) {
+          debug("loader hook css module: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), { rewriteAnchorIdx, classSetAnchorIdx });
+        }
+        if (_process2.default.env.WEAPP_TW_LOADER_DEBUG && typeof module.resource === "string" && module.resource.includes("app.css")) {
+          debug("app.css module loaders=%o anchors=%o", loaderEntries.map((x) => x.loader), { rewriteAnchorIdx, classSetAnchorIdx });
+        } else if (_process2.default.env.WEAPP_TW_LOADER_DEBUG && typeof module.resource === "string" && module.resource.endsWith(".css")) {
+          debug("css module seen: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), { rewriteAnchorIdx, classSetAnchorIdx });
+        }
+        if (rewriteAnchorIdx === -1 && classSetAnchorIdx === -1 && !isCssModule) {
           return;
         }
-        const runtimeLoaderEntry = createRuntimeLoaderEntry();
-        loaderEntries.splice(idx + 1, 0, runtimeLoaderEntry);
+        const anchorlessInsert = (entry, position) => {
+          if (position === "after") {
+            loaderEntries.push(entry);
+          } else {
+            loaderEntries.unshift(entry);
+          }
+        };
+        if (cssImportRewriteLoaderOptions && runtimeCssImportRewriteLoaderExists && runtimeCssImportRewriteLoader) {
+          const existingIndex = loaderEntries.findIndex((entry) => _optionalChain([entry, 'access', _ => _.loader, 'optionalAccess', _2 => _2.includes, 'optionalCall', _3 => _3(runtimeCssImportRewriteLoader)]));
+          const rewriteLoaderEntry = existingIndex !== -1 ? loaderEntries.splice(existingIndex, 1)[0] : createCssImportRewriteLoaderEntry();
+          if (rewriteLoaderEntry) {
+            const anchorIndex = findRewriteAnchor(loaderEntries);
+            if (anchorIndex === -1) {
+              anchorlessInsert(rewriteLoaderEntry, "after");
+            } else {
+              loaderEntries.splice(anchorIndex + 1, 0, rewriteLoaderEntry);
+            }
+            rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
+          }
+        }
+        if (runtimeClassSetLoaderExists && !_chunk4KBHUV2Cjs.hasLoaderEntry.call(void 0, loaderEntries, runtimeClassSetLoader)) {
+          const classSetLoaderEntry = createRuntimeClassSetLoaderEntry();
+          const anchorIndex = findClassSetAnchor(loaderEntries);
+          if (anchorIndex === -1) {
+            anchorlessInsert(classSetLoaderEntry, "before");
+          } else {
+            const insertIndex = anchorIndex === -1 ? rewriteAnchorIdx : anchorIndex;
+            loaderEntries.splice(insertIndex, 0, classSetLoaderEntry);
+          }
+        }
       });
       compilation.hooks.processAssets.tapPromise(
         {
-          name: _chunk7BASRP3Pjs.pluginName,
+          name: _chunkZTGB2D5Wjs.pluginName,
           stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
         },
         async (assets) => {
@@ -132,18 +203,18 @@ var UnifiedWebpackPluginV5 = class {
             }
           }
           const entries = Object.entries(assets);
-          const compilerOutputPath = _nullishCoalesce(_optionalChain([compilation, 'access', _2 => _2.compiler, 'optionalAccess', _3 => _3.outputPath]), () => ( compiler.outputPath));
-          const outputDir = compilerOutputPath ? _path2.default.resolve(compilerOutputPath) : _nullishCoalesce(_optionalChain([compilation, 'access', _4 => _4.outputOptions, 'optionalAccess', _5 => _5.path]), () => ( _process2.default.cwd()));
+          const compilerOutputPath = _nullishCoalesce(_optionalChain([compilation, 'access', _4 => _4.compiler, 'optionalAccess', _5 => _5.outputPath]), () => ( compiler.outputPath));
+          const outputDir = compilerOutputPath ? _path2.default.resolve(compilerOutputPath) : _nullishCoalesce(_optionalChain([compilation, 'access', _6 => _6.outputOptions, 'optionalAccess', _7 => _7.path]), () => ( _process2.default.cwd()));
           const jsAssets = /* @__PURE__ */ new Map();
           for (const [file] of entries) {
             if (this.options.jsMatcher(file) || this.options.wxsMatcher(file)) {
-              const absolute = _chunk322IEI2Kjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absolute = _chunkJ25ZFRYMjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               jsAssets.set(absolute, file);
             }
           }
           const moduleGraphOptions = {
             resolve(specifier, importer) {
-              return _chunk322IEI2Kjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
+              return _chunkJ25ZFRYMjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
             },
             load: (id) => {
               const assetName = jsAssets.get(id);
@@ -188,7 +259,7 @@ var UnifiedWebpackPluginV5 = class {
           const groupedEntries = _chunkUW3WHSZ5js.getGroupedEntries.call(void 0, entries, this.options);
           await refreshRuntimeState(true);
           await runtimeState.patchPromise;
-          const runtimeSet = await _chunk7BASRP3Pjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+          const runtimeSet = await _chunkZTGB2D5Wjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
           debug("get runtimeSet, class count: %d", runtimeSet.size);
           const tasks = [];
           if (Array.isArray(groupedEntries.html)) {
@@ -225,12 +296,12 @@ var UnifiedWebpackPluginV5 = class {
           const jsTaskFactories = [];
           if (Array.isArray(groupedEntries.js)) {
             for (const [file] of groupedEntries.js) {
-              const cacheKey = _chunkWYXD5IW7js.getCacheKey.call(void 0, file);
+              const cacheKey = _chunk4KBHUV2Cjs.getCacheKey.call(void 0, file);
               const asset = compilation.getAsset(file);
               if (!asset) {
                 continue;
               }
-              const absoluteFile = _chunk322IEI2Kjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absoluteFile = _chunkJ25ZFRYMjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               const initialSource = asset.source.source();
               const initialRawSource = typeof initialSource === "string" ? initialSource : initialSource.toString();
               jsTaskFactories.push(async () => {
@@ -246,8 +317,8 @@ var UnifiedWebpackPluginV5 = class {
                   },
                   transform: async () => {
                     const currentAsset = compilation.getAsset(file);
-                    const currentSourceValue = _optionalChain([currentAsset, 'optionalAccess', _6 => _6.source, 'access', _7 => _7.source, 'call', _8 => _8()]);
-                    const currentSource = typeof currentSourceValue === "string" ? currentSourceValue : _nullishCoalesce(_optionalChain([currentSourceValue, 'optionalAccess', _9 => _9.toString, 'call', _10 => _10()]), () => ( ""));
+                    const currentSourceValue = _optionalChain([currentAsset, 'optionalAccess', _8 => _8.source, 'access', _9 => _9.source, 'call', _10 => _10()]);
+                    const currentSource = typeof currentSourceValue === "string" ? currentSourceValue : _nullishCoalesce(_optionalChain([currentSourceValue, 'optionalAccess', _11 => _11.toString, 'call', _12 => _12()]), () => ( ""));
                     const { code, linked } = await jsHandler(currentSource, runtimeSet, {
                       filename: absoluteFile,
                       moduleGraph: moduleGraphOptions,
@@ -305,7 +376,7 @@ var UnifiedWebpackPluginV5 = class {
               );
             }
           }
-          _chunk322IEI2Kjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
+          _chunkJ25ZFRYMjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
           await Promise.all(tasks);
           debug("end");
           onEnd();

package/dist/{chunk-7BASRP3P.js → chunk-ZTGB2D5W.js}

@@ -1,10 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } 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 _chunkESYZLHZIjs = require('./chunk-ESYZLHZI.js');
 
 
-var _chunkZSTF2AENjs = require('./chunk-ZSTF2AEN.js');
+var _chunkS2YGU6BUjs = require('./chunk-S2YGU6BU.js');
+
+
+var _chunk3URI7W6Xjs = require('./chunk-3URI7W6X.js');
 
 
 
@@ -25,7 +27,7 @@ function createDebug(prefix) {
 
 // src/tailwindcss/runtime.ts
 var debug = createDebug("[tailwindcss:runtime] ");
-var refreshTailwindcssPatcherSymbol = Symbol.for("weapp-tailwindcss.refreshTailwindcssPatcher");
+var refreshTailwindcssPatcherSymbol = /* @__PURE__ */ Symbol.for("weapp-tailwindcss.refreshTailwindcssPatcher");
 var runtimeClassSetCache = /* @__PURE__ */ new WeakMap();
 function getCacheEntry(twPatcher) {
   let entry = runtimeClassSetCache.get(twPatcher);
@@ -104,7 +106,11 @@ function tryGetRuntimeClassSetSync(twPatcher) {
     return void 0;
   }
   try {
-    return twPatcher.getClassSetSync();
+    const set = twPatcher.getClassSetSync();
+    if (set && set.size === 0) {
+      return void 0;
+    }
+    return set;
   } catch (error) {
     if (twPatcher.majorVersion === 4) {
       debug("getClassSetSync() unavailable for tailwindcss v4, fallback to async getClassSet(): %O", error);
@@ -181,7 +187,7 @@ async function collectRuntimeClassSet(twPatcher, options = {}) {
 // package.json
 var package_default = {
   name: "weapp-tailwindcss",
-  version: "4.8.7",
+  version: "4.8.9",
   description: "\u628A tailwindcss \u539F\u5B50\u5316\u6837\u5F0F\u601D\u60F3\uFF0C\u5E26\u7ED9\u5C0F\u7A0B\u5E8F\u5F00\u53D1\u8005\u4EEC! bring tailwindcss to miniprogram developers!",
   author: "ice breaker <1324318532@qq.com>",
   license: "MIT",
@@ -434,7 +440,7 @@ function formatRelativeToBase(targetPath, baseDir) {
 }
 function resolveRecordLocation(baseDir) {
   const normalizedBase = _path2.default.normalize(baseDir);
-  const packageRoot = _nullishCoalesce(_chunkESYZLHZIjs.findNearestPackageRoot.call(void 0, normalizedBase), () => ( normalizedBase));
+  const packageRoot = _nullishCoalesce(_chunkS2YGU6BUjs.findNearestPackageRoot.call(void 0, normalizedBase), () => ( normalizedBase));
   const packageJsonPath = _path2.default.join(packageRoot, "package.json");
   const hasPackageJson = _fs.existsSync.call(void 0, packageJsonPath);
   const recordKeySource = hasPackageJson ? packageJsonPath : normalizedBase;
@@ -2721,121 +2727,24 @@ function applyLoggerLevel(logLevel) {
 }
 
 // src/context/index.ts
-var DEFAULT_CSS_CALC_CUSTOM_PROPERTIES = [];
-function includesToken(list, token) {
-  return list.some((candidate) => {
-    if (typeof token === "string") {
-      if (typeof candidate === "string") {
-        return candidate === token;
-      }
-      candidate.lastIndex = 0;
-      return candidate.test(token);
-    }
-    if (typeof candidate === "string") {
-      token.lastIndex = 0;
-      return token.test(candidate);
-    }
-    return candidate.source === token.source && candidate.flags === token.flags;
-  });
-}
-function ensureDefaultsIncluded(value) {
-  if (value === true) {
-    return {
-      includeCustomProperties: [...DEFAULT_CSS_CALC_CUSTOM_PROPERTIES]
-    };
-  }
-  if (Array.isArray(value)) {
-    if (!DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.length) {
-      return value;
-    }
-    const missing = DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.filter((token) => !includesToken(value, token));
-    return missing.length > 0 ? [...value, ...missing] : value;
-  }
-  if (value && typeof value === "object") {
-    const include = value.includeCustomProperties;
-    if (!Array.isArray(include)) {
-      return {
-        ...value,
-        includeCustomProperties: [...DEFAULT_CSS_CALC_CUSTOM_PROPERTIES]
-      };
-    }
-    if (!DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.length) {
-      return value;
-    }
-    const missing = DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.filter((token) => !includesToken(include, token));
-    return missing.length > 0 ? {
-      ...value,
-      includeCustomProperties: [...include, ...missing]
-    } : value;
-  }
-  return value;
-}
-function normalizeCssEntriesConfig(entries) {
-  if (!entries) {
-    return void 0;
-  }
-  if (typeof entries === "string") {
-    const trimmed = entries.trim();
-    return trimmed ? [trimmed] : void 0;
-  }
-  if (!Array.isArray(entries)) {
-    return void 0;
-  }
-  const normalized = entries.map((entry) => typeof entry === "string" ? entry.trim() : "").filter((entry) => entry.length > 0);
-  return normalized.length > 0 ? normalized : void 0;
-}
-function hasConfiguredCssEntries(ctx) {
-  if (normalizeCssEntriesConfig(ctx.cssEntries)) {
-    return true;
-  }
-  if (normalizeCssEntriesConfig(_optionalChain([ctx, 'access', _86 => _86.tailwindcss, 'optionalAccess', _87 => _87.v4, 'optionalAccess', _88 => _88.cssEntries]))) {
-    return true;
-  }
-  const patcherOptions = ctx.tailwindcssPatcherOptions;
-  if (patcherOptions) {
-    if (normalizeCssEntriesConfig(_optionalChain([patcherOptions, 'access', _89 => _89.tailwind, 'optionalAccess', _90 => _90.v4, 'optionalAccess', _91 => _91.cssEntries]))) {
-      return true;
-    }
-    if (normalizeCssEntriesConfig(_optionalChain([patcherOptions, 'access', _92 => _92.patch, 'optionalAccess', _93 => _93.tailwindcss, 'optionalAccess', _94 => _94.v4, 'optionalAccess', _95 => _95.cssEntries]))) {
-      return true;
-    }
-  }
-  return false;
-}
-var hasWarnedMissingCssEntries = false;
-function warnMissingCssEntries(ctx, patcher) {
-  if (hasWarnedMissingCssEntries) {
-    return;
-  }
-  if (_optionalChain([patcher, 'optionalAccess', _96 => _96.majorVersion]) !== 4) {
-    return;
-  }
-  if (hasConfiguredCssEntries(ctx)) {
-    return;
-  }
-  hasWarnedMissingCssEntries = true;
-  _logger.logger.warn(
-    '[tailwindcss@4] \u672A\u68C0\u6D4B\u5230 cssEntries \u914D\u7F6E\u3002\u8BF7\u4F20\u5165\u5305\u542B tailwindcss \u5F15\u7528\u7684 CSS \u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u4F8B\u5982 cssEntries: ["/absolute/path/to/src/app.css"]\uFF0C\u5426\u5219 tailwindcss \u751F\u6210\u7684\u7C7B\u540D\u4E0D\u4F1A\u53C2\u4E0E\u8F6C\u8BD1\u3002'
-  );
-}
 async function clearTailwindcssPatcherCache(patcher, options) {
   if (!patcher) {
     return;
   }
-  const cacheOptions = _optionalChain([patcher, 'access', _97 => _97.options, 'optionalAccess', _98 => _98.cache]);
+  const cacheOptions = _optionalChain([patcher, 'access', _86 => _86.options, 'optionalAccess', _87 => _87.cache]);
   if (cacheOptions == null || typeof cacheOptions === "object" && cacheOptions.enabled === false) {
     return;
   }
   const cachePaths = /* @__PURE__ */ new Map();
   const normalizedCacheOptions = typeof cacheOptions === "object" ? cacheOptions : void 0;
-  if (_optionalChain([normalizedCacheOptions, 'optionalAccess', _99 => _99.path])) {
+  if (_optionalChain([normalizedCacheOptions, 'optionalAccess', _88 => _88.path])) {
     cachePaths.set(normalizedCacheOptions.path, false);
   }
-  const privateCachePath = _optionalChain([patcher, 'optionalAccess', _100 => _100.cacheStore, 'optionalAccess', _101 => _101.options, 'optionalAccess', _102 => _102.path]);
+  const privateCachePath = _optionalChain([patcher, 'optionalAccess', _89 => _89.cacheStore, 'optionalAccess', _90 => _90.options, 'optionalAccess', _91 => _91.path]);
   if (privateCachePath) {
     cachePaths.set(privateCachePath, false);
   }
-  if (_optionalChain([options, 'optionalAccess', _103 => _103.removeDirectory]) && _optionalChain([normalizedCacheOptions, 'optionalAccess', _104 => _104.dir])) {
+  if (_optionalChain([options, 'optionalAccess', _92 => _92.removeDirectory]) && _optionalChain([normalizedCacheOptions, 'optionalAccess', _93 => _93.dir])) {
     cachePaths.set(normalizedCacheOptions.dir, true);
   }
   if (!cachePaths.size) {
@@ -2846,7 +2755,7 @@ async function clearTailwindcssPatcherCache(patcher, options) {
       await _promises.rm.call(void 0, cachePath, { force: true, recursive });
     } catch (error) {
       const err = error;
-      if (_optionalChain([err, 'optionalAccess', _105 => _105.code]) === "ENOENT") {
+      if (_optionalChain([err, 'optionalAccess', _94 => _94.code]) === "ENOENT") {
         continue;
       }
       _logger.logger.debug("failed to clear tailwindcss patcher cache: %s %O", cachePath, err);
@@ -2856,23 +2765,20 @@ async function clearTailwindcssPatcherCache(patcher, options) {
 function createInternalCompilerContext(opts) {
   const ctx = _chunkUW3WHSZ5js.defuOverrideArray.call(void 0, 
     opts,
-    _chunkZSTF2AENjs.getDefaultOptions.call(void 0, ),
+    _chunk3URI7W6Xjs.getDefaultOptions.call(void 0, ),
     {}
   );
   ctx.escapeMap = ctx.customReplaceDictionary;
   applyLoggerLevel(ctx.logLevel);
-  const twPatcher = _chunkESYZLHZIjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
+  const twPatcher = _chunkS2YGU6BUjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
   logTailwindcssTarget("runtime", twPatcher, ctx.tailwindcssBasedir);
-  if (_optionalChain([twPatcher, 'access', _106 => _106.packageInfo, 'optionalAccess', _107 => _107.version])) {
+  if (_optionalChain([twPatcher, 'access', _95 => _95.packageInfo, 'optionalAccess', _96 => _96.version])) {
     _logger.logger.success(`\u5F53\u524D\u4F7F\u7528 ${_logger.pc.cyanBright("Tailwind CSS")} \u7248\u672C\u4E3A: ${_logger.pc.underline(_logger.pc.bold(_logger.pc.green(twPatcher.packageInfo.version)))}`);
   } else {
     _logger.logger.warn(`${_logger.pc.cyanBright("Tailwind CSS")} \u672A\u5B89\u88C5\uFF0C\u5DF2\u8DF3\u8FC7\u7248\u672C\u68C0\u6D4B\u4E0E\u8865\u4E01\u5E94\u7528\u3002`);
   }
-  warnMissingCssEntries(ctx, twPatcher);
-  let cssCalcOptions = _nullishCoalesce(ctx.cssCalc, () => ( twPatcher.majorVersion === 4));
-  if (twPatcher.majorVersion === 4 && cssCalcOptions) {
-    cssCalcOptions = ensureDefaultsIncluded(cssCalcOptions);
-  }
+  _chunkS2YGU6BUjs.warnMissingCssEntries.call(void 0, ctx, twPatcher);
+  const cssCalcOptions = _chunkS2YGU6BUjs.applyV4CssCalcDefaults.call(void 0, ctx.cssCalc, twPatcher);
   ctx.cssCalc = cssCalcOptions;
   const customAttributesEntities = toCustomAttributesEntities(ctx.customAttributes);
   const { styleHandler, jsHandler: jsHandler2, templateHandler } = createHandlersFromContext(
@@ -2887,11 +2793,11 @@ function createInternalCompilerContext(opts) {
   ctx.twPatcher = twPatcher;
   const refreshTailwindcssPatcher = async (options) => {
     const previousPatcher = ctx.twPatcher;
-    if (_optionalChain([options, 'optionalAccess', _108 => _108.clearCache]) !== false) {
+    if (_optionalChain([options, 'optionalAccess', _97 => _97.clearCache]) !== false) {
       await clearTailwindcssPatcherCache(previousPatcher);
     }
     invalidateRuntimeClassSet(previousPatcher);
-    const nextPatcher = _chunkESYZLHZIjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
+    const nextPatcher = _chunkS2YGU6BUjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
     Object.assign(previousPatcher, nextPatcher);
     ctx.twPatcher = previousPatcher;
     return previousPatcher;