weapp-tailwindcss 4.12.0-next.0 → 4.12.0

package/bin/weapp-tailwindcss.js

@@ -1,8 +1,28 @@
 #!/usr/bin/env node
 const fs = require('node:fs')
 const path = require('node:path')
+const process = require('node:process')
+
+function isInstallLifecycle() {
+  return process.env.npm_lifecycle_event === 'postinstall' || process.env.npm_lifecycle_event === 'prepare'
+}
+
+function isMissingRuntimeModuleError(error) {
+  return error && error.code === 'MODULE_NOT_FOUND'
+}
 
 const cliPath = path.resolve(__dirname, '../dist/cli.js')
 if (fs.existsSync(cliPath)) {
-  require(cliPath)
+  try {
+    require(cliPath)
+  }
+  catch (error) {
+    if (isInstallLifecycle() && isMissingRuntimeModuleError(error)) {
+      console.error('[weapp-tailwindcss] install lifecycle patch skipped because a runtime module is missing.')
+      console.error('Run `pnpm --filter weapp-tailwindcss build` before strict CLI validation.')
+    }
+    else {
+      throw error
+    }
+  }
 }

package/dist/{chunk-GMKSBLNY.js → chunk-24AGZQVR.js}

@@ -1,6 +1,6 @@
 "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 _chunkONLKZIRQjs = require('./chunk-ONLKZIRQ.js');
+var _chunkRKISS72Pjs = require('./chunk-RKISS72P.js');
 
 // src/utils/disabled.ts
 function resolveDisabledOptions(disabled) {
@@ -19,7 +19,7 @@ function resolveDisabledOptions(disabled) {
 // src/utils/resolve-package.ts
 var _module = require('module');
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
-var require2 = _module.createRequire.call(void 0, _chunkONLKZIRQjs.importMetaUrl);
+var require2 = _module.createRequire.call(void 0, _chunkRKISS72Pjs.importMetaUrl);
 function resolvePackageDir(name) {
   const pkgPath = require2.resolve(`${name}/package.json`);
   return _path2.default.dirname(pkgPath);
@@ -29,8 +29,12 @@ function resolvePackageDir(name) {
 
 var QUERY_HASH_RE = /[?#].*$/u;
 var PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
+var WINDOWS_ABSOLUTE_RE = /^[a-z]:[\\/]/iu;
 var VIRTUAL_PREFIX = "\0";
 var JS_EXTENSIONS = [".js", ".mjs", ".cjs"];
+function normalizeOutputPathKey(value) {
+  return _path2.default.normalize(value).replace(/\\/g, "/");
+}
 function stripQueryAndHash(specifier) {
   return specifier.replace(QUERY_HASH_RE, "");
 }
@@ -42,11 +46,14 @@ function isResolvableSpecifier(specifier) {
   if (normalized.startsWith(VIRTUAL_PREFIX)) {
     return false;
   }
+  if (_path2.default.isAbsolute(normalized) || WINDOWS_ABSOLUTE_RE.test(normalized)) {
+    return true;
+  }
   return !PROTOCOL_RE.test(normalized);
 }
 function toAbsoluteOutputPath(fileName, outDir) {
-  if (_path2.default.isAbsolute(fileName)) {
-    return fileName;
+  if (_path2.default.isAbsolute(fileName) || WINDOWS_ABSOLUTE_RE.test(fileName)) {
+    return _path2.default.normalize(fileName);
   }
   return _path2.default.resolve(outDir, fileName);
 }
@@ -70,8 +77,8 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
   }
   const normalized = stripQueryAndHash(specifier);
   let candidate;
-  if (_path2.default.isAbsolute(normalized)) {
-    candidate = normalized;
+  if (_path2.default.isAbsolute(normalized) || WINDOWS_ABSOLUTE_RE.test(normalized)) {
+    candidate = _path2.default.normalize(normalized);
   } else if (normalized.startsWith("/")) {
     candidate = _path2.default.resolve(outDir, normalized.slice(1));
   } else {
@@ -172,4 +179,5 @@ function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
 
 
 
-exports.toAbsoluteOutputPath = toAbsoluteOutputPath; exports.resolveOutputSpecifier = resolveOutputSpecifier; exports.resolveDisabledOptions = resolveDisabledOptions; exports.resolvePackageDir = resolvePackageDir; exports.pushConcurrentTaskFactories = pushConcurrentTaskFactories; exports.resolveTailwindcssImport = resolveTailwindcssImport; exports.rewriteTailwindcssImportsInCode = rewriteTailwindcssImportsInCode;
+
+exports.normalizeOutputPathKey = normalizeOutputPathKey; exports.toAbsoluteOutputPath = toAbsoluteOutputPath; exports.resolveOutputSpecifier = resolveOutputSpecifier; exports.resolveDisabledOptions = resolveDisabledOptions; exports.resolvePackageDir = resolvePackageDir; exports.pushConcurrentTaskFactories = pushConcurrentTaskFactories; exports.resolveTailwindcssImport = resolveTailwindcssImport; exports.rewriteTailwindcssImportsInCode = rewriteTailwindcssImportsInCode;

package/dist/{chunk-F2CKKG6Q.mjs → chunk-3VQKDHGP.mjs}

@@ -25,8 +25,12 @@ function resolvePackageDir(name) {
 import path2 from "path";
 var QUERY_HASH_RE = /[?#].*$/u;
 var PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
+var WINDOWS_ABSOLUTE_RE = /^[a-z]:[\\/]/iu;
 var VIRTUAL_PREFIX = "\0";
 var JS_EXTENSIONS = [".js", ".mjs", ".cjs"];
+function normalizeOutputPathKey(value) {
+  return path2.normalize(value).replace(/\\/g, "/");
+}
 function stripQueryAndHash(specifier) {
   return specifier.replace(QUERY_HASH_RE, "");
 }
@@ -38,11 +42,14 @@ function isResolvableSpecifier(specifier) {
   if (normalized.startsWith(VIRTUAL_PREFIX)) {
     return false;
   }
+  if (path2.isAbsolute(normalized) || WINDOWS_ABSOLUTE_RE.test(normalized)) {
+    return true;
+  }
   return !PROTOCOL_RE.test(normalized);
 }
 function toAbsoluteOutputPath(fileName, outDir) {
-  if (path2.isAbsolute(fileName)) {
-    return fileName;
+  if (path2.isAbsolute(fileName) || WINDOWS_ABSOLUTE_RE.test(fileName)) {
+    return path2.normalize(fileName);
   }
   return path2.resolve(outDir, fileName);
 }
@@ -66,8 +73,8 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
   }
   const normalized = stripQueryAndHash(specifier);
   let candidate;
-  if (path2.isAbsolute(normalized)) {
-    candidate = normalized;
+  if (path2.isAbsolute(normalized) || WINDOWS_ABSOLUTE_RE.test(normalized)) {
+    candidate = path2.normalize(normalized);
   } else if (normalized.startsWith("/")) {
     candidate = path2.resolve(outDir, normalized.slice(1));
   } else {
@@ -161,6 +168,7 @@ function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
 }
 
 export {
+  normalizeOutputPathKey,
   toAbsoluteOutputPath,
   resolveOutputSpecifier,
   resolveDisabledOptions,

package/dist/{chunk-F5XJWJYO.mjs → chunk-57SOQCAU.mjs}

@@ -11,14 +11,14 @@ import {
   isMpx,
   patchMpxLoaderResolve,
   setupMpxTailwindcssRedirect
-} from "./chunk-ZR3KN3FG.mjs";
+} from "./chunk-RRQZL7FQ.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveDisabledOptions,
   resolveOutputSpecifier,
   resolvePackageDir,
   toAbsoluteOutputPath
-} from "./chunk-F2CKKG6Q.mjs";
+} from "./chunk-3VQKDHGP.mjs";
 import {
   processCachedTask
 } from "./chunk-76S2EME4.mjs";
@@ -29,17 +29,17 @@ import {
   pluginName,
   setupPatchRecorder,
   shouldSkipJsTransform
-} from "./chunk-QNRJCEZN.mjs";
+} from "./chunk-KGTVD4EP.mjs";
 import {
   getRuntimeClassSetSignature,
   resolveTailwindcssOptions
-} from "./chunk-AYJ4HLWZ.mjs";
+} from "./chunk-PCDYXXSK.mjs";
 import {
   getGroupedEntries
 } from "./chunk-OOHJLO5M.mjs";
 import {
   __dirname
-} from "./chunk-HL3US2OT.mjs";
+} from "./chunk-NNOQDMUP.mjs";
 
 // src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
 import process3 from "process";

package/dist/{chunk-GD4SQMVF.mjs → chunk-5ZYHNDEK.mjs}

@@ -1,4 +1,5 @@
 import {
+  normalizeOutputPathKey,
   pushConcurrentTaskFactories,
   resolveDisabledOptions,
   resolveOutputSpecifier,
@@ -6,7 +7,7 @@ import {
   resolveTailwindcssImport,
   rewriteTailwindcssImportsInCode,
   toAbsoluteOutputPath
-} from "./chunk-F2CKKG6Q.mjs";
+} from "./chunk-3VQKDHGP.mjs";
 import {
   processCachedTask
 } from "./chunk-76S2EME4.mjs";
@@ -27,7 +28,7 @@ import {
   toCustomAttributesEntities,
   traverse,
   vitePluginName
-} from "./chunk-QNRJCEZN.mjs";
+} from "./chunk-KGTVD4EP.mjs";
 import {
   findNearestPackageRoot,
   findTailwindConfig,
@@ -36,7 +37,7 @@ import {
   logger,
   resolveTailwindcssOptions,
   resolveUniAppXOptions
-} from "./chunk-AYJ4HLWZ.mjs";
+} from "./chunk-PCDYXXSK.mjs";
 import {
   resolveUniUtsPlatform
 } from "./chunk-OOHJLO5M.mjs";
@@ -78,7 +79,7 @@ function extractLiteralValue(path7) {
   }
   return {
     allowDoubleQuotes,
-    literal: path7.node.value.raw,
+    literal: typeof path7.node.value === "string" ? path7.node.value : path7.node.value.raw,
     offset: 0
   };
 }
@@ -261,10 +262,11 @@ function updateStaticAttributeWithLocalStyle(ms, prop, collector, content = prop
     ms.update(start, end, collector.collectAndRewriteStaticClass(content ?? ""));
   }
 }
-function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet, expression = prop.exp?.content) {
-  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION || expression === void 0) {
+function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet) {
+  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION) {
     return;
   }
+  const expression = prop.exp.content;
   const start = prop.exp.loc.start.offset;
   const end = prop.exp.loc.end.offset;
   if (start >= end) {
@@ -277,10 +279,11 @@ function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet, expression =
   });
   ms.update(start, end, generated);
 }
-function updateDirectiveExpressionWithLocalStyle(ms, prop, jsHandler, collector, runtimeSet, expression = prop.exp?.content) {
-  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION || expression === void 0) {
+function updateDirectiveExpressionWithLocalStyle(ms, prop, jsHandler, collector, runtimeSet) {
+  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION) {
     return;
   }
+  const expression = prop.exp.content;
   const start = prop.exp.loc.start.offset;
   const end = prop.exp.loc.end.offset;
   if (start >= end) {
@@ -398,13 +401,18 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 ${localStyleCollector.toStyleBlock()}`);
     }
   }
-  return {
+  const result = {
     code: ms.toString(),
-    // @ts-ignore
-    get map() {
+    map: null
+  };
+  Object.defineProperty(result, "map", {
+    configurable: true,
+    enumerable: true,
+    get() {
       return ms.generateMap();
     }
-  };
+  });
+  return result;
 }
 
 // src/bundlers/vite/query.ts
@@ -520,6 +528,9 @@ function isPreprocessorRequest(id, lang) {
 function resolveUniAppXCssTarget(id) {
   return UVUE_NVUE_RE2.test(cleanUrl(id)) ? "uvue" : void 0;
 }
+function resolveUniAppXJsTransformEnabled(uniAppX) {
+  return uniAppX === void 0 ? true : isUniAppXEnabled(uniAppX);
+}
 function createUniAppXPlugins(options) {
   const {
     appType,
@@ -703,7 +714,7 @@ function createUniAppXAssetTask(file, originalSource, outDir, options) {
       async transform() {
         const currentSource = originalSource.source.toString();
         const { code, linked } = await jsHandler(currentSource, runtimeSet, createHandlerOptions(absoluteFile, {
-          uniAppX: options.uniAppX ?? true,
+          uniAppX: resolveUniAppXJsTransformEnabled(options.uniAppX),
           babelParserOptions: {
             plugins: [
               "typescript"
@@ -757,19 +768,24 @@ function isJavaScriptEntry(entry) {
   return entry.fileName.endsWith(".js");
 }
 function createBundleModuleGraphOptions(outputDir, entries) {
+  const normalizedEntries = /* @__PURE__ */ new Map();
+  for (const [id, entry] of entries) {
+    normalizedEntries.set(normalizeOutputPathKey(id), entry);
+  }
+  const getEntry = (id) => entries.get(id) ?? normalizedEntries.get(normalizeOutputPathKey(id));
   return {
     resolve(specifier, importer) {
-      return resolveOutputSpecifier(specifier, importer, outputDir, (candidate) => entries.has(candidate));
+      return resolveOutputSpecifier(specifier, importer, outputDir, (candidate) => Boolean(getEntry(candidate)));
     },
     load(id) {
-      const entry = entries.get(id);
+      const entry = getEntry(id);
       if (!entry) {
         return void 0;
       }
       return readOutputEntry(entry);
     },
     filter(id) {
-      return entries.has(id);
+      return Boolean(getEntry(id));
     }
   };
 }
@@ -777,8 +793,12 @@ function applyLinkedResults(linked, entries, onLinkedUpdate, onApplied) {
   if (!linked) {
     return;
   }
+  const normalizedEntries = /* @__PURE__ */ new Map();
+  for (const [entryId, entry] of entries) {
+    normalizedEntries.set(normalizeOutputPathKey(entryId), entry);
+  }
   for (const [id, { code }] of Object.entries(linked)) {
-    const entry = entries.get(id);
+    const entry = entries.get(id) ?? normalizedEntries.get(normalizeOutputPathKey(id));
     if (!entry) {
       continue;
     }
@@ -889,6 +909,7 @@ function createBundleBuildState() {
   return {
     iteration: 0,
     sourceHashByFile: /* @__PURE__ */ new Map(),
+    runtimeAffectingSignatureByFile: /* @__PURE__ */ new Map(),
     runtimeAffectingHashByFile: /* @__PURE__ */ new Map(),
     linkedByEntry: /* @__PURE__ */ new Map(),
     dependentsByLinkedFile: /* @__PURE__ */ new Map()
@@ -956,16 +977,18 @@ function buildBundleSnapshot(bundle, opts, outDir, state, forceAll = false) {
     const source = readEntrySource(output);
     const hash = opts.cache.computeHash(source);
     sourceHashByFile.set(file, hash);
-    const runtimeAffectingSignature = createRuntimeAffectingSourceSignature(source, type);
-    runtimeAffectingSignatureByFile.set(file, runtimeAffectingSignature);
-    const runtimeAffectingHash = opts.cache.computeHash(runtimeAffectingSignature);
-    runtimeAffectingHashByFile.set(file, runtimeAffectingHash);
     const previousHash = state.sourceHashByFile.get(file);
     const changed = previousHash == null || previousHash !== hash;
+    const previousRuntimeAffectingSignature = state.runtimeAffectingSignatureByFile.get(file);
+    const previousRuntimeAffectingHash = state.runtimeAffectingHashByFile.get(file);
+    const canReuseRuntimeAffectingSignature = !changed && previousRuntimeAffectingSignature != null && previousRuntimeAffectingHash != null;
+    const runtimeAffectingSignature = canReuseRuntimeAffectingSignature ? previousRuntimeAffectingSignature : createRuntimeAffectingSourceSignature(source, type);
+    const runtimeAffectingHash = canReuseRuntimeAffectingSignature ? previousRuntimeAffectingHash : opts.cache.computeHash(runtimeAffectingSignature);
+    runtimeAffectingSignatureByFile.set(file, runtimeAffectingSignature);
+    runtimeAffectingHashByFile.set(file, runtimeAffectingHash);
     if (changed) {
       changedByType[type].add(file);
     }
-    const previousRuntimeAffectingHash = state.runtimeAffectingHashByFile.get(file);
     const runtimeAffectingChanged = previousRuntimeAffectingHash == null || previousRuntimeAffectingHash !== runtimeAffectingHash;
     if (runtimeAffectingChanged) {
       runtimeAffectingChangedByType[type].add(file);
@@ -1035,6 +1058,7 @@ function updateBundleBuildState(state, snapshot, linkedByEntry, options = {}) {
     ...state.sourceHashByFile,
     ...snapshot.sourceHashByFile
   ]) : snapshot.sourceHashByFile;
+  state.runtimeAffectingSignatureByFile = incremental ? new Map([...state.runtimeAffectingSignatureByFile, ...snapshot.runtimeAffectingSignatureByFile]) : snapshot.runtimeAffectingSignatureByFile;
   state.runtimeAffectingHashByFile = incremental ? new Map([
     ...state.runtimeAffectingHashByFile,
     ...snapshot.runtimeAffectingHashByFile
@@ -1076,6 +1100,9 @@ function createEmptyMetrics() {
 function measureElapsed(start) {
   return performance.now() - start;
 }
+function resolveUniAppXJsTransformEnabled2(uniAppX) {
+  return uniAppX === void 0 ? true : isUniAppXEnabled(uniAppX);
+}
 function formatCacheHitRate(metric) {
   if (metric.total === 0) {
     return "0.00%";
@@ -1123,11 +1150,36 @@ function createJsHashSalt(runtimeSignature, linkedImpactSignature) {
   }
   return `${runtimeSignature}:linked:${linkedImpactSignature}`;
 }
+function getSnapshotHash(snapshotMap, file, fallback) {
+  return snapshotMap.get(file) ?? fallback;
+}
 function hasRuntimeAffectingSourceChanges(changedByType) {
   return changedByType.html.size > 0 || changedByType.js.size > 0;
 }
-function canShareCssTransformResult(rawSource) {
-  return !rawSource.includes("@import") && !rawSource.includes("url(");
+var CSS_URL_FUNCTION_RE = /url\((?:"([^"]*)"|'([^']*)'|([^)]*))\)/gi;
+var CSS_PATH_INDEPENDENT_URL_RE = /^(?:[a-z][a-z\d+.-]*:|\/\/|\/|#)/i;
+var CSS_IMPORT_RE = /@import\b/i;
+function isPathIndependentCssUrl(value) {
+  const normalized = value.trim();
+  return normalized.length > 0 && CSS_PATH_INDEPENDENT_URL_RE.test(normalized);
+}
+function hasPathDependentCssUrl(rawSource) {
+  CSS_URL_FUNCTION_RE.lastIndex = 0;
+  let match = CSS_URL_FUNCTION_RE.exec(rawSource);
+  while (match !== null) {
+    const value = match[1] ?? match[2] ?? match[3] ?? "";
+    if (!isPathIndependentCssUrl(value)) {
+      return true;
+    }
+    match = CSS_URL_FUNCTION_RE.exec(rawSource);
+  }
+  return false;
+}
+function createCssTransformShareScope(file, rawSource) {
+  if (CSS_IMPORT_RE.test(rawSource) || hasPathDependentCssUrl(rawSource)) {
+    return `dir:${normalizeOutputPathKey(path3.dirname(file))}`;
+  }
+  return "global";
 }
 function hasOmittedKnownBundleFiles(currentBundleFiles, previousBundleFiles) {
   const currentFileSet = new Set(currentBundleFiles);
@@ -1258,6 +1310,11 @@ function createGenerateBundleHook(context) {
       );
     }
     const jsEntries = snapshot.jsEntries;
+    const normalizedJsEntries = /* @__PURE__ */ new Map();
+    for (const [id, entry] of jsEntries) {
+      normalizedJsEntries.set(normalizeOutputPathKey(id), entry);
+    }
+    const getJsEntry = (id) => jsEntries.get(id) ?? normalizedJsEntries.get(normalizeOutputPathKey(id));
     const moduleGraphOptions = createBundleModuleGraphOptions(outDir, jsEntries);
     const runtimeStart = performance.now();
     const runtime = useBundleRuntimeClassSet ? await ensureBundleRuntimeClassSet(snapshot, forceRuntimeRefreshByEnv) : await context.ensureRuntimeClassSet(forceRuntimeRefreshByEnv);
@@ -1317,8 +1374,8 @@ function createGenerateBundleHook(context) {
           processCachedTask({
             cache,
             cacheKey: file,
-            rawSource,
             hashKey: `${file}:html:${runtimeSignature}`,
+            hash: getSnapshotHash(snapshot.sourceHashByFile, file, rawSource),
             applyResult(source) {
               originalSource.source = source;
             },
@@ -1365,14 +1422,15 @@ function createGenerateBundleHook(context) {
         metrics.css.total++;
         const rawSource = originalEntrySource;
         const cssRuntimeAffectingSignature = snapshot.runtimeAffectingSignatureByFile.get(file) ?? rawSource;
-        const shareCssResult = canShareCssTransformResult(rawSource);
-        const cssSharedCacheKey = shareCssResult ? `${runtimeSignature}:${runtimeState.twPatcher.majorVersion ?? "unknown"}:${getCssHandlerOptions(file).isMainChunk ? "1" : "0"}:${cssRuntimeAffectingSignature}` : void 0;
+        const cssShareScope = createCssTransformShareScope(file, rawSource);
+        const cssHandlerOptions = getCssHandlerOptions(file);
+        const cssSharedCacheKey = `${cssShareScope}:${runtimeSignature}:${runtimeState.twPatcher.majorVersion ?? "unknown"}:${cssHandlerOptions.isMainChunk ? "1" : "0"}:${cssRuntimeAffectingSignature}`;
         tasks.push(
           processCachedTask({
             cache,
             cacheKey: file,
             hashKey: `${file}:css:${runtimeSignature}:${runtimeState.twPatcher.majorVersion ?? "unknown"}`,
-            rawSource: cssRuntimeAffectingSignature,
+            hash: getSnapshotHash(snapshot.runtimeAffectingHashByFile, file, cssRuntimeAffectingSignature),
             applyResult(source) {
               originalSource.source = source;
             },
@@ -1445,8 +1503,7 @@ function createGenerateBundleHook(context) {
             cache,
             cacheKey: file,
             hashKey: `${file}:js`,
-            rawSource: `${initialRawSource}
-/*${hashSalt}*/`,
+            hash: `${getSnapshotHash(snapshot.sourceHashByFile, file, initialRawSource)}:${hashSalt}`,
             applyResult(source) {
               originalSource.code = source;
             },
@@ -1475,7 +1532,7 @@ function createGenerateBundleHook(context) {
               debug3("js handle: %s", file);
               if (linked) {
                 for (const id of Object.keys(linked)) {
-                  const linkedEntry = jsEntries.get(id);
+                  const linkedEntry = getJsEntry(id);
                   if (linkedEntry && linkedSet) {
                     linkedSet.add(linkedEntry.fileName);
                   }
@@ -1497,7 +1554,7 @@ function createGenerateBundleHook(context) {
         const wrappedApplyLinkedUpdates = (linked) => {
           if (linked) {
             for (const id of Object.keys(linked)) {
-              const linkedEntry = jsEntries.get(id);
+              const linkedEntry = getJsEntry(id);
               if (linkedEntry && linkedSet) {
                 linkedSet.add(linkedEntry.fileName);
               }
@@ -1541,7 +1598,7 @@ function createGenerateBundleHook(context) {
           const currentSource = originalEntrySource;
           const absoluteFile = path3.resolve(outDir, file);
           const precheckOptions = createHandlerOptions(absoluteFile, {
-            uniAppX: uniAppX ?? true,
+            uniAppX: resolveUniAppXJsTransformEnabled2(uniAppX),
             babelParserOptions: {
               plugins: ["typescript"],
               sourceType: "unambiguous"
@@ -2114,6 +2171,13 @@ var debug2 = createDebug();
 var weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 var weappTailwindcssDirPosix = slash(weappTailwindcssPackageDir);
 var PACKAGE_JSON_FILE2 = "package.json";
+function getPostcssPluginName(plugin) {
+  if (!plugin || typeof plugin !== "object" || !("postcssPlugin" in plugin)) {
+    return;
+  }
+  const { postcssPlugin } = plugin;
+  return typeof postcssPlugin === "string" ? postcssPlugin : void 0;
+}
 function resolveImplicitTailwindcssBasedirFromViteRoot(root) {
   const resolvedRoot = path6.resolve(root);
   if (!existsSync2(resolvedRoot)) {
@@ -2344,10 +2408,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         }
         if (typeof config.css.postcss === "object" && Array.isArray(config.css.postcss.plugins)) {
           const postcssPlugins = config.css.postcss.plugins;
-          const idx = postcssPlugins.findIndex((x) => (
-            // @ts-ignore
-            x.postcssPlugin === "postcss-html-transform"
-          ));
+          const idx = postcssPlugins.findIndex((x) => getPostcssPluginName(x) === "postcss-html-transform");
           if (idx > -1) {
             postcssPlugins.splice(idx, 1, postcssHtmlTransform());
             debug2("remove postcss-html-transform plugin from vite config");

package/dist/{chunk-FMK6SFQQ.js → chunk-DUHYLR2R.js}

@@ -8,7 +8,7 @@ var _chunkOF6MFURRjs = require('./chunk-OF6MFURR.js');
 
 
 
-var _chunkGC7WXUOWjs = require('./chunk-GC7WXUOW.js');
+var _chunkHVNGIKLSjs = require('./chunk-HVNGIKLS.js');
 
 // src/bundlers/gulp/index.ts
 var _buffer = require('buffer');
@@ -16,12 +16,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 = _chunkGC7WXUOWjs.createDebug.call(void 0, );
+var debug = _chunkHVNGIKLSjs.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunkGC7WXUOWjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkHVNGIKLSjs.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-  const patchRecorderState = _chunkGC7WXUOWjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
+  const patchRecorderState = _chunkHVNGIKLSjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
     source: "runtime",
     cwd: _nullishCoalesce(opts.tailwindcssBasedir, () => ( _process2.default.cwd()))
   });
@@ -39,13 +39,13 @@ function createPlugins(options = {}) {
   const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"];
   let runtimeSetInitialized = false;
   async function refreshRuntimeState(force) {
-    await _chunkGC7WXUOWjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+    await _chunkHVNGIKLSjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
   }
   async function refreshRuntimeSet(force = false) {
     if (!force && runtimeSetInitialized) {
       return runtimeSet;
     }
-    runtimeSet = await _chunkGC7WXUOWjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
+    runtimeSet = await _chunkHVNGIKLSjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
       forceRefresh: force,
       forceCollect: force,
       clearCache: force,
@@ -226,7 +226,7 @@ function createPlugins(options = {}) {
       async transform() {
         await runtimeState.patchPromise;
         const currentSource = _nullishCoalesce(_optionalChain([file, 'access', _2 => _2.contents, 'optionalAccess', _3 => _3.toString, 'call', _4 => _4()]), () => ( rawSource));
-        if (_chunkGC7WXUOWjs.shouldSkipJsTransform.call(void 0, currentSource, handlerOptions)) {
+        if (_chunkHVNGIKLSjs.shouldSkipJsTransform.call(void 0, currentSource, handlerOptions)) {
           return { result: currentSource };
         }
         const { code } = await jsHandler(currentSource, runtimeSet, handlerOptions);

package/dist/{chunk-OYSABARD.js → chunk-E7I5TW5K.js}

@@ -33,12 +33,13 @@ function ifndef(text) {
 }
 var QUERY_KEY_REGEX = new RegExp(`\\(\\s*${queryKey}\\s*:\\s*"([^)]*)"\\)`, "g");
 function matchCustomPropertyFromValue(str, cb) {
-  let arr;
   let index = 0;
   QUERY_KEY_REGEX.lastIndex = 0;
-  while ((arr = QUERY_KEY_REGEX.exec(str)) !== null) {
+  let arr = QUERY_KEY_REGEX.exec(str);
+  while (arr !== null) {
     cb(arr, index);
     index++;
+    arr = QUERY_KEY_REGEX.exec(str);
   }
 }
 

package/dist/{chunk-WSS26HZS.js → chunk-FS2NOOEB.js}

@@ -1,9 +1,9 @@
 "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 _chunkGMKSBLNYjs = require('./chunk-GMKSBLNY.js');
+var _chunk24AGZQVRjs = require('./chunk-24AGZQVR.js');
 
 
-var _chunkGC7WXUOWjs = require('./chunk-GC7WXUOW.js');
+var _chunkHVNGIKLSjs = require('./chunk-HVNGIKLS.js');
 
 // src/shared/mpx.ts
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
@@ -145,7 +145,7 @@ function rewriteTailwindcssRequestForCss(data, pkgDir, appType) {
   if (!CSS_EXT_RE2.test(normalizedIssuer)) {
     return;
   }
-  const resolved = _chunkGMKSBLNYjs.resolveTailwindcssImport.call(void 0, request, pkgDir, { appType });
+  const resolved = _chunk24AGZQVRjs.resolveTailwindcssImport.call(void 0, request, pkgDir, { appType });
   if (!resolved) {
     return;
   }
@@ -155,8 +155,8 @@ function applyTailwindcssCssImportRewrite(compiler, options) {
   if (!options.enabled) {
     return;
   }
-  compiler.hooks.normalModuleFactory.tap(_chunkGC7WXUOWjs.pluginName, (factory) => {
-    factory.hooks.beforeResolve.tap(_chunkGC7WXUOWjs.pluginName, (data) => {
+  compiler.hooks.normalModuleFactory.tap(_chunkHVNGIKLSjs.pluginName, (factory) => {
+    factory.hooks.beforeResolve.tap(_chunkHVNGIKLSjs.pluginName, (data) => {
       rewriteTailwindcssRequestForCss(data, options.pkgDir, options.appType);
     });
   });