weapp-tailwindcss 4.8.7 → 4.8.8

package/dist/chunk-BYXBJQAS.js

@@ -0,0 +1 @@
+"use strict";

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

@@ -1,26 +1,36 @@
 "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 _chunk2E724WCEjs = require('./chunk-2E724WCE.js');
 
 
-var _chunk322IEI2Kjs = require('./chunk-322IEI2K.js');
+
+
+
+var _chunkXHR5K5ZTjs = require('./chunk-XHR5K5ZT.js');
 
 
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
-var _chunk5F64FE7Kjs = require('./chunk-5F64FE7K.js');
+var _chunkL5ER4544js = require('./chunk-L5ER4544.js');
+
+
+
+
 
 
+var _chunk2KZ4VTIAjs = require('./chunk-2KZ4VTIA.js');
 
 
 
 
-var _chunk7BASRP3Pjs = require('./chunk-7BASRP3P.js');
+
+
+var _chunkP3AQCOOMjs = require('./chunk-P3AQCOOM.js');
 
 
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
@@ -29,15 +39,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 = _chunk2KZ4VTIAjs.createDebug.call(void 0, );
+var weappTailwindcssPackageDir = _chunkXHR5K5ZTjs.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 = _chunk2KZ4VTIAjs.getCompilerContext.call(void 0, options);
     this.appType = this.options.appType;
   }
   apply(compiler) {
+    compiler.options = compiler.options || {};
     const {
       mainCssChunkMatcher,
       disabled,
@@ -49,6 +59,7 @@ var UnifiedWebpackPluginV5 = class {
       templateHandler,
       jsHandler,
       runtimeLoaderPath,
+      runtimeCssImportRewriteLoaderPath,
       cache,
       twPatcher: initialTwPatcher,
       refreshTailwindcssPatcher
@@ -56,14 +67,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 = _chunkP3AQCOOMjs.isMpx.call(void 0, this.appType);
     if (shouldRewriteCssImports) {
-      _chunkWYXD5IW7js.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+      _chunk2E724WCEjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
         pkgDir: weappTailwindcssPackageDir,
-        enabled: true
+        enabled: true,
+        appType: this.appType
       });
+      _chunkP3AQCOOMjs.setupMpxTailwindcssRedirect.call(void 0, weappTailwindcssPackageDir, isMpxApp);
     }
-    const patchRecorderState = _chunk5F64FE7Kjs.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
+    const patchRecorderState = _chunkL5ER4544js.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
       source: "runtime",
       cwd: _nullishCoalesce(this.options.tailwindcssBasedir, () => ( _process2.default.cwd()))
     });
@@ -74,52 +89,110 @@ var UnifiedWebpackPluginV5 = class {
       onPatchCompleted: patchRecorderState.onPatchCompleted
     };
     const refreshRuntimeState = async (force) => {
-      await _chunk7BASRP3Pjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+      await _chunk2KZ4VTIAjs.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 _chunk2KZ4VTIAjs.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 } = _chunk2E724WCEjs.createLoaderAnchorFinders.call(void 0, this.appType);
+    const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? {
+      rewriteCssImports: runtimeLoaderRewriteOptions
+    } : void 0;
+    onLoad();
+    if (shouldRewriteCssImports && isMpxApp) {
+      _chunkP3AQCOOMjs.ensureMpxTailwindcssAliases.call(void 0, compiler, weappTailwindcssPackageDir);
+    }
+    if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) {
+      _chunkP3AQCOOMjs.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(_chunk2KZ4VTIAjs.pluginName, (compilation) => {
+      NormalModule.getCompilationHooks(compilation).loader.tap(_chunk2KZ4VTIAjs.pluginName, (_loaderContext, module) => {
+        const hasRuntimeLoader = runtimeClassSetLoaderExists || runtimeCssImportRewriteLoaderExists;
+        if (!hasRuntimeLoader) {
           return;
         }
+        _chunkP3AQCOOMjs.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 = _chunk2E724WCEjs.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 && !_chunk2E724WCEjs.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: _chunk2KZ4VTIAjs.pluginName,
           stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
         },
         async (assets) => {
@@ -132,18 +205,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 = _chunkXHR5K5ZTjs.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 _chunkXHR5K5ZTjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
             },
             load: (id) => {
               const assetName = jsAssets.get(id);
@@ -188,7 +261,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 _chunk2KZ4VTIAjs.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 +298,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 = _chunk2E724WCEjs.getCacheKey.call(void 0, file);
               const asset = compilation.getAsset(file);
               if (!asset) {
                 continue;
               }
-              const absoluteFile = _chunk322IEI2Kjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absoluteFile = _chunkXHR5K5ZTjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               const initialSource = asset.source.source();
               const initialRawSource = typeof initialSource === "string" ? initialSource : initialSource.toString();
               jsTaskFactories.push(async () => {
@@ -246,8 +319,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 +378,7 @@ var UnifiedWebpackPluginV5 = class {
               );
             }
           }
-          _chunk322IEI2Kjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
+          _chunkXHR5K5ZTjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
           await Promise.all(tasks);
           debug("end");
           onEnd();

package/dist/{chunk-YQQ3HDQD.mjs → chunk-FB3ASCHC.mjs}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-JYHBNTYH.mjs";
+} from "./chunk-M5UEOYBI.mjs";
 import {
   collectRuntimeClassSet,
   createDebug,
   getCompilerContext,
   refreshTailwindRuntimeState
-} from "./chunk-BMUQ4OAB.mjs";
+} from "./chunk-RUXC4E2M.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";