weapp-tailwindcss 4.8.7 → 4.8.9

package/dist/{chunk-JYHBNTYH.mjs → chunk-3BMQ6ZWL.mjs}

@@ -1,10 +1,10 @@
 import {
   createPatchTargetRecorder,
   createTailwindPatchPromise
-} from "./chunk-BMUQ4OAB.mjs";
+} from "./chunk-FYYIFZ36.mjs";
 import {
   logger
-} from "./chunk-3XGTIDA6.mjs";
+} from "./chunk-IXK4ZWFR.mjs";
 
 // src/tailwindcss/recorder.ts
 function setupPatchRecorder(patcher, baseDir, options) {

package/dist/{chunk-ZB6MFKXJ.mjs → chunk-3IP5JCFZ.mjs}

@@ -1,4 +1,4 @@
-// ../../node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.53.1_@types+node@24.10.1__@swc+core@1.15.3_@swc+h_c0fd57d7feba03b3e4bcfd5e91aeb7d6/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.53.1_@types+node@24.10.1__@swc+core@1.15.3_@swc+h_608bab04d60812eb190cd7b30c36eaf7/node_modules/tsup/assets/esm_shims.js
 import path from "path";
 import { fileURLToPath } from "url";
 var getFilename = () => fileURLToPath(import.meta.url);

package/dist/{chunk-ZSTF2AEN.js → chunk-3URI7W6X.js}

@@ -7,10 +7,20 @@ var _escape = require('@weapp-core/escape');
 var CSS_FILE_PATTERN = /.+\.(?:wx|ac|jx|tt|q|c|ty)ss$/;
 var HTML_FILE_PATTERN = /.+\.(?:(?:wx|ax|jx|ks|tt|q|ty|xhs)ml|swan)$/;
 var JS_FILE_PATTERN = /.+\.[cm]?js?$/;
+function normalizePath(p) {
+  return p.replace(/\\/g, "/");
+}
+var MPX_STYLES_DIR_PATTERN = /(?:^|\/)styles\/.*\.(?:wx|ac|jx|tt|q|c|ty)ss$/i;
 var MAIN_CSS_CHUNK_MATCHERS = {
   "uni-app": (file) => file.startsWith("common/main") || file.startsWith("app"),
   "uni-app-vite": (file) => file.startsWith("app") || file.startsWith("common/main"),
-  "mpx": (file) => file.startsWith("app"),
+  "mpx": (file) => {
+    const normalized = normalizePath(file);
+    if (normalized.startsWith("app")) {
+      return true;
+    }
+    return MPX_STYLES_DIR_PATTERN.test(normalized);
+  },
   "taro": (file) => file.startsWith("app"),
   "remax": (file) => file.startsWith("app"),
   "rax": (file) => file.startsWith("bundle"),

package/dist/chunk-4KBHUV2C.js

@@ -0,0 +1,136 @@
+"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 _chunkJ25ZFRYMjs = require('./chunk-J25ZFRYM.js');
+
+
+var _chunkZTGB2D5Wjs = require('./chunk-ZTGB2D5W.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, appType) {
+  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 = _chunkJ25ZFRYMjs.resolveTailwindcssImport.call(void 0, request, pkgDir, { appType });
+  if (!resolved) {
+    return;
+  }
+  data.request = resolved;
+}
+function applyTailwindcssCssImportRewrite(compiler, options) {
+  if (!options.enabled) {
+    return;
+  }
+  compiler.hooks.normalModuleFactory.tap(_chunkZTGB2D5Wjs.pluginName, (factory) => {
+    factory.hooks.beforeResolve.tap(_chunkZTGB2D5Wjs.pluginName, (data) => {
+      rewriteTailwindcssRequestForCss(data, options.pkgDir, options.appType);
+    });
+  });
+}
+
+// src/bundlers/webpack/shared/loader-anchors.ts
+var MPX_STRIP_CONDITIONAL_LOADER = "@mpxjs/webpack-plugin/lib/style-compiler/strip-conditional-loader";
+var MPX_STYLE_COMPILER_LOADER = "@mpxjs/webpack-plugin/lib/style-compiler/index";
+var MPX_REWRITE_PRECEDENCE_LOADERS = [
+  MPX_STYLE_COMPILER_LOADER,
+  MPX_STRIP_CONDITIONAL_LOADER
+];
+function createFinder(targets) {
+  return (entries) => entries.findIndex(
+    (entry) => targets.some((target) => _optionalChain([entry, 'optionalAccess', _3 => _3.loader, 'optionalAccess', _4 => _4.includes, 'optionalCall', _5 => _5(target)]))
+  );
+}
+function createPrioritizedFinder(targets) {
+  return (entries) => {
+    for (const target of targets) {
+      const idx = entries.findIndex((entry) => _optionalChain([entry, 'optionalAccess', _6 => _6.loader, 'optionalAccess', _7 => _7.includes, 'optionalCall', _8 => _8(target)]));
+      if (idx !== -1) {
+        return idx;
+      }
+    }
+    return -1;
+  };
+}
+function createLoaderAnchorFinders(appType) {
+  if (_chunkJ25ZFRYMjs.isMpx.call(void 0, appType)) {
+    return {
+      findRewriteAnchor: createPrioritizedFinder(MPX_REWRITE_PRECEDENCE_LOADERS),
+      findClassSetAnchor: createFinder([MPX_STYLE_COMPILER_LOADER])
+    };
+  }
+  const fallbackFinder = createFinder(["postcss-loader"]);
+  return {
+    findRewriteAnchor: fallbackFinder,
+    findClassSetAnchor: fallbackFinder
+  };
+}
+
+// src/bundlers/webpack/BaseUnifiedPlugin/shared.ts
+var MPX_STYLE_RESOURCE_QUERY_RE = /(?:\?|&)type=styles\b/;
+function getCacheKey(filename) {
+  return filename;
+}
+function stripResourceQuery2(resource) {
+  if (typeof resource !== "string") {
+    return resource;
+  }
+  const queryIndex = resource.indexOf("?");
+  if (queryIndex !== -1) {
+    return resource.slice(0, queryIndex);
+  }
+  const hashIndex = resource.indexOf("#");
+  if (hashIndex !== -1) {
+    return resource.slice(0, hashIndex);
+  }
+  return resource;
+}
+function isCssLikeModuleResource(resource, cssMatcher, appType) {
+  if (typeof resource !== "string") {
+    return false;
+  }
+  const normalizedResource = stripResourceQuery2(resource);
+  if (normalizedResource && cssMatcher(normalizedResource)) {
+    return true;
+  }
+  if (appType === "mpx") {
+    return MPX_STYLE_RESOURCE_QUERY_RE.test(resource);
+  }
+  return false;
+}
+function hasLoaderEntry(entries, target) {
+  if (!target) {
+    return false;
+  }
+  return entries.some((entry) => _optionalChain([entry, 'access', _9 => _9.loader, 'optionalAccess', _10 => _10.includes, 'optionalCall', _11 => _11(target)]));
+}
+
+
+
+
+
+
+
+exports.applyTailwindcssCssImportRewrite = applyTailwindcssCssImportRewrite; exports.createLoaderAnchorFinders = createLoaderAnchorFinders; exports.getCacheKey = getCacheKey; exports.isCssLikeModuleResource = isCssLikeModuleResource; exports.hasLoaderEntry = hasLoaderEntry;

package/dist/{chunk-KRRIFURM.mjs → chunk-5ROWVF7O.mjs}

@@ -5,13 +5,13 @@ import {
   resolveTailwindcssImport,
   rewriteTailwindcssImportsInCode,
   toAbsoluteOutputPath
-} from "./chunk-JW7P34IH.mjs";
+} from "./chunk-HXYNNE6Q.mjs";
 import {
   processCachedTask
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-JYHBNTYH.mjs";
+} from "./chunk-3BMQ6ZWL.mjs";
 import {
   collectRuntimeClassSet,
   createAttributeMatcher,
@@ -22,7 +22,7 @@ import {
   replaceWxml,
   toCustomAttributesEntities,
   vitePluginName
-} from "./chunk-BMUQ4OAB.mjs";
+} from "./chunk-FYYIFZ36.mjs";
 import {
   getGroupedEntries
 } from "./chunk-ZNKIYZRQ.mjs";
@@ -33,7 +33,7 @@ import path2 from "path";
 import process2 from "process";
 import postcssHtmlTransform from "@weapp-tailwindcss/postcss/html-transform";
 
-// src/uni-app-x/index.ts
+// src/uni-app-x/transform.ts
 import { NodeTypes } from "@vue/compiler-dom";
 import { parse } from "@vue/compiler-sfc";
 import MagicString from "magic-string";
@@ -217,6 +217,149 @@ async function formatPostcssSourceMap(rawMap, file) {
   };
 }
 
+// src/uni-app-x/vite.ts
+function createUniAppXPlugins(options) {
+  const {
+    appType,
+    customAttributesEntities,
+    disabledDefaultTemplateHandler,
+    mainCssChunkMatcher,
+    runtimeState,
+    styleHandler,
+    jsHandler,
+    ensureRuntimeClassSet,
+    getResolvedConfig
+  } = options;
+  const cssPlugins = [void 0, "pre"].map((enforce) => ({
+    name: `weapp-tailwindcss:uni-app-x:css${enforce ? `:${enforce}` : ""}`,
+    enforce,
+    async transform(code, id) {
+      await runtimeState.patchPromise;
+      const { query } = parseVueRequest(id);
+      if (isCSSRequest(id) || query.vue && query.type === "style") {
+        const postcssResult = await styleHandler(code, {
+          isMainChunk: mainCssChunkMatcher(id, appType),
+          postcssOptions: {
+            options: {
+              from: id,
+              map: {
+                inline: false,
+                annotation: false,
+                // PostCSS 可能返回虚拟文件，因此需要启用这一项以获取源内容
+                sourcesContent: true
+                // 若上游预处理器已经生成 source map，sources 中可能出现重复条目
+              }
+            }
+          }
+        });
+        const rawPostcssMap = postcssResult.map.toJSON();
+        const postcssMap = await formatPostcssSourceMap(
+          rawPostcssMap,
+          cleanUrl(id)
+        );
+        return {
+          code: postcssResult.css,
+          map: postcssMap
+        };
+      }
+    }
+  }));
+  const nvuePlugin = {
+    name: "weapp-tailwindcss:uni-app-x:nvue",
+    enforce: "pre",
+    async buildStart() {
+      await ensureRuntimeClassSet(true);
+    },
+    async transform(code, id) {
+      if (!/\.(?:uvue|nvue)(?:\?.*)?$/.test(id)) {
+        return;
+      }
+      const resolvedConfig = getResolvedConfig();
+      const isServeCommand = resolvedConfig?.command === "serve";
+      const isWatchBuild = resolvedConfig?.command === "build" && !!resolvedConfig.build?.watch;
+      const isNonWatchBuild = resolvedConfig?.command === "build" && !resolvedConfig.build?.watch;
+      const shouldForceRefresh = isServeCommand || isWatchBuild || isNonWatchBuild;
+      const currentRuntimeSet = shouldForceRefresh ? await ensureRuntimeClassSet(true) : await ensureRuntimeClassSet();
+      const extraOptions = customAttributesEntities.length > 0 || disabledDefaultTemplateHandler ? {
+        customAttributesEntities,
+        disabledDefaultTemplateHandler
+      } : void 0;
+      if (extraOptions) {
+        return transformUVue(code, id, jsHandler, currentRuntimeSet, extraOptions);
+      }
+      return transformUVue(code, id, jsHandler, currentRuntimeSet);
+    },
+    async handleHotUpdate(ctx) {
+      const resolvedConfig = getResolvedConfig();
+      if (resolvedConfig?.command !== "serve") {
+        return;
+      }
+      if (!/\.(?:uvue|nvue)$/.test(ctx.file)) {
+        return;
+      }
+      await ensureRuntimeClassSet(true);
+    },
+    async watchChange(id) {
+      const resolvedConfig = getResolvedConfig();
+      if (resolvedConfig?.command !== "build" || !resolvedConfig.build?.watch) {
+        return;
+      }
+      if (!/\.(?:uvue|nvue)(?:\?.*)?$/.test(id)) {
+        return;
+      }
+      await ensureRuntimeClassSet(true);
+    }
+  };
+  return [
+    ...cssPlugins,
+    nvuePlugin
+  ];
+}
+function createUniAppXAssetTask(file, originalSource, outDir, options) {
+  return async () => {
+    const {
+      cache,
+      createHandlerOptions,
+      debug: debug2,
+      jsHandler,
+      onUpdate,
+      runtimeSet,
+      applyLinkedResults: applyLinkedResults2
+    } = options;
+    const absoluteFile = toAbsoluteOutputPath(file, outDir);
+    const rawSource = originalSource.source.toString();
+    await processCachedTask({
+      cache,
+      cacheKey: file,
+      rawSource,
+      applyResult(source) {
+        originalSource.source = source;
+      },
+      onCacheHit() {
+        debug2("js cache hit: %s", file);
+      },
+      async transform() {
+        const currentSource = originalSource.source.toString();
+        const { code, linked } = await jsHandler(currentSource, runtimeSet, createHandlerOptions(absoluteFile, {
+          uniAppX: options.uniAppX ?? true,
+          babelParserOptions: {
+            plugins: [
+              "typescript"
+            ],
+            sourceType: "unambiguous"
+          }
+        }));
+        onUpdate(file, currentSource, code);
+        debug2("js handle: %s", file);
+        applyLinkedResults2(linked);
+        return {
+          result: code
+        };
+      }
+    });
+  };
+}
+
 // src/bundlers/vite/index.ts
 var debug = createDebug();
 var weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
@@ -376,7 +519,10 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
       resolveId: {
         order: "pre",
         handler(id, importer) {
-          const replacement = resolveTailwindcssImport(id, weappTailwindcssDirPosix, { join: joinPosixPath });
+          const replacement = resolveTailwindcssImport(id, weappTailwindcssDirPosix, {
+            join: joinPosixPath,
+            appType
+          });
           if (!replacement) {
             return null;
           }
@@ -392,7 +538,10 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
           if (!isCSSRequest(id)) {
             return null;
           }
-          const rewritten = rewriteTailwindcssImportsInCode(code, weappTailwindcssDirPosix, { join: joinPosixPath });
+          const rewritten = rewriteTailwindcssImportsInCode(code, weappTailwindcssDirPosix, {
+            join: joinPosixPath,
+            appType
+          });
           if (!rewritten) {
             return null;
           }
@@ -404,6 +553,18 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
       }
     }
   ];
+  const getResolvedConfig = () => resolvedConfig;
+  const uniAppXPlugins = uniAppX ? createUniAppXPlugins({
+    appType,
+    customAttributesEntities,
+    disabledDefaultTemplateHandler,
+    mainCssChunkMatcher,
+    runtimeState,
+    styleHandler,
+    jsHandler,
+    ensureRuntimeClassSet,
+    getResolvedConfig
+  }) : void 0;
   const plugins = [
     ...rewritePlugins,
     {
@@ -455,6 +616,9 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
             }
           });
         };
+        const applyLinkedUpdates = (linked) => {
+          applyLinkedResults(linked, jsEntries, handleLinkedUpdate, scheduleLinkedApply);
+        };
         const createHandlerOptions = (absoluteFilename, extra) => ({
           ...extra,
           filename: absoluteFilename,
@@ -481,7 +645,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                 },
                 async transform() {
                   const transformed = await templateHandler(rawSource, {
-                    runtimeSet
+                    runtimeSet: runtime
                   });
                   onUpdate(file, rawSource, transformed);
                   debug("html handle: %s", file);
@@ -512,10 +676,10 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                   },
                   async transform() {
                     const rawSource = originalSource.code;
-                    const { code, linked } = await jsHandler(rawSource, runtimeSet, createHandlerOptions(absoluteFile));
+                    const { code, linked } = await jsHandler(rawSource, runtime, createHandlerOptions(absoluteFile));
                     onUpdate(file, rawSource, code);
                     debug("js handle: %s", file);
-                    applyLinkedResults(linked, jsEntries, handleLinkedUpdate, scheduleLinkedApply);
+                    applyLinkedUpdates(linked);
                     return {
                       result: code
                     };
@@ -523,39 +687,23 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                 });
               });
             } else if (uniAppX && originalSource.type === "asset") {
-              const absoluteFile = toAbsoluteOutputPath(file, outDir);
-              const rawSource = originalSource.source.toString();
-              jsTaskFactories.push(async () => {
-                await processCachedTask({
-                  cache,
-                  cacheKey: file,
-                  rawSource,
-                  applyResult(source) {
-                    originalSource.source = source;
-                  },
-                  onCacheHit() {
-                    debug("js cache hit: %s", file);
-                  },
-                  async transform() {
-                    const currentSource = originalSource.source.toString();
-                    const { code, linked } = await jsHandler(currentSource, runtimeSet, createHandlerOptions(absoluteFile, {
-                      uniAppX,
-                      babelParserOptions: {
-                        plugins: [
-                          "typescript"
-                        ],
-                        sourceType: "unambiguous"
-                      }
-                    }));
-                    onUpdate(file, currentSource, code);
-                    debug("js handle: %s", file);
-                    applyLinkedResults(linked, jsEntries, handleLinkedUpdate, scheduleLinkedApply);
-                    return {
-                      result: code
-                    };
+              jsTaskFactories.push(
+                createUniAppXAssetTask(
+                  file,
+                  originalSource,
+                  outDir,
+                  {
+                    cache,
+                    createHandlerOptions,
+                    debug,
+                    jsHandler,
+                    onUpdate,
+                    runtimeSet: runtime,
+                    applyLinkedResults: applyLinkedUpdates,
+                    uniAppX
                   }
-                });
-              });
+                )
+              );
             }
           }
         }
@@ -604,92 +752,8 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
       }
     }
   ];
-  if (uniAppX) {
-    ;
-    [void 0, "pre"].forEach((enforce) => {
-      plugins.push(
-        {
-          name: `weapp-tailwindcss:uni-app-x:css${enforce ? `:${enforce}` : ""}`,
-          enforce,
-          async transform(code, id) {
-            await runtimeState.patchPromise;
-            const { query } = parseVueRequest(id);
-            if (isCSSRequest(id) || query.vue && query.type === "style") {
-              const postcssResult = await styleHandler(code, {
-                isMainChunk: mainCssChunkMatcher(id, appType),
-                postcssOptions: {
-                  options: {
-                    from: id,
-                    map: {
-                      inline: false,
-                      annotation: false,
-                      // PostCSS 可能返回虚拟文件，因此需要启用这一项以获取源内容
-                      sourcesContent: true
-                      // 若上游预处理器已经生成 source map，sources 中可能出现重复条目
-                    }
-                  }
-                }
-              });
-              const rawPostcssMap = postcssResult.map.toJSON();
-              const postcssMap = await formatPostcssSourceMap(
-                // rawPostcssMap.version 类型声明为字符串，实际需要数值
-                rawPostcssMap,
-                cleanUrl(id)
-              );
-              return {
-                code: postcssResult.css,
-                map: postcssMap
-              };
-            }
-          }
-        }
-      );
-    });
-    plugins.push(
-      {
-        name: "weapp-tailwindcss:uni-app-x:nvue",
-        enforce: "pre",
-        async buildStart() {
-          await ensureRuntimeClassSet(true);
-        },
-        async transform(code, id) {
-          if (!/\.(?:uvue|nvue)(?:\?.*)?$/.test(id)) {
-            return;
-          }
-          const isServeCommand = resolvedConfig?.command === "serve";
-          const isWatchBuild = resolvedConfig?.command === "build" && !!resolvedConfig.build?.watch;
-          const isNonWatchBuild = resolvedConfig?.command === "build" && !resolvedConfig.build?.watch;
-          const shouldForceRefresh = isServeCommand || isWatchBuild || isNonWatchBuild;
-          const currentRuntimeSet = shouldForceRefresh ? await ensureRuntimeClassSet(true) : await ensureRuntimeClassSet();
-          const extraOptions = customAttributesEntities.length > 0 || disabledDefaultTemplateHandler ? {
-            customAttributesEntities,
-            disabledDefaultTemplateHandler
-          } : void 0;
-          if (extraOptions) {
-            return transformUVue(code, id, jsHandler, currentRuntimeSet, extraOptions);
-          }
-          return transformUVue(code, id, jsHandler, currentRuntimeSet);
-        },
-        async handleHotUpdate(ctx) {
-          if (resolvedConfig?.command !== "serve") {
-            return;
-          }
-          if (!/\.(?:uvue|nvue)$/.test(ctx.file)) {
-            return;
-          }
-          await ensureRuntimeClassSet(true);
-        },
-        async watchChange(id) {
-          if (resolvedConfig?.command !== "build" || !resolvedConfig.build?.watch) {
-            return;
-          }
-          if (!/\.(?:uvue|nvue)(?:\?.*)?$/.test(id)) {
-            return;
-          }
-          await ensureRuntimeClassSet(true);
-        }
-      }
-    );
+  if (uniAppXPlugins) {
+    plugins.push(...uniAppXPlugins);
   }
   return plugins;
 }