weapp-tailwindcss 4.8.6 → 4.8.8

package/dist/webpack4.mjs

@@ -1,34 +1,43 @@
 import {
   applyTailwindcssCssImportRewrite,
-  getCacheKey
-} from "./chunk-NQS4LYVY.mjs";
+  createLoaderAnchorFinders,
+  getCacheKey,
+  hasLoaderEntry,
+  isCssLikeModuleResource
+} from "./chunk-PVJDRL3I.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveOutputSpecifier,
   resolvePackageDir,
   toAbsoluteOutputPath
-} from "./chunk-JW7P34IH.mjs";
+} from "./chunk-RYGPCUUT.mjs";
 import {
   processCachedTask
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-SR4OOLTF.mjs";
+} from "./chunk-M5UEOYBI.mjs";
 import {
   collectRuntimeClassSet,
   createDebug,
   getCompilerContext,
   pluginName,
   refreshTailwindRuntimeState
-} from "./chunk-B2IA5GC7.mjs";
-import "./chunk-3XGTIDA6.mjs";
-import "./chunk-DKPIYG24.mjs";
+} from "./chunk-RUXC4E2M.mjs";
+import {
+  ensureMpxTailwindcssAliases,
+  injectMpxCssRewritePreRules,
+  isMpx,
+  patchMpxLoaderResolve,
+  setupMpxTailwindcssRedirect
+} from "./chunk-6TO3GT5S.mjs";
+import "./chunk-QF65JGNW.mjs";
 import {
   getGroupedEntries
 } from "./chunk-ZNKIYZRQ.mjs";
 import {
   __dirname
-} from "./chunk-67CD2S5L.mjs";
+} from "./chunk-3IP5JCFZ.mjs";
 
 // src/bundlers/webpack/BaseUnifiedPlugin/v4.ts
 import fs from "fs";
@@ -40,10 +49,10 @@ var weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 var UnifiedWebpackPluginV4 = class {
   constructor(options = {}) {
     this.options = getCompilerContext(options);
-    this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
     this.appType = this.options.appType;
   }
   apply(compiler) {
+    compiler.options = compiler.options || {};
     const {
       mainCssChunkMatcher,
       disabled,
@@ -55,6 +64,7 @@ var UnifiedWebpackPluginV4 = class {
       templateHandler,
       jsHandler,
       runtimeLoaderPath,
+      runtimeCssImportRewriteLoaderPath,
       cache,
       twPatcher: initialTwPatcher,
       refreshTailwindcssPatcher
@@ -62,12 +72,16 @@ var UnifiedWebpackPluginV4 = class {
     if (disabled) {
       return;
     }
-    const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (initialTwPatcher.majorVersion ?? 0) >= 4);
+    const isTailwindcssV4 = (initialTwPatcher.majorVersion ?? 0) >= 4;
+    const shouldRewriteCssImports = isTailwindcssV4 && this.options.rewriteCssImports !== false;
+    const isMpxApp = isMpx(this.appType);
     if (shouldRewriteCssImports) {
       applyTailwindcssCssImportRewrite(compiler, {
         pkgDir: weappTailwindcssPackageDir,
-        enabled: true
+        enabled: true,
+        appType: this.appType
       });
+      setupMpxTailwindcssRedirect(weappTailwindcssPackageDir, isMpxApp);
     }
     const patchRecorderState = setupPatchRecorder(initialTwPatcher, this.options.tailwindcssBasedir, {
       source: "runtime",
@@ -87,30 +101,98 @@ var UnifiedWebpackPluginV4 = class {
       await runtimeState.patchPromise;
       await collectRuntimeClassSet(runtimeState.twPatcher, { force: true, skipRefresh: true });
     }
-    onLoad();
-    const loader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-loader.js");
-    const isExisted = fs.existsSync(loader);
+    const runtimeClassSetLoader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
+    const runtimeCssImportRewriteLoader = shouldRewriteCssImports ? runtimeCssImportRewriteLoaderPath ?? path.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js") : void 0;
+    const runtimeClassSetLoaderExists = fs.existsSync(runtimeClassSetLoader);
+    const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.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 } = createLoaderAnchorFinders(this.appType);
+    const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? {
+      rewriteCssImports: runtimeLoaderRewriteOptions
+    } : void 0;
+    onLoad();
+    if (shouldRewriteCssImports && isMpxApp) {
+      ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
+    }
+    if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) {
+      injectMpxCssRewritePreRules(compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
+    }
+    const createRuntimeClassSetLoaderEntry = () => ({
+      loader: runtimeClassSetLoader,
+      options: classSetLoaderOptions,
       ident: null,
       type: null
     });
+    const createCssImportRewriteLoaderEntry = () => {
+      if (!runtimeCssImportRewriteLoader) {
+        return null;
+      }
+      return {
+        loader: runtimeCssImportRewriteLoader,
+        options: cssImportRewriteLoaderOptions,
+        ident: null,
+        type: null
+      };
+    };
     compiler.hooks.compilation.tap(pluginName, (compilation) => {
       compilation.hooks.normalModuleLoader.tap(pluginName, (_loaderContext, module) => {
-        if (isExisted) {
-          const idx = module.loaders.findIndex((x) => x.loader.includes("postcss-loader"));
-          if (idx > -1) {
-            module.loaders.splice(idx + 1, 0, createRuntimeLoaderEntry());
+        const hasRuntimeLoader = runtimeClassSetLoaderExists || runtimeCssImportRewriteLoaderExists;
+        if (!hasRuntimeLoader) {
+          return;
+        }
+        if (shouldRewriteCssImports && isMpx(this.appType) && typeof _loaderContext.resolve === "function") {
+          patchMpxLoaderResolve(_loaderContext, weappTailwindcssPackageDir, true);
+        }
+        const loaderEntries = module.loaders || [];
+        let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
+        const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
+        const isCssModule = isCssLikeModuleResource(module.resource, this.options.cssMatcher, this.appType);
+        if (process.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 (process.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 (process.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 anchorlessInsert = (entry, position) => {
+          if (position === "after") {
+            loaderEntries.push(entry);
+          } else {
+            loaderEntries.unshift(entry);
+          }
+        };
+        if (runtimeLoaderRewriteOptions && runtimeCssImportRewriteLoaderExists && cssImportRewriteLoaderOptions && runtimeCssImportRewriteLoader) {
+          const existingIndex = loaderEntries.findIndex(
+            (entry) => entry.loader?.includes?.(runtimeCssImportRewriteLoader)
+          );
+          const rewriteEntry = existingIndex !== -1 ? loaderEntries.splice(existingIndex, 1)[0] : createCssImportRewriteLoaderEntry();
+          if (rewriteEntry) {
+            const anchorIndex = findRewriteAnchor(loaderEntries);
+            if (anchorIndex === -1) {
+              anchorlessInsert(rewriteEntry, "after");
+            } else {
+              loaderEntries.splice(anchorIndex + 1, 0, rewriteEntry);
+            }
+            rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
+          }
+        }
+        if (runtimeClassSetLoaderExists && !hasLoaderEntry(loaderEntries, runtimeClassSetLoader)) {
+          const anchorIndex = findClassSetAnchor(loaderEntries);
+          if (anchorIndex === -1) {
+            anchorlessInsert(createRuntimeClassSetLoaderEntry(), "before");
           } else {
-            module.loaders.push(createRuntimeLoaderEntry());
+            const insertIndex = anchorIndex === -1 ? rewriteAnchorIdx : anchorIndex;
+            loaderEntries.splice(insertIndex, 0, createRuntimeClassSetLoaderEntry());
           }
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "4.8.6",
+  "version": "4.8.8",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -168,8 +168,8 @@
     "@babel/traverse": "~7.28.5",
     "@babel/types": "~7.28.5",
     "@tailwindcss-mangle/config": "^6.1.0",
-    "@vue/compiler-dom": "^3.5.24",
-    "@vue/compiler-sfc": "^3.5.24",
+    "@vue/compiler-dom": "^3.5.25",
+    "@vue/compiler-sfc": "^3.5.25",
     "@weapp-core/escape": "~5.0.1",
     "@weapp-core/regex": "~1.0.1",
     "cac": "^6.7.14",
@@ -183,10 +183,10 @@
     "semver": "~7.7.3",
     "tailwindcss-patch": "^8.4.2",
     "webpack-sources": "3.3.3",
-    "yaml": "^2.8.1",
+    "yaml": "^2.8.2",
     "@weapp-tailwindcss/logger": "1.1.0",
-    "@weapp-tailwindcss/shared": "1.1.1",
-    "@weapp-tailwindcss/postcss": "2.0.4"
+    "@weapp-tailwindcss/postcss": "2.0.5",
+    "@weapp-tailwindcss/shared": "1.1.1"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",

package/dist/chunk-EK7ECLBW.js

@@ -1,61 +0,0 @@
-"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 _chunkAB45L5FPjs = require('./chunk-AB45L5FP.js');
-
-
-var _chunkYUMLYTPNjs = require('./chunk-YUMLYTPN.js');
-
-// src/bundlers/webpack/shared/css-imports.ts
-var CSS_EXT_RE = /\.(?:css|scss|sass|less|styl|pcss)$/i;
-function stripResourceQuery(file) {
-  let idx = file.indexOf("?");
-  if (idx === -1) {
-    idx = file.indexOf("&");
-  }
-  return idx === -1 ? file : file.slice(0, idx);
-}
-function rewriteTailwindcssRequestForCss(data, pkgDir) {
-  if (!data) {
-    return;
-  }
-  const request = data.request;
-  if (!request) {
-    return;
-  }
-  if (request !== "tailwindcss" && request !== "tailwindcss$" && !request.startsWith("tailwindcss/")) {
-    return;
-  }
-  const issuer = _optionalChain([data, 'access', _ => _.contextInfo, 'optionalAccess', _2 => _2.issuer]);
-  if (!issuer) {
-    return;
-  }
-  const normalizedIssuer = stripResourceQuery(issuer);
-  if (!CSS_EXT_RE.test(normalizedIssuer)) {
-    return;
-  }
-  const resolved = _chunkAB45L5FPjs.resolveTailwindcssImport.call(void 0, request, pkgDir);
-  if (!resolved) {
-    return;
-  }
-  data.request = resolved;
-}
-function applyTailwindcssCssImportRewrite(compiler, options) {
-  if (!options.enabled) {
-    return;
-  }
-  compiler.hooks.normalModuleFactory.tap(_chunkYUMLYTPNjs.pluginName, (factory) => {
-    factory.hooks.beforeResolve.tap(_chunkYUMLYTPNjs.pluginName, (data) => {
-      rewriteTailwindcssRequestForCss(data, options.pkgDir);
-    });
-  });
-}
-
-// src/bundlers/webpack/BaseUnifiedPlugin/shared.ts
-function getCacheKey(filename) {
-  return filename;
-}
-
-
-
-
-exports.applyTailwindcssCssImportRewrite = applyTailwindcssCssImportRewrite; exports.getCacheKey = getCacheKey;

package/dist/chunk-NQS4LYVY.mjs

@@ -1,61 +0,0 @@
-import {
-  resolveTailwindcssImport
-} from "./chunk-JW7P34IH.mjs";
-import {
-  pluginName
-} from "./chunk-B2IA5GC7.mjs";
-
-// src/bundlers/webpack/shared/css-imports.ts
-var CSS_EXT_RE = /\.(?:css|scss|sass|less|styl|pcss)$/i;
-function stripResourceQuery(file) {
-  let idx = file.indexOf("?");
-  if (idx === -1) {
-    idx = file.indexOf("&");
-  }
-  return idx === -1 ? file : file.slice(0, idx);
-}
-function rewriteTailwindcssRequestForCss(data, pkgDir) {
-  if (!data) {
-    return;
-  }
-  const request = data.request;
-  if (!request) {
-    return;
-  }
-  if (request !== "tailwindcss" && request !== "tailwindcss$" && !request.startsWith("tailwindcss/")) {
-    return;
-  }
-  const issuer = data.contextInfo?.issuer;
-  if (!issuer) {
-    return;
-  }
-  const normalizedIssuer = stripResourceQuery(issuer);
-  if (!CSS_EXT_RE.test(normalizedIssuer)) {
-    return;
-  }
-  const resolved = resolveTailwindcssImport(request, pkgDir);
-  if (!resolved) {
-    return;
-  }
-  data.request = resolved;
-}
-function applyTailwindcssCssImportRewrite(compiler, options) {
-  if (!options.enabled) {
-    return;
-  }
-  compiler.hooks.normalModuleFactory.tap(pluginName, (factory) => {
-    factory.hooks.beforeResolve.tap(pluginName, (data) => {
-      rewriteTailwindcssRequestForCss(data, options.pkgDir);
-    });
-  });
-}
-
-// src/bundlers/webpack/BaseUnifiedPlugin/shared.ts
-function getCacheKey(filename) {
-  return filename;
-}
-
-export {
-  applyTailwindcssCssImportRewrite,
-  getCacheKey
-};