weapp-tailwindcss 4.10.3 → 4.11.0-alpha.1

package/dist/{chunk-QOTLDKI4.mjs → chunk-IEZ5RBMG.mjs}

@@ -5,6 +5,90 @@ import {
 // src/logger/index.ts
 import { logger } from "@weapp-tailwindcss/logger";
 
+// src/context/workspace.ts
+import { existsSync, readdirSync, readFileSync } from "fs";
+import path from "path";
+var IGNORED_WORKSPACE_DIRS = /* @__PURE__ */ new Set([
+  "node_modules",
+  ".git",
+  ".hg",
+  ".svn",
+  ".turbo",
+  ".output",
+  ".next",
+  "dist",
+  "build"
+]);
+function findWorkspaceRoot(startDir) {
+  if (!startDir) {
+    return void 0;
+  }
+  let current = path.resolve(startDir);
+  while (true) {
+    const workspaceFile = path.join(current, "pnpm-workspace.yaml");
+    if (existsSync(workspaceFile)) {
+      return current;
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return void 0;
+    }
+    current = parent;
+  }
+}
+function findNearestPackageRoot(startDir) {
+  if (!startDir) {
+    return void 0;
+  }
+  let current = path.resolve(startDir);
+  while (true) {
+    const pkgPath = path.join(current, "package.json");
+    if (existsSync(pkgPath)) {
+      return current;
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return void 0;
+    }
+    current = parent;
+  }
+}
+function findWorkspacePackageDir(rootDir, packageName) {
+  const visited = /* @__PURE__ */ new Set();
+  const queue = [path.resolve(rootDir)];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    const normalized = path.normalize(current);
+    if (visited.has(normalized)) {
+      continue;
+    }
+    visited.add(normalized);
+    try {
+      const pkgPath = path.join(normalized, "package.json");
+      if (existsSync(pkgPath)) {
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+        if (pkg?.name === packageName) {
+          return normalized;
+        }
+      }
+    } catch {
+    }
+    let entries;
+    try {
+      entries = readdirSync(normalized, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory() || IGNORED_WORKSPACE_DIRS.has(entry.name) || entry.isSymbolicLink?.()) {
+        continue;
+      }
+      queue.push(path.join(normalized, entry.name));
+    }
+  }
+  return void 0;
+}
+
 // src/tailwindcss/v4/config.ts
 import { logger as logger2 } from "@weapp-tailwindcss/logger";
 var DEFAULT_CSS_CALC_CUSTOM_PROPERTIES = [];
@@ -115,100 +199,125 @@ function applyV4CssCalcDefaults(cssCalc, patcher) {
   return cssCalcOptions;
 }
 
-// src/tailwindcss/v4/patcher.ts
-import { logger as logger4 } from "@weapp-tailwindcss/logger";
-
-// src/tailwindcss/patcher.ts
-import path3 from "path";
-import process2 from "process";
-import { logger as logger3 } from "@weapp-tailwindcss/logger";
-import { defuOverrideArray as defuOverrideArray2 } from "@weapp-tailwindcss/shared";
-import { TailwindcssPatcher } from "tailwindcss-patch";
-
-// src/context/workspace.ts
-import { existsSync, readdirSync, readFileSync } from "fs";
-import path from "path";
-var IGNORED_WORKSPACE_DIRS = /* @__PURE__ */ new Set([
-  "node_modules",
-  ".git",
-  ".hg",
-  ".svn",
-  ".turbo",
-  ".output",
-  ".next",
-  "dist",
-  "build"
-]);
-function findWorkspaceRoot(startDir) {
-  if (!startDir) {
+// src/tailwindcss/patcher-resolve.ts
+import { existsSync as existsSync2 } from "fs";
+import { createRequire } from "module";
+import path2 from "path";
+import process from "process";
+import { fileURLToPath } from "url";
+var GENERIC_RELATIVE_SPECIFIERS = [".", ".."];
+var DEFAULT_TAILWIND_CONFIG_SPECIFIERS = [
+  "stubs/config.full.js",
+  "defaultConfig.js"
+];
+var TAILWIND_CONFIG_FILES = [
+  "tailwind.config.js",
+  "tailwind.config.cjs",
+  "tailwind.config.mjs",
+  "tailwind.config.ts",
+  "tailwind.config.cts",
+  "tailwind.config.mts"
+];
+function isPathSpecifier(specifier) {
+  if (!specifier) {
+    return false;
+  }
+  if (specifier.startsWith("file://")) {
+    return true;
+  }
+  if (path2.isAbsolute(specifier)) {
+    return true;
+  }
+  return GENERIC_RELATIVE_SPECIFIERS.some((prefix) => specifier.startsWith(`${prefix}/`) || specifier.startsWith(`${prefix}\\`));
+}
+function resolveModuleFromPaths(specifier, paths) {
+  if (!specifier || isPathSpecifier(specifier) || paths.length === 0) {
     return void 0;
   }
-  let current = path.resolve(startDir);
-  while (true) {
-    const workspaceFile = path.join(current, "pnpm-workspace.yaml");
-    if (existsSync(workspaceFile)) {
-      return current;
-    }
-    const parent = path.dirname(current);
-    if (parent === current) {
-      return void 0;
-    }
-    current = parent;
+  try {
+    const req = createRequire(import.meta.url);
+    return req.resolve(specifier, { paths });
+  } catch {
+    return void 0;
   }
 }
-function findNearestPackageRoot(startDir) {
-  if (!startDir) {
+function resolveTailwindConfigFallback(packageName, paths) {
+  if (!packageName) {
     return void 0;
   }
-  let current = path.resolve(startDir);
-  while (true) {
-    const pkgPath = path.join(current, "package.json");
-    if (existsSync(pkgPath)) {
-      return current;
-    }
-    const parent = path.dirname(current);
-    if (parent === current) {
-      return void 0;
+  for (const suffix of DEFAULT_TAILWIND_CONFIG_SPECIFIERS) {
+    const candidate = `${packageName}/${suffix}`;
+    const resolved = resolveModuleFromPaths(candidate, paths);
+    if (resolved) {
+      return resolved;
     }
-    current = parent;
   }
+  return void 0;
 }
-function findWorkspacePackageDir(rootDir, packageName) {
-  const visited = /* @__PURE__ */ new Set();
-  const queue = [path.resolve(rootDir)];
-  while (queue.length > 0) {
-    const current = queue.shift();
-    const normalized = path.normalize(current);
-    if (visited.has(normalized)) {
-      continue;
-    }
-    visited.add(normalized);
-    try {
-      const pkgPath = path.join(normalized, "package.json");
-      if (existsSync(pkgPath)) {
-        const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
-        if (pkg?.name === packageName) {
-          return normalized;
-        }
+function appendNodeModules(paths, dir) {
+  if (!dir) {
+    return;
+  }
+  const nodeModulesDir = path2.join(dir, "node_modules");
+  if (existsSync2(nodeModulesDir)) {
+    paths.add(nodeModulesDir);
+  }
+}
+function findTailwindConfig(searchRoots) {
+  for (const root of searchRoots) {
+    for (const file of TAILWIND_CONFIG_FILES) {
+      const candidate = path2.resolve(root, file);
+      if (existsSync2(candidate)) {
+        return candidate;
       }
-    } catch {
     }
-    let entries;
-    try {
-      entries = readdirSync(normalized, { withFileTypes: true });
-    } catch {
-      continue;
+  }
+  return void 0;
+}
+function createDefaultResolvePaths(basedir) {
+  const paths = /* @__PURE__ */ new Set();
+  let fallbackCandidates = [];
+  if (basedir) {
+    const resolvedBase = path2.resolve(basedir);
+    appendNodeModules(paths, resolvedBase);
+    fallbackCandidates.push(resolvedBase);
+    const packageRoot = findNearestPackageRoot(resolvedBase);
+    if (packageRoot) {
+      appendNodeModules(paths, packageRoot);
+      fallbackCandidates.push(packageRoot);
     }
-    for (const entry of entries) {
-      if (!entry.isDirectory() || IGNORED_WORKSPACE_DIRS.has(entry.name) || entry.isSymbolicLink?.()) {
-        continue;
-      }
-      queue.push(path.join(normalized, entry.name));
+  }
+  const cwd = process.cwd();
+  appendNodeModules(paths, cwd);
+  try {
+    const modulePath = fileURLToPath(import.meta.url);
+    const candidate = existsSync2(modulePath) && !path2.extname(modulePath) ? modulePath : path2.dirname(modulePath);
+    paths.add(candidate);
+  } catch {
+    paths.add(import.meta.url);
+  }
+  if (paths.size === 0) {
+    fallbackCandidates = fallbackCandidates.filter(Boolean);
+    if (fallbackCandidates.length === 0) {
+      fallbackCandidates.push(cwd);
+    }
+    for (const candidate of fallbackCandidates) {
+      paths.add(candidate);
     }
   }
-  return void 0;
+  return [...paths];
 }
 
+// src/tailwindcss/v4/patcher.ts
+import { logger as logger4 } from "@weapp-tailwindcss/logger";
+
+// src/tailwindcss/patcher.ts
+import path3 from "path";
+import process2 from "process";
+import { logger as logger3 } from "@weapp-tailwindcss/logger";
+import { defuOverrideArray as defuOverrideArray2 } from "@weapp-tailwindcss/shared";
+import { TailwindcssPatcher } from "tailwindcss-patch";
+
 // src/tailwindcss/patcher-options.ts
 function normalizeExtendLengthUnits(value) {
   if (value === false) {
@@ -360,115 +469,6 @@ function toModernTailwindcssPatchOptions(options) {
   return normalized;
 }
 
-// src/tailwindcss/patcher-resolve.ts
-import { existsSync as existsSync2 } from "fs";
-import { createRequire } from "module";
-import path2 from "path";
-import process from "process";
-import { fileURLToPath } from "url";
-var GENERIC_RELATIVE_SPECIFIERS = [".", ".."];
-var DEFAULT_TAILWIND_CONFIG_SPECIFIERS = [
-  "stubs/config.full.js",
-  "defaultConfig.js"
-];
-var TAILWIND_CONFIG_FILES = [
-  "tailwind.config.js",
-  "tailwind.config.cjs",
-  "tailwind.config.mjs",
-  "tailwind.config.ts",
-  "tailwind.config.cts",
-  "tailwind.config.mts"
-];
-function isPathSpecifier(specifier) {
-  if (!specifier) {
-    return false;
-  }
-  if (specifier.startsWith("file://")) {
-    return true;
-  }
-  if (path2.isAbsolute(specifier)) {
-    return true;
-  }
-  return GENERIC_RELATIVE_SPECIFIERS.some((prefix) => specifier.startsWith(`${prefix}/`) || specifier.startsWith(`${prefix}\\`));
-}
-function resolveModuleFromPaths(specifier, paths) {
-  if (!specifier || isPathSpecifier(specifier) || paths.length === 0) {
-    return void 0;
-  }
-  try {
-    const req = createRequire(import.meta.url);
-    return req.resolve(specifier, { paths });
-  } catch {
-    return void 0;
-  }
-}
-function resolveTailwindConfigFallback(packageName, paths) {
-  if (!packageName) {
-    return void 0;
-  }
-  for (const suffix of DEFAULT_TAILWIND_CONFIG_SPECIFIERS) {
-    const candidate = `${packageName}/${suffix}`;
-    const resolved = resolveModuleFromPaths(candidate, paths);
-    if (resolved) {
-      return resolved;
-    }
-  }
-  return void 0;
-}
-function appendNodeModules(paths, dir) {
-  if (!dir) {
-    return;
-  }
-  const nodeModulesDir = path2.join(dir, "node_modules");
-  if (existsSync2(nodeModulesDir)) {
-    paths.add(nodeModulesDir);
-  }
-}
-function findTailwindConfig(searchRoots) {
-  for (const root of searchRoots) {
-    for (const file of TAILWIND_CONFIG_FILES) {
-      const candidate = path2.resolve(root, file);
-      if (existsSync2(candidate)) {
-        return candidate;
-      }
-    }
-  }
-  return void 0;
-}
-function createDefaultResolvePaths(basedir) {
-  const paths = /* @__PURE__ */ new Set();
-  let fallbackCandidates = [];
-  if (basedir) {
-    const resolvedBase = path2.resolve(basedir);
-    appendNodeModules(paths, resolvedBase);
-    fallbackCandidates.push(resolvedBase);
-    const packageRoot = findNearestPackageRoot(resolvedBase);
-    if (packageRoot) {
-      appendNodeModules(paths, packageRoot);
-      fallbackCandidates.push(packageRoot);
-    }
-  }
-  const cwd = process.cwd();
-  appendNodeModules(paths, cwd);
-  try {
-    const modulePath = fileURLToPath(import.meta.url);
-    const candidate = existsSync2(modulePath) && !path2.extname(modulePath) ? modulePath : path2.dirname(modulePath);
-    paths.add(candidate);
-  } catch {
-    paths.add(import.meta.url);
-  }
-  if (paths.size === 0) {
-    fallbackCandidates = fallbackCandidates.filter(Boolean);
-    if (fallbackCandidates.length === 0) {
-      fallbackCandidates.push(cwd);
-    }
-    for (const candidate of fallbackCandidates) {
-      paths.add(candidate);
-    }
-  }
-  return [...paths];
-}
-
 // src/tailwindcss/patcher.ts
 function createFallbackTailwindcssPatcher() {
   const packageInfo = {
@@ -507,6 +507,8 @@ function createFallbackTailwindcssPatcher() {
   };
 }
 var hasLoggedMissingTailwind = false;
+var TAILWINDCSS_NOT_FOUND_RE = /tailwindcss not found/i;
+var UNABLE_TO_LOCATE_TAILWINDCSS_RE = /unable to locate tailwind css package/i;
 function createTailwindcssPatcher(options) {
   const { basedir, cacheDir, supportCustomLengthUnitsPatch, tailwindcss, tailwindcssPatcherOptions } = options || {};
   const cache = {
@@ -580,7 +582,7 @@ function createTailwindcssPatcher(options) {
     const sourcePaths = customPaths ? existingResolve.paths : resolvePaths;
     resolvedTailwindOptions.resolve = {
       ...existingResolve,
-      paths: Array.from(new Set(sourcePaths))
+      paths: [...new Set(sourcePaths)]
     };
     logger3.debug("Tailwind resolve config %O", {
       packageName: resolvedTailwindOptions.packageName,
@@ -628,14 +630,14 @@ function createTailwindcssPatcher(options) {
     return new TailwindcssPatcher(resolvedOptions);
   } catch (error) {
     const searchPaths = resolvedOptions.tailwindcss?.resolve?.paths;
-    if (error instanceof Error && /tailwindcss not found/i.test(error.message)) {
+    if (error instanceof Error && TAILWINDCSS_NOT_FOUND_RE.test(error.message)) {
       if (!hasLoggedMissingTailwind) {
         logger3.warn("Tailwind CSS \u672A\u5B89\u88C5\uFF0C\u5DF2\u8DF3\u8FC7 Tailwind \u76F8\u5173\u8865\u4E01\u3002\u82E5\u9700\u4F7F\u7528 Tailwind \u80FD\u529B\uFF0C\u8BF7\u5B89\u88C5 tailwindcss\u3002");
         hasLoggedMissingTailwind = true;
       }
       return createFallbackTailwindcssPatcher();
     }
-    if (error instanceof Error && /unable to locate tailwind css package/i.test(error.message)) {
+    if (error instanceof Error && UNABLE_TO_LOCATE_TAILWINDCSS_RE.test(error.message)) {
       logger3.error('\u65E0\u6CD5\u5B9A\u4F4D Tailwind CSS \u5305 "%s"\uFF0C\u5DF2\u5C1D\u8BD5\u8DEF\u5F84: %O', resolvedOptions.tailwindcss?.packageName, searchPaths);
     }
     throw error;
@@ -944,7 +946,7 @@ function createPatcherForBase(baseDir, cssEntries, options) {
   packageCandidates.add(
     mergedTailwindOptions.packageName ?? configuredPackageName ?? "tailwindcss"
   );
-  const patchers = Array.from(packageCandidates).map((packageName) => {
+  const patchers = Array.from(packageCandidates, (packageName) => {
     const tailwindOptionsForPackage = {
       ...mergedTailwindOptions,
       packageName
@@ -1012,6 +1014,8 @@ function pickPackageEnvBasedir() {
   }
   return void 0;
 }
+var STACK_PAREN_RE = /\(([^)]+)\)/u;
+var STACK_AT_RE = /at\s+(\S.*)$/u;
 function detectCallerBasedir() {
   const stack = new Error("resolveTailwindcssBasedir stack probe").stack;
   if (!stack) {
@@ -1022,7 +1026,7 @@ function detectCallerBasedir() {
   }
   const lines = stack.split("\n");
   for (const line of lines) {
-    const match = line.match(/\(([^)]+)\)/u) ?? line.match(/at\s+(\S.*)$/u);
+    const match = line.match(STACK_PAREN_RE) ?? line.match(STACK_AT_RE);
     const location = match?.[1];
     if (!location) {
       continue;
@@ -1255,6 +1259,7 @@ export {
   findNearestPackageRoot,
   warnMissingCssEntries,
   applyV4CssCalcDefaults,
+  findTailwindConfig,
   resolveTailwindcssBasedir,
   createTailwindcssPatcherFromContext,
   logger

package/dist/{chunk-RM3SY4S4.mjs → chunk-JBM3HGHP.mjs}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-LICQ6EGN.mjs";
+} from "./chunk-QYZCRG7F.mjs";
 import {
   createDebug,
   ensureRuntimeClassSet,
   getCompilerContext,
   refreshTailwindRuntimeState
-} from "./chunk-E7775SFS.mjs";
+} from "./chunk-FZNYV7VH.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";
@@ -33,6 +33,10 @@ function createPlugins(options = {}) {
     refreshTailwindcssPatcher,
     onPatchCompleted: patchRecorderState.onPatchCompleted
   };
+  const defaultStyleHandlerOptionsCache = /* @__PURE__ */ new Map();
+  let cachedDefaultTemplateHandlerOptions;
+  let cachedDefaultTemplateRuntimeSet;
+  let cachedDefaultModuleGraphOptions;
   const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"];
   let runtimeSetInitialized = false;
   async function refreshRuntimeState(force) {
@@ -108,6 +112,15 @@ function createPlugins(options = {}) {
       }
     };
   }
+  function resolveModuleGraphOptions(moduleGraph) {
+    if (moduleGraph) {
+      return moduleGraph;
+    }
+    if (!cachedDefaultModuleGraphOptions) {
+      cachedDefaultModuleGraphOptions = createModuleGraphOptionsFor();
+    }
+    return cachedDefaultModuleGraphOptions;
+  }
   function createVinylTransform(handler) {
     return new Transform({
       objectMode: true,
@@ -121,6 +134,40 @@ function createPlugins(options = {}) {
       }
     });
   }
+  function resolveWxssHandlerOptions(options2) {
+    const majorVersion = runtimeState.twPatcher.majorVersion ?? "unknown";
+    if (!options2 || Object.keys(options2).length === 0) {
+      let cached = defaultStyleHandlerOptionsCache.get(majorVersion);
+      if (!cached) {
+        cached = {
+          isMainChunk: true,
+          majorVersion: runtimeState.twPatcher.majorVersion
+        };
+        defaultStyleHandlerOptionsCache.set(majorVersion, cached);
+      }
+      return cached;
+    }
+    return {
+      isMainChunk: true,
+      majorVersion: runtimeState.twPatcher.majorVersion,
+      ...options2
+    };
+  }
+  function resolveWxmlHandlerOptions(options2) {
+    if (!options2 || Object.keys(options2).length === 0) {
+      if (cachedDefaultTemplateRuntimeSet !== runtimeSet || !cachedDefaultTemplateHandlerOptions) {
+        cachedDefaultTemplateRuntimeSet = runtimeSet;
+        cachedDefaultTemplateHandlerOptions = {
+          runtimeSet
+        };
+      }
+      return cachedDefaultTemplateHandlerOptions;
+    }
+    return {
+      runtimeSet,
+      ...options2
+    };
+  }
   const transformWxss = (options2 = {}) => createVinylTransform(async (file) => {
     if (!file.contents) {
       return;
@@ -140,11 +187,7 @@ function createPlugins(options = {}) {
       },
       async transform() {
         await runtimeState.patchPromise;
-        const { css } = await styleHandler(rawSource, {
-          isMainChunk: true,
-          majorVersion: runtimeState.twPatcher.majorVersion,
-          ...options2
-        });
+        const { css } = await styleHandler(rawSource, resolveWxssHandlerOptions(options2));
         debug("css handle: %s", file.path);
         return {
           result: css
@@ -159,7 +202,7 @@ function createPlugins(options = {}) {
     await refreshRuntimeSet(false);
     await runtimeState.patchPromise;
     const filename = path.resolve(file.path);
-    const moduleGraph = options2.moduleGraph ?? createModuleGraphOptionsFor();
+    const moduleGraph = resolveModuleGraphOptions(options2.moduleGraph);
     const handlerOptions = {
       ...options2,
       filename,
@@ -211,10 +254,7 @@ function createPlugins(options = {}) {
       },
       async transform() {
         await runtimeState.patchPromise;
-        const code = await templateHandler(rawSource, {
-          runtimeSet,
-          ...options2
-        });
+        const code = await templateHandler(rawSource, resolveWxmlHandlerOptions(options2));
         debug("html handle: %s", file.path);
         return {
           result: code