weapp-tailwindcss 4.11.1 → 4.12.0-alpha.1

package/dist/{chunk-KX2JVTVM.mjs → chunk-V34LWQTS.mjs}

@@ -23,18 +23,20 @@ import {
   refreshTailwindRuntimeState,
   replaceWxml,
   setupPatchRecorder,
+  shouldSkipJsTransform,
   toCustomAttributesEntities,
   traverse,
   vitePluginName
-} from "./chunk-4O2J5ZM6.mjs";
+} from "./chunk-ZABCOAAS.mjs";
 import {
   findNearestPackageRoot,
   findTailwindConfig,
   getRuntimeClassSetSignature,
   isUniAppXEnabled,
+  logger,
   resolveTailwindcssOptions,
   resolveUniAppXOptions
-} from "./chunk-OMARW5NC.mjs";
+} from "./chunk-AYJ4HLWZ.mjs";
 import {
   resolveUniUtsPlatform
 } from "./chunk-OOHJLO5M.mjs";
@@ -43,7 +45,7 @@ import {
 import { existsSync as existsSync2 } from "fs";
 import path6 from "path";
 import process4 from "process";
-import { logger as logger2 } from "@weapp-tailwindcss/logger";
+import { logger as logger3 } from "@weapp-tailwindcss/logger";
 import postcssHtmlTransform from "@weapp-tailwindcss/postcss/html-transform";
 
 // src/uni-app-x/transform.ts
@@ -239,28 +241,28 @@ function traverse2(node, visitor) {
     }
   }
 }
-function updateStaticAttribute(ms, prop) {
+function updateStaticAttribute(ms, prop, content = prop.value?.content) {
   if (!prop.value) {
     return;
   }
   const start = prop.value.loc.start.offset + 1;
   const end = prop.value.loc.end.offset - 1;
   if (start < end) {
-    ms.update(start, end, replaceWxml(prop.value.content));
+    ms.update(start, end, replaceWxml(content ?? ""));
   }
 }
-function updateStaticAttributeWithLocalStyle(ms, prop, collector) {
+function updateStaticAttributeWithLocalStyle(ms, prop, collector, content = prop.value?.content) {
   if (!prop.value) {
     return;
   }
   const start = prop.value.loc.start.offset + 1;
   const end = prop.value.loc.end.offset - 1;
   if (start < end) {
-    ms.update(start, end, collector.collectAndRewriteStaticClass(prop.value.content));
+    ms.update(start, end, collector.collectAndRewriteStaticClass(content ?? ""));
   }
 }
-function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet) {
-  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION) {
+function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet, expression = prop.exp?.content) {
+  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION || expression === void 0) {
     return;
   }
   const start = prop.exp.loc.start.offset;
@@ -268,15 +270,15 @@ function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet) {
   if (start >= end) {
     return;
   }
-  const generated = generateCode(prop.exp.content, {
+  const generated = generateCode(expression, {
     jsHandler,
     runtimeSet,
     wrapExpression: true
   });
   ms.update(start, end, generated);
 }
-function updateDirectiveExpressionWithLocalStyle(ms, prop, jsHandler, collector, runtimeSet) {
-  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION) {
+function updateDirectiveExpressionWithLocalStyle(ms, prop, jsHandler, collector, runtimeSet, expression = prop.exp?.content) {
+  if (prop.exp?.type !== NodeTypes.SIMPLE_EXPRESSION || expression === void 0) {
     return;
   }
   const start = prop.exp.loc.start.offset;
@@ -284,10 +286,10 @@ function updateDirectiveExpressionWithLocalStyle(ms, prop, jsHandler, collector,
   if (start >= end) {
     return;
   }
-  collector.collectRuntimeClasses(prop.exp.content, {
+  collector.collectRuntimeClasses(expression, {
     wrapExpression: true
   });
-  const generated = generateCode(prop.exp.content, {
+  const generated = generateCode(expression, {
     jsHandler,
     runtimeSet,
     wrapExpression: true
@@ -359,7 +361,13 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
               continue;
             }
             if (attrName.toLowerCase() === "class" && localStyleCollector) {
-              updateDirectiveExpressionWithLocalStyle(ms, prop, jsHandler, localStyleCollector, runtimeSet);
+              updateDirectiveExpressionWithLocalStyle(
+                ms,
+                prop,
+                jsHandler,
+                localStyleCollector,
+                runtimeSet
+              );
             } else {
               updateDirectiveExpression(ms, prop, jsHandler, runtimeSet);
             }
@@ -509,6 +517,9 @@ function isPreprocessorRequest(id, lang) {
   }
   return PREPROCESSOR_EXT_RE.test(id);
 }
+function resolveUniAppXCssTarget(id) {
+  return UVUE_NVUE_RE2.test(cleanUrl(id)) ? "uvue" : void 0;
+}
 function createUniAppXPlugins(options) {
   const {
     appType,
@@ -551,6 +562,8 @@ function createUniAppXPlugins(options) {
       if (!styleHandlerOptions) {
         styleHandlerOptions = {
           isMainChunk: mainCssChunkMatcher(id, appType),
+          uniAppXCssTarget: resolveUniAppXCssTarget(id),
+          uniAppXUnsupported: resolvedUniAppXOptions.uvueUnsupported,
           postcssOptions: {
             options: {
               from: id,
@@ -567,6 +580,10 @@ function createUniAppXPlugins(options) {
         cssHandlerOptionsCache.set(cacheKey, styleHandlerOptions);
       }
       const postcssResult = await styleHandler(code, styleHandlerOptions);
+      const warnings = typeof postcssResult.warnings === "function" ? postcssResult.warnings() : [];
+      for (const warning of warnings) {
+        logger.warn(warning.toString());
+      }
       const rawPostcssMap = postcssResult.map.toJSON();
       const postcssMap = await formatPostcssSourceMap(
         rawPostcssMap,
@@ -708,7 +725,7 @@ function createUniAppXAssetTask(file, originalSource, outDir, options) {
 // src/bundlers/vite/generate-bundle.ts
 import path3 from "path";
 import process2 from "process";
-import { logger } from "@weapp-tailwindcss/logger";
+import { logger as logger2 } from "@weapp-tailwindcss/logger";
 import { splitCode as splitCode2 } from "@weapp-tailwindcss/shared/extractors";
 
 // src/bundlers/vite/bundle-entries.ts
@@ -1029,28 +1046,6 @@ function updateBundleBuildState(state, snapshot, linkedByEntry, options = {}) {
   state.dependentsByLinkedFile = invertLinkedByEntry(state.linkedByEntry);
 }
 
-// src/bundlers/vite/js-precheck.ts
-var FAST_JS_TRANSFORM_HINT_RE = /className\b|class\s*=|classList\.|\b(?:twMerge|clsx|classnames|cn|cva)\b|\[["'`]class["'`]\]|text-\[|bg-\[|\b(?:[whpm]|px|py|mx|my|rounded|flex|grid|gap)-/;
-var DEPENDENCY_HINT_RE = /\bimport\s*[("'`{*]|\brequire\s*\(|\bexport\s+\*\s+from\s+["'`]|\bexport\s*\{[^}]*\}\s*from\s+["'`]/;
-function shouldSkipViteJsTransform(rawSource, options) {
-  if (!rawSource) {
-    return true;
-  }
-  if (options?.alwaysEscape) {
-    return false;
-  }
-  if (options?.moduleSpecifierReplacements && Object.keys(options.moduleSpecifierReplacements).length > 0) {
-    return false;
-  }
-  if (options?.wrapExpression) {
-    return false;
-  }
-  if (DEPENDENCY_HINT_RE.test(rawSource)) {
-    return false;
-  }
-  return !FAST_JS_TRANSFORM_HINT_RE.test(rawSource);
-}
-
 // src/bundlers/vite/generate-bundle.ts
 function formatDebugFileList(files, limit = 8) {
   if (files.size === 0) {
@@ -1336,7 +1331,7 @@ function createGenerateBundleHook(context) {
               let transformed = await templateHandler(rawSource, defaultTemplateHandlerOptions);
               let unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
               if (unresolvedDynamicCandidates.length > 0) {
-                logger.warn(
+                logger2.warn(
                   "\u68C0\u6D4B\u5230 WXML \u52A8\u6001\u7C7B\u540D\u672A\u5B8C\u6210\u8F6C\u8BD1\uFF0C\u5DF2\u56DE\u9000\u5230\u5B8C\u6574 runtimeSet \u91CD\u8BD5: %s -> %O",
                   file,
                   unresolvedDynamicCandidates
@@ -1347,7 +1342,7 @@ function createGenerateBundleHook(context) {
                 });
                 unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
                 if (unresolvedDynamicCandidates.length > 0) {
-                  logger.warn(
+                  logger2.warn(
                     "WXML \u52A8\u6001\u7C7B\u540D\u5728\u5B8C\u6574 runtimeSet \u91CD\u8BD5\u540E\u4ECD\u672A\u5B8C\u6210\u8F6C\u8BD1: %s -> %O",
                     file,
                     unresolvedDynamicCandidates
@@ -1466,7 +1461,7 @@ function createGenerateBundleHook(context) {
                 debug3("js cache replay miss, fallback transform: %s", file);
               }
               const handlerOptions = createHandlerOptions(absoluteFile);
-              if (!disableJsPrecheck && shouldSkipViteJsTransform(rawSource, handlerOptions)) {
+              if (!disableJsPrecheck && shouldSkipJsTransform(rawSource, handlerOptions)) {
                 metrics.js.elapsed += measureElapsed(start);
                 metrics.js.transformed++;
                 return {
@@ -1552,7 +1547,7 @@ function createGenerateBundleHook(context) {
               sourceType: "unambiguous"
             }
           });
-          if (!disableJsPrecheck && shouldSkipViteJsTransform(currentSource, precheckOptions)) {
+          if (!disableJsPrecheck && shouldSkipJsTransform(currentSource, precheckOptions)) {
             metrics.js.elapsed += measureElapsed(start);
             metrics.js.transformed++;
             return;
@@ -2335,7 +2330,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
           if (nextAppType && opts.appType !== nextAppType) {
             const previousAppType = opts.appType;
             opts.appType = nextAppType;
-            logger2.info("\u6839\u636E Vite \u9879\u76EE\u6839\u76EE\u5F55\u81EA\u52A8\u63A8\u65AD appType -> %s", nextAppType);
+            logger3.info("\u6839\u636E Vite \u9879\u76EE\u6839\u76EE\u5F55\u81EA\u52A8\u63A8\u65AD appType -> %s", nextAppType);
             debug2(
               "align appType with vite root: %s -> %s",
               previousAppType ?? "undefined",
@@ -2359,14 +2354,17 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
           }
         }
       },
-      generateBundle: createGenerateBundleHook({
-        opts,
-        runtimeState,
-        ensureRuntimeClassSet,
-        ensureBundleRuntimeClassSet,
-        debug: debug2,
-        getResolvedConfig
-      })
+      generateBundle: {
+        order: "post",
+        handler: createGenerateBundleHook({
+          opts,
+          runtimeState,
+          ensureRuntimeClassSet,
+          ensureBundleRuntimeClassSet,
+          debug: debug2,
+          getResolvedConfig
+        })
+      }
     }
   ];
   if (uniAppXPlugins) {