weapp-tailwindcss 4.6.1 → 4.6.3

package/dist/{chunk-KHILYAA4.mjs → chunk-4EUTRMUC.mjs}

@@ -1,4 +1,4 @@
-// ../../node_modules/.pnpm/tsup@8.5.0_@microsoft+api-extractor@7.53.1_@types+node@24.9.1__@swc+core@1.13.5_@swc+he_98381cc53e0855b33bb51e41d0f2099f/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.0_@microsoft+api-extractor@7.53.1_@types+node@24.9.2__@swc+core@1.13.5_@swc+he_60071210c2c46d45864288786f4ed86d/node_modules/tsup/assets/esm_shims.js
 import path from "path";
 import { fileURLToPath } from "url";
 var getFilename = () => fileURLToPath(import.meta.url);

package/dist/{chunk-7CGHD2TI.js → chunk-4HDADZ7K.js}

@@ -14,10 +14,8 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 var _chunkFB5P4TRHjs = require('./chunk-FB5P4TRH.js');
 
 
-var _chunkOGROHM4Ljs = require('./chunk-OGROHM4L.js');
 
-
-var _chunkOVDIACVKjs = require('./chunk-OVDIACVK.js');
+var _chunkVATV3GLUjs = require('./chunk-VATV3GLU.js');
 
 
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
@@ -29,7 +27,7 @@ var _process = require('process'); var _process2 = _interopRequireDefault(_proce
 var debug = _chunkFB5P4TRHjs.createDebug.call(void 0, );
 var UnifiedWebpackPluginV5 = class {
   constructor(options = {}) {
-    this.options = _chunkOVDIACVKjs.getCompilerContext.call(void 0, options);
+    this.options = _chunkVATV3GLUjs.getCompilerContext.call(void 0, options);
     this.appType = this.options.appType;
   }
   apply(compiler) {
@@ -68,8 +66,8 @@ var UnifiedWebpackPluginV5 = class {
       ident: null,
       type: null
     };
-    compiler.hooks.compilation.tap(_chunkOGROHM4Ljs.pluginName, (compilation) => {
-      NormalModule.getCompilationHooks(compilation).loader.tap(_chunkOGROHM4Ljs.pluginName, (_loaderContext, module) => {
+    compiler.hooks.compilation.tap(_chunkVATV3GLUjs.pluginName, (compilation) => {
+      NormalModule.getCompilationHooks(compilation).loader.tap(_chunkVATV3GLUjs.pluginName, (_loaderContext, module) => {
         if (isExisted) {
           const idx = module.loaders.findIndex((x) => x.loader.includes("postcss-loader"));
           if (idx > -1) {
@@ -79,7 +77,7 @@ var UnifiedWebpackPluginV5 = class {
       });
       compilation.hooks.processAssets.tapPromise(
         {
-          name: _chunkOGROHM4Ljs.pluginName,
+          name: _chunkVATV3GLUjs.pluginName,
           stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
         },
         async (assets) => {

package/dist/{chunk-FVA7Y2YU.js → chunk-5BTN3KIR.js}

@@ -11,11 +11,9 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 var _chunkFB5P4TRHjs = require('./chunk-FB5P4TRH.js');
 
 
-var _chunkOGROHM4Ljs = require('./chunk-OGROHM4L.js');
 
 
-
-var _chunkOVDIACVKjs = require('./chunk-OVDIACVK.js');
+var _chunkVATV3GLUjs = require('./chunk-VATV3GLU.js');
 
 
 var _chunkDWAEHRHNjs = require('./chunk-DWAEHRHN.js');
@@ -31,8 +29,8 @@ var _htmltransform = require('@weapp-tailwindcss/postcss/html-transform'); var _
 
 // src/uni-app-x/index.ts
 var _compilerdom = require('@vue/compiler-dom');
+var _compilersfc = require('@vue/compiler-sfc');
 var _magicstring = require('magic-string'); var _magicstring2 = _interopRequireDefault(_magicstring);
-var _compilersfc = require('vue/compiler-sfc');
 function traverse(node, visitor) {
   visitor(node);
   if (Array.isArray(node.children)) {
@@ -53,7 +51,7 @@ function createClassAttributeUpdater(ms) {
 function createClassDirectiveUpdater(ms, jsHandler, runtimeSet) {
   return (prop) => {
     if (_optionalChain([prop, 'access', _ => _.arg, 'optionalAccess', _2 => _2.type]) === _compilerdom.NodeTypes.SIMPLE_EXPRESSION && prop.arg.content === "class" && _optionalChain([prop, 'access', _3 => _3.exp, 'optionalAccess', _4 => _4.type]) === _compilerdom.NodeTypes.SIMPLE_EXPRESSION) {
-      const generated = _chunkOVDIACVKjs.generateCode.call(void 0, prop.exp.content, {
+      const generated = _chunkVATV3GLUjs.generateCode.call(void 0, prop.exp.content, {
         jsHandler,
         runtimeSet
       });
@@ -239,7 +237,7 @@ function applyLinkedResults(linked, entries, onLinkedUpdate) {
   }
 }
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
-  const opts = _chunkOVDIACVKjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkVATV3GLUjs.getCompilerContext.call(void 0, options);
   const {
     disabled,
     onEnd,
@@ -264,7 +262,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   onLoad();
   const plugins = [
     {
-      name: `${_chunkOGROHM4Ljs.vitePluginName}:post`,
+      name: `${_chunkVATV3GLUjs.vitePluginName}:post`,
       enforce: "post",
       configResolved(config) {
         resolvedConfig = config;

package/dist/{chunk-AXLRUW5H.js → chunk-C3CG4UUY.js}

@@ -3,7 +3,7 @@
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
 
 
-var _chunkE5PXIHDNjs = require('./chunk-E5PXIHDN.js');
+var _chunkQXSBMK2Wjs = require('./chunk-QXSBMK2W.js');
 
 // src/context/tailwindcss.ts
 var _module = require('module');
@@ -46,7 +46,7 @@ function resolveModuleFromPaths(specifier, paths) {
     return void 0;
   }
   try {
-    const req = _module.createRequire.call(void 0, _chunkE5PXIHDNjs.importMetaUrl);
+    const req = _module.createRequire.call(void 0, _chunkQXSBMK2Wjs.importMetaUrl);
     return req.resolve(specifier, { paths });
   } catch (e) {
     return void 0;
@@ -155,11 +155,11 @@ function createDefaultResolvePaths(basedir) {
   const cwd = _process2.default.cwd();
   appendNodeModules(paths, cwd);
   try {
-    const modulePath = _url.fileURLToPath.call(void 0, _chunkE5PXIHDNjs.importMetaUrl);
+    const modulePath = _url.fileURLToPath.call(void 0, _chunkQXSBMK2Wjs.importMetaUrl);
     const candidate = _fs.existsSync.call(void 0, modulePath) && !_path2.default.extname(modulePath) ? modulePath : _path2.default.dirname(modulePath);
     paths.add(candidate);
   } catch (e2) {
-    paths.add(_chunkE5PXIHDNjs.importMetaUrl);
+    paths.add(_chunkQXSBMK2Wjs.importMetaUrl);
   }
   if (paths.size === 0) {
     fallbackCandidates = fallbackCandidates.filter(Boolean);

package/dist/{chunk-M6DWZX4H.js → chunk-CONFDZCT.js}

@@ -7,7 +7,7 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 var _chunkFB5P4TRHjs = require('./chunk-FB5P4TRH.js');
 
 
-var _chunkOVDIACVKjs = require('./chunk-OVDIACVK.js');
+var _chunkVATV3GLUjs = require('./chunk-VATV3GLU.js');
 
 // src/bundlers/gulp/index.ts
 var _buffer = require('buffer');
@@ -18,7 +18,7 @@ var _stream = require('stream'); var _stream2 = _interopRequireDefault(_stream);
 var debug = _chunkFB5P4TRHjs.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunkOVDIACVKjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkVATV3GLUjs.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher } = opts;
   let runtimeSet = /* @__PURE__ */ new Set();
   const patchPromise = Promise.resolve(twPatcher.patch());

package/dist/{chunk-JG5LBGLH.mjs → chunk-HHTWS62A.mjs}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-YPBRGP6K.mjs";
 import {
   getCompilerContext
-} from "./chunk-7PGHZOTU.mjs";
+} from "./chunk-MVB2TWHD.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";

package/dist/{chunk-TTDQ4TK2.mjs → chunk-M2DOZWMJ.mjs}

@@ -9,13 +9,11 @@ import {
   collectRuntimeClassSet,
   createDebug
 } from "./chunk-YPBRGP6K.mjs";
-import {
-  vitePluginName
-} from "./chunk-CMUA5KCO.mjs";
 import {
   generateCode,
-  getCompilerContext
-} from "./chunk-7PGHZOTU.mjs";
+  getCompilerContext,
+  vitePluginName
+} from "./chunk-MVB2TWHD.mjs";
 import {
   replaceWxml
 } from "./chunk-VSRDBMDB.mjs";
@@ -31,8 +29,8 @@ import postcssHtmlTransform from "@weapp-tailwindcss/postcss/html-transform";
 
 // src/uni-app-x/index.ts
 import { NodeTypes } from "@vue/compiler-dom";
+import { parse } from "@vue/compiler-sfc";
 import MagicString from "magic-string";
-import { parse } from "vue/compiler-sfc";
 function traverse(node, visitor) {
   visitor(node);
   if (Array.isArray(node.children)) {

package/dist/{chunk-7PGHZOTU.mjs → chunk-MVB2TWHD.mjs}

@@ -6,12 +6,22 @@ import {
 } from "./chunk-IY2OKZE6.mjs";
 import {
   getDefaultOptions
-} from "./chunk-YLNOOPZL.mjs";
+} from "./chunk-X4NG76HE.mjs";
 import {
   defuOverrideArray,
   isMap
 } from "./chunk-ZNKIYZRQ.mjs";
 
+// src/constants.ts
+var pluginName = "weapp-tailwindcss-webpack-plugin";
+var vitePluginName = "weapp-tailwindcss:adaptor";
+var WEAPP_TW_REQUIRED_NODE_VERSION = "18.17.0";
+var DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS = {
+  "tailwind-merge": "@weapp-tailwindcss/merge",
+  "class-variance-authority": "@weapp-tailwindcss/merge/cva",
+  "tailwind-variants": "@weapp-tailwindcss/merge/variants"
+};
+
 // src/context/index.ts
 import { logger as logger2, pc } from "@weapp-tailwindcss/logger";
 
@@ -897,8 +907,65 @@ function createEvalReplacementToken(path, updated) {
     path
   };
 }
-function handleEvalStringLiteral(path, options, updater) {
-  const { code } = jsHandler(path.node.value, {
+function createModuleSpecifierReplacementToken(path, replacement) {
+  const node = path.node;
+  if (node.value === replacement) {
+    return void 0;
+  }
+  if (typeof node.start !== "number" || typeof node.end !== "number") {
+    return void 0;
+  }
+  const start = node.start + 1;
+  const end = node.end - 1;
+  if (start >= end) {
+    return void 0;
+  }
+  return {
+    start,
+    end,
+    value: replacement,
+    path
+  };
+}
+function collectModuleSpecifierReplacementTokens(analysis, replacements) {
+  const tokens = [];
+  const applyReplacement = (path) => {
+    const replacement = replacements[path.node.value];
+    if (!replacement) {
+      return;
+    }
+    const token = createModuleSpecifierReplacementToken(path, replacement);
+    if (token) {
+      tokens.push(token);
+    }
+  };
+  for (const importPath of analysis.importDeclarations) {
+    const source = importPath.get("source");
+    if (source.isStringLiteral()) {
+      applyReplacement(source);
+    }
+  }
+  for (const exportPath of analysis.exportDeclarations) {
+    if (exportPath.isExportNamedDeclaration() || exportPath.isExportAllDeclaration()) {
+      const source = exportPath.get("source");
+      if (source && !Array.isArray(source) && source.isStringLiteral()) {
+        applyReplacement(source);
+      }
+    }
+  }
+  for (const literalPath of analysis.requireCallPaths) {
+    applyReplacement(literalPath);
+  }
+  for (const token of analysis.walker.imports) {
+    const replacement = replacements[token.source];
+    if (replacement) {
+      token.source = replacement;
+    }
+  }
+  return tokens;
+}
+function handleEvalStringLiteral(path, options, updater, handler) {
+  const { code } = handler(path.node.value, {
     ...options,
     needEscaped: false,
     generateMap: false
@@ -911,8 +978,8 @@ function handleEvalStringLiteral(path, options, updater) {
     updater.addToken(token);
   }
 }
-function handleEvalTemplateElement(path, options, updater) {
-  const { code } = jsHandler(path.node.value.raw, {
+function handleEvalTemplateElement(path, options, updater, handler) {
+  const { code } = handler(path.node.value.raw, {
     ...options,
     generateMap: false
   });
@@ -924,17 +991,17 @@ function handleEvalTemplateElement(path, options, updater) {
     updater.addToken(token);
   }
 }
-function walkEvalExpression(path, options, updater) {
+function walkEvalExpression(path, options, updater, handler) {
   path.traverse({
     StringLiteral(innerPath) {
-      handleEvalStringLiteral(innerPath, options, updater);
+      handleEvalStringLiteral(innerPath, options, updater, handler);
     },
     TemplateElement(innerPath) {
-      handleEvalTemplateElement(innerPath, options, updater);
+      handleEvalTemplateElement(innerPath, options, updater, handler);
     }
   });
 }
-function analyzeSource(ast, options) {
+function analyzeSource(ast, options, handler) {
   const jsTokenUpdater = new JsTokenUpdater();
   const ignoredPaths = /* @__PURE__ */ new WeakSet();
   const walker = new NodePathWalker(
@@ -951,6 +1018,8 @@ function analyzeSource(ast, options) {
   const targetPaths = [];
   const importDeclarations = /* @__PURE__ */ new Set();
   const exportDeclarations = /* @__PURE__ */ new Set();
+  const requireCallPaths = [];
+  const evalHandler = handler ?? jsHandler;
   const traverseOptions = {
     StringLiteral: {
       enter(p) {
@@ -981,9 +1050,19 @@ function analyzeSource(ast, options) {
     CallExpression: {
       enter(p) {
         if (isEvalPath(p)) {
-          walkEvalExpression(p, options, jsTokenUpdater);
+          walkEvalExpression(p, options, jsTokenUpdater, evalHandler);
           return;
         }
+        const calleePath = p.get("callee");
+        if (calleePath.isIdentifier({ name: "require" }) && !p.scope.hasBinding("require")) {
+          const args = p.get("arguments");
+          if (Array.isArray(args) && args.length > 0) {
+            const first = args[0];
+            if (first?.isStringLiteral()) {
+              requireCallPaths.push(first);
+            }
+          }
+        }
         walker.walkCallExpression(p);
       }
     },
@@ -1006,6 +1085,7 @@ function analyzeSource(ast, options) {
     targetPaths,
     importDeclarations,
     exportDeclarations,
+    requireCallPaths,
     ignoredPaths
   };
 }
@@ -1028,6 +1108,11 @@ function processUpdatedSource(rawSource, options, analysis) {
       replacementTokens.push(token);
     }
   }
+  if (options.moduleSpecifierReplacements) {
+    replacementTokens.push(
+      ...collectModuleSpecifierReplacementTokens(analysis, options.moduleSpecifierReplacements)
+    );
+  }
   jsTokenUpdater.push(...replacementTokens).filter((token) => !ignoredPaths.has(token.path)).updateMagicString(ms);
   return ms;
 }
@@ -1041,7 +1126,7 @@ function jsHandler(rawSource, options) {
       error
     };
   }
-  const analysis = analyzeSource(ast, options);
+  const analysis = analyzeSource(ast, options, jsHandler);
   const ms = processUpdatedSource(rawSource, options, analysis);
   const result = {
     code: ms.toString(),
@@ -1080,7 +1165,8 @@ function createJsHandler(options) {
     babelParserOptions,
     ignoreCallExpressionIdentifiers,
     ignoreTaggedTemplateExpressionIdentifiers,
-    uniAppX
+    uniAppX,
+    moduleSpecifierReplacements
   } = options;
   function handler(rawSource, classNameSet, options2) {
     const overrideOptions = options2 ?? {};
@@ -1101,7 +1187,8 @@ function createJsHandler(options) {
         babelParserOptions,
         ignoreCallExpressionIdentifiers,
         ignoreTaggedTemplateExpressionIdentifiers,
-        uniAppX
+        uniAppX,
+        moduleSpecifierReplacements
       }
     );
     return jsHandler(rawSource, resolvedOptions);
@@ -1514,6 +1601,20 @@ function createTemplateHandler(options = {}) {
 }
 
 // src/context/handlers.ts
+function resolveRuntimePackageReplacements(option) {
+  if (!option) {
+    return void 0;
+  }
+  const mapping = option === true ? DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS : option;
+  const normalized = {};
+  for (const [from, to] of Object.entries(mapping)) {
+    if (!from || typeof to !== "string" || to.length === 0) {
+      continue;
+    }
+    normalized[from] = to;
+  }
+  return Object.keys(normalized).length > 0 ? normalized : void 0;
+}
 function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions) {
   const {
     cssPreflight,
@@ -1536,8 +1637,10 @@ function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions
     ignoreCallExpressionIdentifiers,
     ignoreTaggedTemplateExpressionIdentifiers,
     inlineWxs,
-    disabledDefaultTemplateHandler
+    disabledDefaultTemplateHandler,
+    replaceRuntimePackages
   } = ctx;
+  const moduleSpecifierReplacements = resolveRuntimePackageReplacements(replaceRuntimePackages);
   const styleHandler = createStyleHandler({
     cssPreflight,
     customRuleCallback,
@@ -1563,7 +1666,8 @@ function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions
     babelParserOptions,
     ignoreCallExpressionIdentifiers,
     ignoreTaggedTemplateExpressionIdentifiers,
-    uniAppX
+    uniAppX,
+    moduleSpecifierReplacements
   });
   const templateHandler = createTemplateHandler({
     customAttributesEntities,
@@ -1592,38 +1696,52 @@ function applyLoggerLevel(logLevel) {
 }
 
 // src/context/index.ts
-var DEFAULT_SPACING_VARIABLE = "--spacing";
-function matchesSpacingToken(token) {
-  if (typeof token === "string") {
-    return token === DEFAULT_SPACING_VARIABLE;
-  }
-  token.lastIndex = 0;
-  return token.test(DEFAULT_SPACING_VARIABLE);
+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 ensureSpacingIncluded(value) {
+function ensureDefaultsIncluded(value) {
   if (value === true) {
     return {
-      includeCustomProperties: [DEFAULT_SPACING_VARIABLE]
+      includeCustomProperties: [...DEFAULT_CSS_CALC_CUSTOM_PROPERTIES]
     };
   }
   if (Array.isArray(value)) {
-    return value.some(matchesSpacingToken) ? value : [...value, DEFAULT_SPACING_VARIABLE];
+    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) || include.length === 0) {
+    if (!Array.isArray(include)) {
       return {
         ...value,
-        includeCustomProperties: [DEFAULT_SPACING_VARIABLE]
+        includeCustomProperties: [...DEFAULT_CSS_CALC_CUSTOM_PROPERTIES]
       };
     }
-    if (include.some(matchesSpacingToken)) {
+    if (!DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.length) {
       return value;
     }
-    return {
+    const missing = DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.filter((token) => !includesToken(include, token));
+    return missing.length > 0 ? {
       ...value,
-      includeCustomProperties: [...include, DEFAULT_SPACING_VARIABLE]
-    };
+      includeCustomProperties: [...include, ...missing]
+    } : value;
   }
   return value;
 }
@@ -1643,7 +1761,7 @@ function getCompilerContext(opts) {
   }
   let cssCalcOptions = ctx.cssCalc ?? twPatcher.majorVersion === 4;
   if (twPatcher.majorVersion === 4 && cssCalcOptions) {
-    cssCalcOptions = ensureSpacingIncluded(cssCalcOptions);
+    cssCalcOptions = ensureDefaultsIncluded(cssCalcOptions);
   }
   ctx.cssCalc = cssCalcOptions;
   const customAttributesEntities = toCustomAttributesEntities(ctx.customAttributes);
@@ -1661,6 +1779,9 @@ function getCompilerContext(opts) {
 }
 
 export {
+  pluginName,
+  vitePluginName,
+  WEAPP_TW_REQUIRED_NODE_VERSION,
   generateCode,
   getCompilerContext
 };

package/dist/{chunk-E5PXIHDN.js → chunk-QXSBMK2W.js}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});// ../../node_modules/.pnpm/tsup@8.5.0_@microsoft+api-extractor@7.53.1_@types+node@24.9.1__@swc+core@1.13.5_@swc+he_98381cc53e0855b33bb51e41d0f2099f/node_modules/tsup/assets/cjs_shims.js
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// ../../node_modules/.pnpm/tsup@8.5.0_@microsoft+api-extractor@7.53.1_@types+node@24.9.2__@swc+core@1.13.5_@swc+he_60071210c2c46d45864288786f4ed86d/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 

package/dist/{chunk-I7FYDXN6.js → chunk-SOBBYYQ5.js}

@@ -105,6 +105,7 @@ function getDefaultOptions() {
     cssRemoveHoverPseudoClass: true,
     ignoreCallExpressionIdentifiers: _localpkg.isPackageExists.call(void 0, "@weapp-tailwindcss/merge") ? ["twMerge", "twJoin", "cva", "tv"] : [],
     ignoreTaggedTemplateExpressionIdentifiers: ["weappTwIgnore"],
+    replaceRuntimePackages: false,
     tailwindcssPatcherOptions: {
       filter(className) {
         return !_escape.isAllowedClassName.call(void 0, className);