weapp-tailwindcss 4.8.1 → 4.8.3

package/dist/{chunk-YW5YW5D4.mjs → chunk-7KTLLGAG.mjs}

@@ -3,19 +3,87 @@ import {
 } from "./chunk-ZNKIYZRQ.mjs";
 
 // src/context/tailwindcss.ts
+import { existsSync as existsSync3 } from "fs";
 import { createRequire as createRequire2 } from "module";
-import path2 from "path";
+import path3 from "path";
 import process2 from "process";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { logger as logger2 } 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 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/index.ts
 import { getPackageInfoSync } from "local-pkg";
 
 // src/tailwindcss/patcher.ts
-import { existsSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import { createRequire } from "module";
-import path from "path";
+import path2 from "path";
 import process from "process";
 import { fileURLToPath } from "url";
 import { logger } from "@weapp-tailwindcss/logger";
@@ -33,7 +101,7 @@ function isPathSpecifier(specifier) {
   if (specifier.startsWith("file://")) {
     return true;
   }
-  if (path.isAbsolute(specifier)) {
+  if (path2.isAbsolute(specifier)) {
     return true;
   }
   return GENERIC_RELATIVE_SPECIFIERS.some((prefix) => specifier.startsWith(`${prefix}/`) || specifier.startsWith(`${prefix}\\`));
@@ -103,13 +171,13 @@ function findNearestPackageRoot(startDir) {
   if (!startDir) {
     return void 0;
   }
-  let current = path.resolve(startDir);
+  let current = path2.resolve(startDir);
   while (true) {
-    const pkgPath = path.join(current, "package.json");
-    if (existsSync(pkgPath)) {
+    const pkgPath = path2.join(current, "package.json");
+    if (existsSync2(pkgPath)) {
       return current;
     }
-    const parent = path.dirname(current);
+    const parent = path2.dirname(current);
     if (parent === current) {
       return void 0;
     }
@@ -120,8 +188,8 @@ function appendNodeModules(paths, dir) {
   if (!dir) {
     return;
   }
-  const nodeModulesDir = path.join(dir, "node_modules");
-  if (existsSync(nodeModulesDir)) {
+  const nodeModulesDir = path2.join(dir, "node_modules");
+  if (existsSync2(nodeModulesDir)) {
     paths.add(nodeModulesDir);
   }
 }
@@ -136,8 +204,8 @@ var TAILWIND_CONFIG_FILES = [
 function findTailwindConfig(searchRoots) {
   for (const root of searchRoots) {
     for (const file of TAILWIND_CONFIG_FILES) {
-      const candidate = path.resolve(root, file);
-      if (existsSync(candidate)) {
+      const candidate = path2.resolve(root, file);
+      if (existsSync2(candidate)) {
         return candidate;
       }
     }
@@ -148,7 +216,7 @@ function createDefaultResolvePaths(basedir) {
   const paths = /* @__PURE__ */ new Set();
   let fallbackCandidates = [];
   if (basedir) {
-    const resolvedBase = path.resolve(basedir);
+    const resolvedBase = path2.resolve(basedir);
     appendNodeModules(paths, resolvedBase);
     fallbackCandidates.push(resolvedBase);
     const packageRoot = findNearestPackageRoot(resolvedBase);
@@ -161,7 +229,7 @@ function createDefaultResolvePaths(basedir) {
   appendNodeModules(paths, cwd);
   try {
     const modulePath = fileURLToPath(import.meta.url);
-    const candidate = existsSync(modulePath) && !path.extname(modulePath) ? modulePath : path.dirname(modulePath);
+    const candidate = existsSync2(modulePath) && !path2.extname(modulePath) ? modulePath : path2.dirname(modulePath);
     paths.add(candidate);
   } catch {
     paths.add(import.meta.url);
@@ -251,18 +319,18 @@ function normalizeTailwindcssPatcherOptions(options) {
 function createTailwindcssPatcher(options) {
   const { basedir, cacheDir, supportCustomLengthUnitsPatch, tailwindcss, tailwindcssPatcherOptions } = options || {};
   const cache = {};
-  const normalizedBasedir = basedir ? path.resolve(basedir) : void 0;
+  const normalizedBasedir = basedir ? path2.resolve(basedir) : void 0;
   const cacheRoot = findNearestPackageRoot(normalizedBasedir) ?? normalizedBasedir ?? process.cwd();
   if (cacheDir) {
-    if (path.isAbsolute(cacheDir)) {
+    if (path2.isAbsolute(cacheDir)) {
       cache.dir = cacheDir;
     } else if (normalizedBasedir) {
-      cache.dir = path.resolve(normalizedBasedir, cacheDir);
+      cache.dir = path2.resolve(normalizedBasedir, cacheDir);
     } else {
-      cache.dir = path.resolve(process.cwd(), cacheDir);
+      cache.dir = path2.resolve(process.cwd(), cacheDir);
     }
   } else {
-    cache.dir = path.join(cacheRoot, "node_modules", ".cache", "tailwindcss-patch");
+    cache.dir = path2.join(cacheRoot, "node_modules", ".cache", "tailwindcss-patch");
   }
   if (normalizedBasedir) {
     cache.cwd = normalizedBasedir;
@@ -339,7 +407,7 @@ function createTailwindcssPatcher(options) {
       searchRoots.add(resolvedOptions.tailwind.cwd);
     }
     for (const resolvePath of resolvedOptions.tailwind.resolve?.paths ?? []) {
-      const parentDir = path.dirname(resolvePath);
+      const parentDir = path2.dirname(resolvePath);
       searchRoots.add(parentDir);
     }
     const configPath = findTailwindConfig(searchRoots);
@@ -357,7 +425,7 @@ function createTailwindcssPatcher(options) {
       }
     }
     if (!resolvedOptions.tailwind.cwd && configPath) {
-      resolvedOptions.tailwind.cwd = path.dirname(configPath);
+      resolvedOptions.tailwind.cwd = path2.dirname(configPath);
     }
   }
   try {
@@ -401,7 +469,7 @@ function isModernTailwindcssPatchOptions(options) {
 function pickEnvBasedir() {
   for (const key of ENV_BASEDIR_KEYS) {
     const value = process2.env[key];
-    if (value && path2.isAbsolute(value)) {
+    if (value && path3.isAbsolute(value)) {
       return { key, value };
     }
   }
@@ -410,13 +478,13 @@ function pickEnvBasedir() {
 function pickPackageEnvBasedir() {
   const packageJsonPath = process2.env.npm_package_json;
   if (packageJsonPath) {
-    const packageDir = path2.dirname(packageJsonPath);
-    if (packageDir && path2.isAbsolute(packageDir)) {
+    const packageDir = path3.dirname(packageJsonPath);
+    if (packageDir && path3.isAbsolute(packageDir)) {
       return packageDir;
     }
   }
   const localPrefix = process2.env.npm_config_local_prefix;
-  if (localPrefix && path2.isAbsolute(localPrefix)) {
+  if (localPrefix && path3.isAbsolute(localPrefix)) {
     return localPrefix;
   }
   return void 0;
@@ -445,22 +513,22 @@ function detectCallerBasedir() {
       }
     }
     const [candidate] = filePath.split(":");
-    const resolvedPath = path2.isAbsolute(filePath) ? filePath : candidate;
-    if (!path2.isAbsolute(resolvedPath)) {
+    const resolvedPath = path3.isAbsolute(filePath) ? filePath : candidate;
+    if (!path3.isAbsolute(resolvedPath)) {
       continue;
     }
     if (resolvedPath.includes("node_modules") && resolvedPath.includes("weapp-tailwindcss")) {
       continue;
     }
     try {
-      return path2.dirname(resolvedPath);
+      return path3.dirname(resolvedPath);
     } catch {
       continue;
     }
   }
   return void 0;
 }
-function resolveTailwindcssBasedir(basedir) {
+function resolveTailwindcssBasedir(basedir, fallback) {
   const envBasedirResult = pickEnvBasedir();
   const envBasedir = envBasedirResult?.value;
   const envBasedirKey = envBasedirResult?.key;
@@ -468,7 +536,7 @@ function resolveTailwindcssBasedir(basedir) {
   const packageEnvBasedir = pickPackageEnvBasedir();
   const shouldDetectCaller = !envBasedir || envBasedirIsGeneric;
   const callerBasedir = shouldDetectCaller ? detectCallerBasedir() : void 0;
-  const anchor = envBasedir ?? packageEnvBasedir ?? callerBasedir ?? process2.cwd();
+  const anchor = envBasedir ?? packageEnvBasedir ?? fallback ?? callerBasedir ?? process2.cwd();
   if (process2.env.WEAPP_TW_DEBUG_STACK === "1") {
     logger2.debug("resolveTailwindcssBasedir anchor %O", {
       basedir,
@@ -476,6 +544,7 @@ function resolveTailwindcssBasedir(basedir) {
       envBasedirKey,
       envBasedirIsGeneric,
       packageEnvBasedir,
+      fallback,
       callerBasedir,
       npm_package_json: process2.env.npm_package_json,
       cwd: process2.cwd(),
@@ -483,43 +552,91 @@ function resolveTailwindcssBasedir(basedir) {
     });
   }
   if (basedir && basedir.trim().length > 0) {
-    if (path2.isAbsolute(basedir)) {
-      return path2.normalize(basedir);
+    if (path3.isAbsolute(basedir)) {
+      return path3.normalize(basedir);
     }
-    return path2.resolve(anchor, basedir);
+    return path3.resolve(anchor, basedir);
   }
   if (envBasedir && !envBasedirIsGeneric) {
-    return path2.normalize(envBasedir);
+    return path3.normalize(envBasedir);
+  }
+  if (fallback && fallback.trim().length > 0) {
+    const resolvedFallback = path3.isAbsolute(fallback) ? fallback : path3.resolve(anchor, fallback);
+    return path3.normalize(resolvedFallback);
   }
   if (packageEnvBasedir) {
-    return path2.normalize(packageEnvBasedir);
+    return path3.normalize(packageEnvBasedir);
   }
   if (callerBasedir) {
-    const normalizedCaller = path2.normalize(callerBasedir);
-    const librarySegment = `${path2.sep}weapp-tailwindcss${path2.sep}`;
+    const normalizedCaller = path3.normalize(callerBasedir);
+    const librarySegment = `${path3.sep}weapp-tailwindcss${path3.sep}`;
     if (!normalizedCaller.includes(librarySegment)) {
       return normalizedCaller;
     }
   }
-  if (envBasedir) {
-    return path2.normalize(envBasedir);
-  }
   const packageName = process2.env.PNPM_PACKAGE_NAME;
   if (packageName) {
     try {
-      const anchorRequire = createRequire2(path2.join(anchor, "__resolve_tailwindcss_basedir__.cjs"));
+      const anchorRequire = createRequire2(path3.join(anchor, "__resolve_tailwindcss_basedir__.cjs"));
       const packageJsonPath = anchorRequire.resolve(`${packageName}/package.json`);
       if (process2.env.WEAPP_TW_DEBUG_STACK === "1") {
         logger2.debug("package basedir resolved from PNPM_PACKAGE_NAME: %s", packageJsonPath);
       }
-      return path2.normalize(path2.dirname(packageJsonPath));
+      return path3.normalize(path3.dirname(packageJsonPath));
     } catch {
       if (process2.env.WEAPP_TW_DEBUG_STACK === "1") {
         logger2.debug("failed to resolve package json for %s", packageName);
       }
+      const workspaceRoot = findWorkspaceRoot(anchor);
+      if (workspaceRoot) {
+        const packageDir = findWorkspacePackageDir(workspaceRoot, packageName);
+        if (packageDir) {
+          return packageDir;
+        }
+      }
+    }
+  }
+  if (envBasedir) {
+    return path3.normalize(envBasedir);
+  }
+  return path3.normalize(process2.cwd());
+}
+function findNearestPackageRootFromDir(startDir) {
+  if (!startDir) {
+    return void 0;
+  }
+  let current = path3.resolve(startDir);
+  while (true) {
+    const pkgPath = path3.join(current, "package.json");
+    if (existsSync3(pkgPath)) {
+      return current;
+    }
+    const parent = path3.dirname(current);
+    if (parent === current) {
+      return void 0;
+    }
+    current = parent;
+  }
+}
+function guessBasedirFromEntries(entries) {
+  if (!entries) {
+    return void 0;
+  }
+  for (const entry of entries) {
+    if (typeof entry !== "string") {
+      continue;
+    }
+    const trimmed = entry.trim();
+    if (!trimmed || !path3.isAbsolute(trimmed)) {
+      continue;
+    }
+    const entryDir = path3.dirname(trimmed);
+    const resolved = findNearestPackageRootFromDir(entryDir) ?? entryDir;
+    if (resolved) {
+      return resolved;
     }
   }
-  return path2.normalize(process2.cwd());
+  return void 0;
 }
 function normalizeCssEntries(entries, anchor) {
   if (!entries || entries.length === 0) {
@@ -534,7 +651,7 @@ function normalizeCssEntries(entries, anchor) {
     if (trimmed.length === 0) {
       continue;
     }
-    const resolved = path2.isAbsolute(trimmed) ? path2.normalize(trimmed) : path2.normalize(path2.resolve(anchor, trimmed));
+    const resolved = path3.isAbsolute(trimmed) ? path3.normalize(trimmed) : path3.normalize(path3.resolve(anchor, trimmed));
     normalized.add(resolved);
   }
   return normalized.size > 0 ? [...normalized] : void 0;
@@ -542,7 +659,7 @@ function normalizeCssEntries(entries, anchor) {
 function groupCssEntriesByBase(entries) {
   const groups = /* @__PURE__ */ new Map();
   for (const entry of entries) {
-    const baseDir = path2.normalize(path2.dirname(entry));
+    const baseDir = path3.normalize(path3.dirname(entry));
     const bucket = groups.get(baseDir);
     if (bucket) {
       bucket.push(entry);
@@ -758,7 +875,8 @@ function createTailwindcssPatcherFromContext(ctx) {
     cssEntries: rawCssEntries,
     appType
   } = ctx;
-  const resolvedTailwindcssBasedir = resolveTailwindcssBasedir(tailwindcssBasedir);
+  const absoluteCssEntryBasedir = guessBasedirFromEntries(rawCssEntries);
+  const resolvedTailwindcssBasedir = resolveTailwindcssBasedir(tailwindcssBasedir, absoluteCssEntryBasedir);
   ctx.tailwindcssBasedir = resolvedTailwindcssBasedir;
   logger2.debug("tailwindcss basedir resolved: %s", resolvedTailwindcssBasedir);
   const normalizedCssEntries = normalizeCssEntries(rawCssEntries, resolvedTailwindcssBasedir);

package/dist/{chunk-MSFAEBH6.mjs → chunk-E3GZQTOH.mjs}

@@ -1,7 +1,7 @@
 import {
   applyTailwindcssCssImportRewrite,
   getCacheKey
-} from "./chunk-YHZB3KHY.mjs";
+} from "./chunk-KSHK56CW.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveOutputSpecifier,
@@ -18,13 +18,13 @@ import {
   getCompilerContext,
   pluginName,
   refreshTailwindRuntimeState
-} from "./chunk-TTCMOWCO.mjs";
+} from "./chunk-WTOLVORM.mjs";
 import {
   getGroupedEntries
 } from "./chunk-ZNKIYZRQ.mjs";
 import {
   __dirname
-} from "./chunk-BTPDRSHI.mjs";
+} from "./chunk-QGH4JZRW.mjs";
 
 // src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
 import fs from "fs";
@@ -82,20 +82,28 @@ var UnifiedWebpackPluginV5 = class {
     onLoad();
     const loader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-loader.js");
     const isExisted = fs.existsSync(loader);
-    const WeappTwRuntimeAopLoader = {
+    const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
+      pkgDir: weappTailwindcssPackageDir
+    } : void 0;
+    const runtimeLoaderOptions = {
+      getClassSet: getClassSetInLoader,
+      rewriteCssImports: runtimeLoaderRewriteOptions
+    };
+    const createRuntimeLoaderEntry = () => ({
       loader,
-      options: {
-        getClassSet: getClassSetInLoader
-      },
+      options: runtimeLoaderOptions,
       ident: null,
       type: null
-    };
+    });
     compiler.hooks.compilation.tap(pluginName, (compilation) => {
       NormalModule.getCompilationHooks(compilation).loader.tap(pluginName, (_loaderContext, module) => {
         if (isExisted) {
           const idx = module.loaders.findIndex((x) => x.loader.includes("postcss-loader"));
+          const runtimeLoaderEntry = createRuntimeLoaderEntry();
           if (idx > -1) {
-            module.loaders.unshift(WeappTwRuntimeAopLoader);
+            module.loaders.splice(idx + 1, 0, runtimeLoaderEntry);
+          } else {
+            module.loaders.push(runtimeLoaderEntry);
           }
         }
       });

package/dist/{chunk-U7OMIV3S.js → chunk-H34KPZQW.js}

@@ -1,11 +1,11 @@
 "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 _chunkXGRBCPBIjs = require('./chunk-XGRBCPBI.js');
+var _chunkUJIUFWXEjs = require('./chunk-UJIUFWXE.js');
 
 // src/utils/resolve-package.ts
 var _module = require('module');
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
-var require2 = _module.createRequire.call(void 0, _chunkXGRBCPBIjs.importMetaUrl);
+var require2 = _module.createRequire.call(void 0, _chunkUJIUFWXEjs.importMetaUrl);
 function resolvePackageDir(name) {
   const pkgPath = require2.resolve(`${name}/package.json`);
   return _path2.default.dirname(pkgPath);

package/dist/{chunk-YHZB3KHY.mjs → chunk-KSHK56CW.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-JW7P34IH.mjs";
 import {
   pluginName
-} from "./chunk-TTCMOWCO.mjs";
+} from "./chunk-WTOLVORM.mjs";
 
 // src/bundlers/webpack/shared/css-imports.ts
 var CSS_EXT_RE = /\.(?:css|scss|sass|less|styl|pcss)$/i;

package/dist/{chunk-QNGB574L.js → chunk-N2ZUYGKA.js}

@@ -7,7 +7,7 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
 
-var _chunkX7QD7NUXjs = require('./chunk-X7QD7NUX.js');
+var _chunkPLV4QGF4js = require('./chunk-PLV4QGF4.js');
 
 // src/bundlers/gulp/index.ts
 var _buffer = require('buffer');
@@ -15,21 +15,21 @@ 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 = _chunkX7QD7NUXjs.createDebug.call(void 0, );
+var debug = _chunkPLV4QGF4js.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunkX7QD7NUXjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkPLV4QGF4js.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
   let runtimeSet = /* @__PURE__ */ new Set();
   const runtimeState = {
     twPatcher: initialTwPatcher,
-    patchPromise: _chunkX7QD7NUXjs.createTailwindPatchPromise.call(void 0, initialTwPatcher),
+    patchPromise: _chunkPLV4QGF4js.createTailwindPatchPromise.call(void 0, initialTwPatcher),
     refreshTailwindcssPatcher
   };
   const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"];
   let runtimeSetInitialized = false;
   async function refreshRuntimeState(force) {
-    await _chunkX7QD7NUXjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+    await _chunkPLV4QGF4js.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
   }
   async function refreshRuntimeSet(force = false) {
     await refreshRuntimeState(force);
@@ -37,7 +37,7 @@ function createPlugins(options = {}) {
     if (!force && runtimeSetInitialized && runtimeSet.size > 0) {
       return runtimeSet;
     }
-    runtimeSet = await _chunkX7QD7NUXjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force, skipRefresh: force });
+    runtimeSet = await _chunkPLV4QGF4js.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force, skipRefresh: force });
     runtimeSetInitialized = true;
     return runtimeSet;
   }

package/dist/{chunk-3RXY3OXF.mjs → chunk-NLLCK6RM.mjs}

@@ -7,7 +7,7 @@ import {
   createTailwindPatchPromise,
   getCompilerContext,
   refreshTailwindRuntimeState
-} from "./chunk-TTCMOWCO.mjs";
+} from "./chunk-WTOLVORM.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";