weapp-tailwindcss 4.10.1 → 4.10.2

package/dist/{chunk-RXM5ERRJ.mjs → chunk-MPVAZKRB.mjs}

@@ -16,10 +16,10 @@ import {
 import _createDebug from "debug";
 var _debug = _createDebug("weapp-tw");
 function createDebug(prefix) {
-  function debug2(formatter, ...args) {
+  function debug3(formatter, ...args) {
     return _debug((prefix ?? "") + formatter, ...args);
   }
-  return debug2;
+  return debug3;
 }
 
 // src/tailwindcss/runtime/cache.ts
@@ -285,7 +285,7 @@ async function collectRuntimeClassSet(twPatcher, options = {}) {
 // package.json
 var package_default = {
   name: "weapp-tailwindcss",
-  version: "4.10.1",
+  version: "4.10.2",
   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",
@@ -1189,22 +1189,80 @@ import { jsStringEscape } from "@ast-core/escape";
 import { escapeStringRegexp as escapeStringRegexp2 } from "@weapp-core/regex";
 import { splitCode } from "@weapp-tailwindcss/shared/extractors";
 
+// src/wxml/shared.ts
+import { escape, MappingChars2String } from "@weapp-core/escape";
+function replaceWxml(original, options = {
+  keepEOL: false,
+  escapeMap: MappingChars2String
+}) {
+  const { keepEOL, escapeMap, ignoreHead } = options;
+  let res = original;
+  if (!keepEOL) {
+    res = res.replaceAll(/[\n\r]+/g, "");
+  }
+  res = escape(res, {
+    map: escapeMap,
+    ignoreHead
+  });
+  return res;
+}
+
 // src/shared/classname-transform.ts
-function shouldTransformClassNameCandidate(candidate, {
+function isArbitraryValueCandidate(candidate) {
+  const normalized = candidate.trim();
+  if (!normalized.includes("[") || !normalized.includes("]")) {
+    return false;
+  }
+  if (/^(?:https?:)?\/\//.test(normalized)) {
+    return false;
+  }
+  return true;
+}
+function shouldEnableArbitraryValueFallback({
+  classNameSet,
+  jsArbitraryValueFallback,
+  tailwindcssMajorVersion
+}) {
+  if (jsArbitraryValueFallback === true) {
+    return true;
+  }
+  if (jsArbitraryValueFallback === false) {
+    return false;
+  }
+  return tailwindcssMajorVersion === 4 && (!classNameSet || classNameSet.size === 0);
+}
+function resolveClassNameTransformDecision(candidate, {
   alwaysEscape,
   classNameSet,
-  jsPreserveClass
+  escapeMap,
+  jsArbitraryValueFallback,
+  jsPreserveClass,
+  tailwindcssMajorVersion,
+  classContext
 }) {
   if (alwaysEscape) {
-    return true;
+    return "direct";
   }
   if (jsPreserveClass?.(candidate)) {
-    return false;
+    return "skip";
   }
-  if (!classNameSet || classNameSet.size === 0) {
-    return false;
+  if (classNameSet?.has(candidate)) {
+    return "direct";
+  }
+  if (classNameSet && classNameSet.size > 0) {
+    const escapedCandidate = replaceWxml(candidate, { escapeMap });
+    if (escapedCandidate !== candidate && classNameSet.has(escapedCandidate)) {
+      return "escaped";
+    }
+  }
+  if (classContext && isArbitraryValueCandidate(candidate) && shouldEnableArbitraryValueFallback({
+    classNameSet,
+    jsArbitraryValueFallback,
+    tailwindcssMajorVersion
+  })) {
+    return "fallback";
   }
-  return classNameSet.has(candidate);
+  return "skip";
 }
 
 // src/utils/decode.ts
@@ -1230,25 +1288,105 @@ function decodeUnicode2(input) {
   }
 }
 
-// src/wxml/shared.ts
-import { escape, MappingChars2String } from "@weapp-core/escape";
-function replaceWxml(original, options = {
-  keepEOL: false,
-  escapeMap: MappingChars2String
-}) {
-  const { keepEOL, escapeMap, ignoreHead } = options;
-  let res = original;
-  if (!keepEOL) {
-    res = res.replaceAll(/[\n\r]+/g, "");
+// src/js/class-context.ts
+var CLASS_LIKE_KEYWORDS = /* @__PURE__ */ new Set([
+  "class",
+  "classname",
+  "hoverclass",
+  "virtualhostclass",
+  "rootclass"
+]);
+var CLASS_HELPER_IDENTIFIERS = /* @__PURE__ */ new Set([
+  "cn",
+  "clsx",
+  "classnames",
+  "twmerge",
+  "cva",
+  "tv",
+  "cx",
+  "r"
+]);
+function normalizeKeyword(name) {
+  return name.replace(/[-_:]/g, "").toLowerCase();
+}
+function readObjectKeyName(path5) {
+  if (path5.isIdentifier()) {
+    return path5.node.name;
   }
-  res = escape(res, {
-    map: escapeMap,
-    ignoreHead
-  });
-  return res;
+  if (path5.isStringLiteral()) {
+    return path5.node.value;
+  }
+  if (path5.isTemplateLiteral() && path5.node.expressions.length === 0) {
+    return path5.node.quasis[0]?.value.cooked ?? path5.node.quasis[0]?.value.raw;
+  }
+  return void 0;
+}
+function isClassLikeObjectProperty(path5, valuePath) {
+  if (!path5.isObjectProperty()) {
+    return false;
+  }
+  if (path5.get("value") !== valuePath) {
+    return false;
+  }
+  const keyName = readObjectKeyName(path5.get("key"));
+  if (!keyName) {
+    return false;
+  }
+  return CLASS_LIKE_KEYWORDS.has(normalizeKeyword(keyName));
+}
+function isClassLikeJsxAttribute(path5) {
+  if (!path5.isJSXAttribute()) {
+    return false;
+  }
+  const namePath = path5.get("name");
+  if (!namePath.isJSXIdentifier()) {
+    return false;
+  }
+  return CLASS_LIKE_KEYWORDS.has(normalizeKeyword(namePath.node.name));
+}
+function isClassLikeCallExpression(path5, valuePath) {
+  if (!path5.isCallExpression()) {
+    return false;
+  }
+  const args = path5.get("arguments");
+  if (!args.includes(valuePath)) {
+    return false;
+  }
+  const calleePath = path5.get("callee");
+  if (calleePath.isIdentifier()) {
+    return CLASS_HELPER_IDENTIFIERS.has(normalizeKeyword(calleePath.node.name));
+  }
+  if (calleePath.isMemberExpression()) {
+    const propertyPath = calleePath.get("property");
+    if (propertyPath.isIdentifier()) {
+      return CLASS_HELPER_IDENTIFIERS.has(normalizeKeyword(propertyPath.node.name));
+    }
+    if (propertyPath.isStringLiteral()) {
+      return CLASS_HELPER_IDENTIFIERS.has(normalizeKeyword(propertyPath.node.value));
+    }
+  }
+  return false;
+}
+function isClassContextLiteralPath(path5) {
+  let current = path5;
+  while (current.parentPath) {
+    const parent = current.parentPath;
+    if (isClassLikeObjectProperty(parent, current)) {
+      return true;
+    }
+    if (isClassLikeJsxAttribute(parent)) {
+      return true;
+    }
+    if (isClassLikeCallExpression(parent, current)) {
+      return true;
+    }
+    current = parent;
+  }
+  return false;
 }
 
 // src/js/handlers.ts
+var debug2 = createDebug("[js:handlers] ");
 var patternCache = /* @__PURE__ */ new Map();
 var replacementCacheByEscapeMap = /* @__PURE__ */ new WeakMap();
 var defaultReplacementCache = /* @__PURE__ */ new Map();
@@ -1313,7 +1451,9 @@ function replaceHandleValue(path5, options) {
     needEscaped = false
   } = options;
   const { classNameSet, alwaysEscape } = options;
-  if (!alwaysEscape && (!classNameSet || classNameSet.size === 0)) {
+  const fallbackEnabled = shouldEnableArbitraryValueFallback(options);
+  const classContext = options.wrapExpression || isClassContextLiteralPath(path5);
+  if (!alwaysEscape && !fallbackEnabled && (!classNameSet || classNameSet.size === 0)) {
     return void 0;
   }
   const { literal, original, allowDoubleQuotes, offset } = extractLiteralValue(path5, options);
@@ -1326,10 +1466,24 @@ function replaceHandleValue(path5, options) {
   }
   let transformed = literal;
   let mutated = false;
+  let matchedCandidateCount = 0;
+  let escapedDecisionCount = 0;
+  let fallbackDecisionCount = 0;
   for (const candidate of candidates) {
-    if (!shouldTransformClassNameCandidate(candidate, options)) {
+    const decision = resolveClassNameTransformDecision(candidate, {
+      ...options,
+      classContext
+    });
+    if (decision === "skip") {
       continue;
     }
+    matchedCandidateCount += 1;
+    if (decision === "escaped") {
+      escapedDecisionCount += 1;
+    }
+    if (decision === "fallback") {
+      fallbackDecisionCount += 1;
+    }
     if (!transformed.includes(candidate)) {
       continue;
     }
@@ -1345,6 +1499,16 @@ function replaceHandleValue(path5, options) {
   if (!mutated || typeof node.start !== "number" || typeof node.end !== "number") {
     return void 0;
   }
+  if (debug2.enabled) {
+    debug2(
+      "runtimeSet size=%d fallbackTriggered=%s matchedCandidates=%d escapedHits=%d file=%s",
+      classNameSet?.size ?? 0,
+      fallbackDecisionCount > 0,
+      matchedCandidateCount,
+      escapedDecisionCount,
+      options.filename ?? "unknown"
+    );
+  }
   const start = node.start + offset;
   const end = node.end - offset;
   if (start >= end || transformed === original) {
@@ -2394,6 +2558,8 @@ function createJsHandler(options) {
     arbitraryValues,
     escapeMap,
     staleClassNameFallback,
+    jsArbitraryValueFallback,
+    tailwindcssMajorVersion,
     jsPreserveClass,
     generateMap,
     needEscaped,
@@ -2416,6 +2582,8 @@ function createJsHandler(options) {
         classNameSet,
         escapeMap,
         staleClassNameFallback,
+        jsArbitraryValueFallback,
+        tailwindcssMajorVersion,
         arbitraryValues,
         jsPreserveClass,
         generateMap,
@@ -2879,7 +3047,7 @@ function resolveRuntimePackageReplacements(option) {
   }
   return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
-function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions) {
+function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions, tailwindcssMajorVersion) {
   const {
     cssPreflight,
     cssPreflightRange,
@@ -2898,6 +3066,7 @@ function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions
     arbitraryValues,
     jsPreserveClass,
     staleClassNameFallback,
+    jsArbitraryValueFallback,
     babelParserOptions,
     ignoreCallExpressionIdentifiers,
     ignoreTaggedTemplateExpressionIdentifiers,
@@ -2928,6 +3097,8 @@ function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions
     arbitraryValues,
     jsPreserveClass,
     staleClassNameFallback,
+    jsArbitraryValueFallback: jsArbitraryValueFallback ?? "auto",
+    tailwindcssMajorVersion,
     generateMap: true,
     babelParserOptions,
     ignoreCallExpressionIdentifiers,
@@ -3029,7 +3200,8 @@ function createInternalCompilerContext(opts) {
   const { styleHandler, jsHandler: jsHandler2, templateHandler } = createHandlersFromContext(
     ctx,
     customAttributesEntities,
-    cssCalcOptions
+    cssCalcOptions,
+    twPatcher.majorVersion
   );
   ctx.styleHandler = styleHandler;
   ctx.jsHandler = jsHandler2;

package/dist/{chunk-7ZI6WVIU.mjs → chunk-N6JOG5K3.mjs}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-4QCL7FBX.mjs";
+} from "./chunk-BZCCVPSU.mjs";
 import {
   createDebug,
   ensureRuntimeClassSet,
   getCompilerContext,
   refreshTailwindRuntimeState
-} from "./chunk-RXM5ERRJ.mjs";
+} from "./chunk-MPVAZKRB.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";
@@ -164,6 +164,7 @@ function createPlugins(options = {}) {
       ...options2,
       filename,
       moduleGraph,
+      tailwindcssMajorVersion: runtimeState.twPatcher.majorVersion,
       babelParserOptions: {
         ...options2?.babelParserOptions ?? {},
         sourceFilename: filename

package/dist/{chunk-W3EZEDKD.js → chunk-NPZ5QQC7.js}

@@ -3,13 +3,13 @@
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
-var _chunkRB7YN5XZjs = require('./chunk-RB7YN5XZ.js');
+var _chunkM2ATX5ZSjs = require('./chunk-M2ATX5ZS.js');
 
 
 
 
 
-var _chunk7K3R5LV6js = require('./chunk-7K3R5LV6.js');
+var _chunkI35XJD75js = require('./chunk-I35XJD75.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 = _chunk7K3R5LV6js.createDebug.call(void 0, );
+var debug = _chunkI35XJD75js.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunk7K3R5LV6js.getCompilerContext.call(void 0, options);
+  const opts = _chunkI35XJD75js.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-  const patchRecorderState = _chunkRB7YN5XZjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
+  const patchRecorderState = _chunkM2ATX5ZSjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
     source: "runtime",
     cwd: _nullishCoalesce(opts.tailwindcssBasedir, () => ( _process2.default.cwd()))
   });
@@ -36,13 +36,13 @@ function createPlugins(options = {}) {
   const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"];
   let runtimeSetInitialized = false;
   async function refreshRuntimeState(force) {
-    await _chunk7K3R5LV6js.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+    await _chunkI35XJD75js.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
   }
   async function refreshRuntimeSet(force = false) {
     if (!force && runtimeSetInitialized) {
       return runtimeSet;
     }
-    runtimeSet = await _chunk7K3R5LV6js.ensureRuntimeClassSet.call(void 0, runtimeState, {
+    runtimeSet = await _chunkI35XJD75js.ensureRuntimeClassSet.call(void 0, runtimeState, {
       forceRefresh: force,
       forceCollect: force,
       clearCache: force,
@@ -164,6 +164,7 @@ function createPlugins(options = {}) {
       ...options2,
       filename,
       moduleGraph,
+      tailwindcssMajorVersion: runtimeState.twPatcher.majorVersion,
       babelParserOptions: {
         ..._nullishCoalesce(_optionalChain([options2, 'optionalAccess', _ => _.babelParserOptions]), () => ( {})),
         sourceFilename: filename

package/dist/{chunk-ESIT2XWD.mjs → chunk-WJU62RPV.mjs}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-4QCL7FBX.mjs";
+} from "./chunk-BZCCVPSU.mjs";
 import {
   collectRuntimeClassSet,
   createAttributeMatcher,
@@ -24,12 +24,13 @@ import {
   replaceWxml,
   toCustomAttributesEntities,
   vitePluginName
-} from "./chunk-RXM5ERRJ.mjs";
+} from "./chunk-MPVAZKRB.mjs";
 import {
   resolveUniUtsPlatform
 } from "./chunk-OOHJLO5M.mjs";
 
 // src/bundlers/vite/index.ts
+import path3 from "path";
 import process3 from "process";
 import postcssHtmlTransform from "@weapp-tailwindcss/postcss/html-transform";
 
@@ -756,6 +757,7 @@ function createGenerateBundleHook(context) {
     const createHandlerOptions = (absoluteFilename, extra) => ({
       ...extra,
       filename: absoluteFilename,
+      tailwindcssMajorVersion: runtimeState.twPatcher.majorVersion,
       moduleGraph: moduleGraphOptions,
       babelParserOptions: {
         ...extra?.babelParserOptions ?? {},
@@ -1082,6 +1084,7 @@ var weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 var weappTailwindcssDirPosix = slash(weappTailwindcssPackageDir);
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   const rewriteCssImportsSpecified = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
+  const hasExplicitTailwindcssBasedir = typeof options.tailwindcssBasedir === "string" && options.tailwindcssBasedir.trim().length > 0;
   const opts = getCompilerContext(options);
   const {
     disabled,
@@ -1205,8 +1208,15 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     {
       name: `${vitePluginName}:post`,
       enforce: "post",
-      configResolved(config) {
+      async configResolved(config) {
         resolvedConfig = config;
+        const resolvedRoot = config.root ? path3.resolve(config.root) : void 0;
+        if (!hasExplicitTailwindcssBasedir && resolvedRoot && opts.tailwindcssBasedir !== resolvedRoot) {
+          const previousBasedir = opts.tailwindcssBasedir;
+          opts.tailwindcssBasedir = resolvedRoot;
+          debug("align tailwindcss basedir with vite root: %s -> %s", previousBasedir ?? "undefined", resolvedRoot);
+          await refreshRuntimeState(true);
+        }
         if (typeof config.css.postcss === "object" && Array.isArray(config.css.postcss.plugins)) {
           const idx = config.css.postcss.plugins.findIndex((x) => (
             // @ts-ignore

package/dist/cli.js

@@ -3,7 +3,7 @@
 
 
 
-var _chunk7K3R5LV6js = require('./chunk-7K3R5LV6.js');
+var _chunkI35XJD75js = require('./chunk-I35XJD75.js');
 
 
 
@@ -404,9 +404,9 @@ async function patchWorkspacePackage(workspaceRoot, dir, pkgName, options) {
   try {
     const patcher = createWorkspacePatcher(dir);
     if (options.clearCache) {
-      await _chunk7K3R5LV6js.clearTailwindcssPatcherCache.call(void 0, patcher, { removeDirectory: true });
+      await _chunkI35XJD75js.clearTailwindcssPatcherCache.call(void 0, patcher, { removeDirectory: true });
     }
-    const recorder = _chunk7K3R5LV6js.createPatchTargetRecorder.call(void 0, dir, patcher, {
+    const recorder = _chunkI35XJD75js.createPatchTargetRecorder.call(void 0, dir, patcher, {
       source: "cli",
       cwd: dir,
       recordTarget: options.recordTarget !== false,
@@ -415,7 +415,7 @@ async function patchWorkspacePackage(workspaceRoot, dir, pkgName, options) {
     if (_optionalChain([recorder, 'optionalAccess', _12 => _12.message])) {
       _chunk5APD2MNVjs.logger.info("[workspace] %s %s", displayName, recorder.message);
     }
-    _chunk7K3R5LV6js.logTailwindcssTarget.call(void 0, "cli", patcher, dir);
+    _chunkI35XJD75js.logTailwindcssTarget.call(void 0, "cli", patcher, dir);
     await patcher.patch();
     if (_optionalChain([recorder, 'optionalAccess', _13 => _13.onPatched])) {
       await recorder.onPatched();
@@ -546,9 +546,9 @@ var mountOptions = {
       }
       const patcher = await createPatcherWithDefaultExtendLengthUnits(ctx);
       if (shouldClearCache) {
-        await _chunk7K3R5LV6js.clearTailwindcssPatcherCache.call(void 0, patcher, { removeDirectory: true });
+        await _chunkI35XJD75js.clearTailwindcssPatcherCache.call(void 0, patcher, { removeDirectory: true });
       }
-      const recorder = _chunk7K3R5LV6js.createPatchTargetRecorder.call(void 0, ctx.cwd, patcher, {
+      const recorder = _chunkI35XJD75js.createPatchTargetRecorder.call(void 0, ctx.cwd, patcher, {
         source: "cli",
         cwd: ctx.cwd,
         recordTarget: shouldRecordTarget,
@@ -557,7 +557,7 @@ var mountOptions = {
       if (_optionalChain([recorder, 'optionalAccess', _15 => _15.message])) {
         _chunk5APD2MNVjs.logger.info(recorder.message);
       }
-      _chunk7K3R5LV6js.logTailwindcssTarget.call(void 0, "cli", patcher, ctx.cwd);
+      _chunkI35XJD75js.logTailwindcssTarget.call(void 0, "cli", patcher, ctx.cwd);
       await patcher.patch();
       if (_optionalChain([recorder, 'optionalAccess', _16 => _16.onPatched])) {
         const recordPath = await recorder.onPatched();
@@ -705,9 +705,9 @@ async function generateVscodeIntellisenseEntry(options) {
 
 // src/cli.ts
 _process2.default.title = "node (weapp-tailwindcss)";
-if (_semver2.default.lt(_process2.default.versions.node, _chunk7K3R5LV6js.WEAPP_TW_REQUIRED_NODE_VERSION)) {
+if (_semver2.default.lt(_process2.default.versions.node, _chunkI35XJD75js.WEAPP_TW_REQUIRED_NODE_VERSION)) {
   _chunk5APD2MNVjs.logger.warn(
-    `You are using Node.js ${_process2.default.versions.node}. For weapp-tailwindcss, Node.js version >= v${_chunk7K3R5LV6js.WEAPP_TW_REQUIRED_NODE_VERSION} is required.`
+    `You are using Node.js ${_process2.default.versions.node}. For weapp-tailwindcss, Node.js version >= v${_chunkI35XJD75js.WEAPP_TW_REQUIRED_NODE_VERSION} is required.`
   );
 }
 var cli = _tailwindcsspatch.createTailwindcssPatchCli.call(void 0, {

package/dist/cli.mjs

@@ -3,7 +3,7 @@ import {
   clearTailwindcssPatcherCache,
   createPatchTargetRecorder,
   logTailwindcssTarget
-} from "./chunk-RXM5ERRJ.mjs";
+} from "./chunk-MPVAZKRB.mjs";
 import {
   findWorkspaceRoot,
   logger

package/dist/core.d.mts

@@ -1,6 +1,6 @@
 import { ITemplateHandlerOptions, CreateJsHandlerOptions, JsHandlerResult } from './types.mjs';
 import * as postcss from 'postcss';
-import { U as UserDefinedOptions } from './index-BESv5MWf.mjs';
+import { U as UserDefinedOptions } from './index-t_VBjwYm.mjs';
 import { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss';
 import '@babel/parser';
 import 'magic-string';

package/dist/core.d.ts

@@ -1,6 +1,6 @@
 import { ITemplateHandlerOptions, CreateJsHandlerOptions, JsHandlerResult } from './types.js';
 import * as postcss from 'postcss';
-import { U as UserDefinedOptions } from './index-BESv5MWf.js';
+import { U as UserDefinedOptions } from './index-t_VBjwYm.js';
 import { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss';
 import '@babel/parser';
 import 'magic-string';

package/dist/core.js

@@ -1,10 +1,10 @@
 "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 _chunkRB7YN5XZjs = require('./chunk-RB7YN5XZ.js');
+var _chunkM2ATX5ZSjs = require('./chunk-M2ATX5ZS.js');
 
 
 
-var _chunk7K3R5LV6js = require('./chunk-7K3R5LV6.js');
+var _chunkI35XJD75js = require('./chunk-I35XJD75.js');
 require('./chunk-5APD2MNV.js');
 require('./chunk-5U24PLVV.js');
 require('./chunk-DYLQ6UOI.js');
@@ -14,9 +14,9 @@ require('./chunk-DBAAU4LK.js');
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 var _shared = require('@weapp-tailwindcss/shared');
 function createContext(options = {}) {
-  const opts = _chunk7K3R5LV6js.getCompilerContext.call(void 0, options);
+  const opts = _chunkI35XJD75js.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-  const patchRecorderState = _chunkRB7YN5XZjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
+  const patchRecorderState = _chunkM2ATX5ZSjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
     source: "runtime",
     cwd: _nullishCoalesce(opts.tailwindcssBasedir, () => ( _process2.default.cwd()))
   });
@@ -27,12 +27,25 @@ function createContext(options = {}) {
     refreshTailwindcssPatcher,
     onPatchCompleted: patchRecorderState.onPatchCompleted
   };
+  function withRuntimeTailwindMajorVersion(options2) {
+    const resolvedOptions = {
+      ..._nullishCoalesce(options2, () => ( {}))
+    };
+    if (typeof resolvedOptions.tailwindcssMajorVersion === "number") {
+      return resolvedOptions;
+    }
+    const majorVersion = runtimeState.twPatcher.majorVersion;
+    if (typeof majorVersion === "number") {
+      resolvedOptions.tailwindcssMajorVersion = majorVersion;
+    }
+    return resolvedOptions;
+  }
   async function transformWxss(rawCss, options2) {
     await runtimeState.patchPromise;
     const result = await styleHandler(rawCss, _shared.defuOverrideArray.call(void 0, options2, {
       isMainChunk: true
     }));
-    runtimeSet = await _chunk7K3R5LV6js.ensureRuntimeClassSet.call(void 0, runtimeState, {
+    runtimeSet = await _chunkI35XJD75js.ensureRuntimeClassSet.call(void 0, runtimeState, {
       forceRefresh: true,
       forceCollect: true
     });
@@ -43,16 +56,16 @@ function createContext(options = {}) {
     if (_optionalChain([options2, 'optionalAccess', _ => _.runtimeSet])) {
       runtimeSet = options2.runtimeSet;
     } else if (runtimeSet.size === 0) {
-      runtimeSet = await _chunk7K3R5LV6js.ensureRuntimeClassSet.call(void 0, runtimeState, {
+      runtimeSet = await _chunkI35XJD75js.ensureRuntimeClassSet.call(void 0, runtimeState, {
         forceCollect: true
       });
     }
-    return await jsHandler(rawJs, runtimeSet, options2);
+    return await jsHandler(rawJs, runtimeSet, withRuntimeTailwindMajorVersion(options2));
   }
   async function transformWxml(rawWxml, options2) {
     await runtimeState.patchPromise;
     if (!_optionalChain([options2, 'optionalAccess', _2 => _2.runtimeSet]) && runtimeSet.size === 0) {
-      runtimeSet = await _chunk7K3R5LV6js.ensureRuntimeClassSet.call(void 0, runtimeState, {
+      runtimeSet = await _chunkI35XJD75js.ensureRuntimeClassSet.call(void 0, runtimeState, {
         forceCollect: true
       });
     }
@@ -60,7 +73,7 @@ function createContext(options = {}) {
     return templateHandler(rawWxml, _shared.defuOverrideArray.call(void 0, options2, {
       runtimeSet,
       jsHandler: (source, runtime, handlerOptions) => {
-        return runtimeJsHandler(source, runtime, handlerOptions);
+        return runtimeJsHandler(source, runtime, withRuntimeTailwindMajorVersion(handlerOptions));
       }
     }));
   }