weapp-tailwindcss 4.8.4 → 4.8.5

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

@@ -3,7 +3,6 @@ import {
 } from "./chunk-ZNKIYZRQ.mjs";
 
 // src/context/tailwindcss.ts
-import { existsSync as existsSync3 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import path3 from "path";
 import process2 from "process";
@@ -41,6 +40,23 @@ function findWorkspaceRoot(startDir) {
     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)];
@@ -167,23 +183,6 @@ function createFallbackTailwindcssPatcher() {
   };
 }
 var hasLoggedMissingTailwind = false;
-function findNearestPackageRoot(startDir) {
-  if (!startDir) {
-    return void 0;
-  }
-  let current = path2.resolve(startDir);
-  while (true) {
-    const pkgPath = path2.join(current, "package.json");
-    if (existsSync2(pkgPath)) {
-      return current;
-    }
-    const parent = path2.dirname(current);
-    if (parent === current) {
-      return void 0;
-    }
-    current = parent;
-  }
-}
 function appendNodeModules(paths, dir) {
   if (!dir) {
     return;
@@ -446,6 +445,11 @@ function createTailwindcssPatcher(options) {
   }
 }
 
+// src/tailwindcss/index.ts
+function getTailwindcssPackageInfo(options) {
+  return getPackageInfoSync("tailwindcss", options);
+}
+
 // src/context/tailwindcss.ts
 var ENV_BASEDIR_KEYS = [
   "WEAPP_TAILWINDCSS_BASEDIR",
@@ -536,7 +540,9 @@ function resolveTailwindcssBasedir(basedir, fallback) {
   const packageEnvBasedir = pickPackageEnvBasedir();
   const shouldDetectCaller = !envBasedir || envBasedirIsGeneric;
   const callerBasedir = shouldDetectCaller ? detectCallerBasedir() : void 0;
-  const anchor = envBasedir ?? packageEnvBasedir ?? fallback ?? callerBasedir ?? process2.cwd();
+  const cwd = process2.cwd();
+  const anchor = envBasedir ?? packageEnvBasedir ?? fallback ?? callerBasedir ?? cwd;
+  const resolveRelative = (value) => path3.isAbsolute(value) ? path3.normalize(value) : path3.normalize(path3.resolve(anchor, value));
   if (process2.env.WEAPP_TW_DEBUG_STACK === "1") {
     logger2.debug("resolveTailwindcssBasedir anchor %O", {
       basedir,
@@ -547,22 +553,18 @@ function resolveTailwindcssBasedir(basedir, fallback) {
       fallback,
       callerBasedir,
       npm_package_json: process2.env.npm_package_json,
-      cwd: process2.cwd(),
+      cwd,
       anchor
     });
   }
   if (basedir && basedir.trim().length > 0) {
-    if (path3.isAbsolute(basedir)) {
-      return path3.normalize(basedir);
-    }
-    return path3.resolve(anchor, basedir);
+    return resolveRelative(basedir);
   }
   if (envBasedir && !envBasedirIsGeneric) {
     return path3.normalize(envBasedir);
   }
   if (fallback && fallback.trim().length > 0) {
-    const resolvedFallback = path3.isAbsolute(fallback) ? fallback : path3.resolve(anchor, fallback);
-    return path3.normalize(resolvedFallback);
+    return resolveRelative(fallback);
   }
   if (packageEnvBasedir) {
     return path3.normalize(packageEnvBasedir);
@@ -599,24 +601,7 @@ function resolveTailwindcssBasedir(basedir, fallback) {
   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;
-  }
+  return path3.normalize(cwd);
 }
 function guessBasedirFromEntries(entries) {
   if (!entries) {
@@ -631,7 +616,7 @@ function guessBasedirFromEntries(entries) {
       continue;
     }
     const entryDir = path3.dirname(trimmed);
-    const resolved = findNearestPackageRootFromDir(entryDir) ?? entryDir;
+    const resolved = findNearestPackageRoot(entryDir) ?? entryDir;
     if (resolved) {
       return resolved;
     }
@@ -656,10 +641,37 @@ function normalizeCssEntries(entries, anchor) {
   }
   return normalized.size > 0 ? [...normalized] : void 0;
 }
-function groupCssEntriesByBase(entries) {
+function isSubPath(parent, child) {
+  if (!parent || !child) {
+    return false;
+  }
+  const relative = path3.relative(parent, child);
+  return relative === "" || !relative.startsWith("..") && !path3.isAbsolute(relative);
+}
+function resolveCssEntryBase(entryDir, options) {
+  const normalizedDir = path3.normalize(entryDir);
+  const { preferredBaseDir, workspaceRoot } = options;
+  if (preferredBaseDir && isSubPath(preferredBaseDir, normalizedDir)) {
+    return preferredBaseDir;
+  }
+  if (workspaceRoot && isSubPath(workspaceRoot, normalizedDir)) {
+    return workspaceRoot;
+  }
+  const packageRoot = findNearestPackageRoot(normalizedDir);
+  if (packageRoot) {
+    return path3.normalize(packageRoot);
+  }
+  return normalizedDir;
+}
+function groupCssEntriesByBase(entries, options = {}) {
+  const normalizedOptions = {
+    preferredBaseDir: options.preferredBaseDir ? path3.normalize(options.preferredBaseDir) : void 0,
+    workspaceRoot: options.workspaceRoot ? path3.normalize(options.workspaceRoot) : void 0
+  };
   const groups = /* @__PURE__ */ new Map();
   for (const entry of entries) {
-    const baseDir = path3.normalize(path3.dirname(entry));
+    const entryDir = path3.dirname(entry);
+    const baseDir = resolveCssEntryBase(entryDir, normalizedOptions);
     const bucket = groups.get(baseDir);
     if (bucket) {
       bucket.push(entry);
@@ -889,7 +901,11 @@ function createTailwindcssPatcherFromContext(ctx) {
     supportCustomLengthUnitsPatch,
     appType
   };
-  const groupedCssEntries = normalizedCssEntries ? groupCssEntriesByBase(normalizedCssEntries) : void 0;
+  const workspaceRoot = findWorkspaceRoot(resolvedTailwindcssBasedir) ?? (absoluteCssEntryBasedir ? findWorkspaceRoot(absoluteCssEntryBasedir) : void 0);
+  const groupedCssEntries = normalizedCssEntries ? groupCssEntriesByBase(normalizedCssEntries, {
+    preferredBaseDir: resolvedTailwindcssBasedir,
+    workspaceRoot
+  }) : void 0;
   const multiPatcher = groupedCssEntries ? tryCreateMultiTailwindcssPatcher(groupedCssEntries, patcherOptions) : void 0;
   if (multiPatcher) {
     return multiPatcher;
@@ -909,7 +925,14 @@ function createTailwindcssPatcherFromContext(ctx) {
   );
 }
 
+// src/logger/index.ts
+import { logger as logger3 } from "@weapp-tailwindcss/logger";
+
 export {
+  findWorkspaceRoot,
+  findNearestPackageRoot,
+  getTailwindcssPackageInfo,
   resolveTailwindcssBasedir,
-  createTailwindcssPatcherFromContext
+  createTailwindcssPatcherFromContext,
+  logger3 as logger
 };

package/dist/{chunk-JMYADIPN.mjs → chunk-67CD2S5L.mjs}

@@ -1,4 +1,4 @@
-// ../../node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.53.1_@types+node@24.10.1__@swc+core@1.15.3_@swc+h_9054a2496b61d5cb5fe8cf4fe2f0b0d1/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.53.1_@types+node@24.10.1__@swc+core@1.15.3_@swc+h_5a981c295142658a01fde01f36b7c0a8/node_modules/tsup/assets/esm_shims.js
 import path from "path";
 import { fileURLToPath } from "url";
 var getFilename = () => fileURLToPath(import.meta.url);

package/dist/{chunk-6EATUPTN.js → chunk-6CS6EPEP.js}

@@ -1,24 +1,26 @@
 "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 _chunk47NJZTIWjs = require('./chunk-47NJZTIW.js');
+var _chunkTWBCI2I3js = require('./chunk-TWBCI2I3.js');
 
 
 
 
 
-var _chunkK234IGOTjs = require('./chunk-K234IGOT.js');
+var _chunkAB45L5FPjs = require('./chunk-AB45L5FP.js');
 
 
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
+var _chunkFVSKLXO5js = require('./chunk-FVSKLXO5.js');
 
 
 
 
 
-var _chunkAXEKXGG7js = require('./chunk-AXEKXGG7.js');
+
+var _chunkP6ACVBPQjs = require('./chunk-P6ACVBPQ.js');
 
 
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
@@ -27,11 +29,11 @@ var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
 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 debug = _chunkAXEKXGG7js.createDebug.call(void 0, );
-var weappTailwindcssPackageDir = _chunkK234IGOTjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
+var debug = _chunkP6ACVBPQjs.createDebug.call(void 0, );
+var weappTailwindcssPackageDir = _chunkAB45L5FPjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var UnifiedWebpackPluginV5 = class {
   constructor(options = {}) {
-    this.options = _chunkAXEKXGG7js.getCompilerContext.call(void 0, options);
+    this.options = _chunkP6ACVBPQjs.getCompilerContext.call(void 0, options);
     this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
     this.appType = this.options.appType;
   }
@@ -56,25 +58,30 @@ var UnifiedWebpackPluginV5 = class {
     }
     const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4);
     if (shouldRewriteCssImports) {
-      _chunk47NJZTIWjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+      _chunkTWBCI2I3js.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
         pkgDir: weappTailwindcssPackageDir,
         enabled: true
       });
     }
+    const patchRecorderState = _chunkFVSKLXO5js.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
+      source: "runtime",
+      cwd: _nullishCoalesce(this.options.tailwindcssBasedir, () => ( _process2.default.cwd()))
+    });
     const runtimeState = {
       twPatcher: initialTwPatcher,
-      patchPromise: _chunkAXEKXGG7js.createTailwindPatchPromise.call(void 0, initialTwPatcher),
-      refreshTailwindcssPatcher
+      patchPromise: patchRecorderState.patchPromise,
+      refreshTailwindcssPatcher,
+      onPatchCompleted: patchRecorderState.onPatchCompleted
     };
     const refreshRuntimeState = async (force) => {
-      await _chunkAXEKXGG7js.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+      await _chunkP6ACVBPQjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
     };
     const { Compilation, sources, NormalModule } = compiler.webpack;
     const { ConcatSource } = sources;
     async function getClassSetInLoader() {
       await refreshRuntimeState(true);
       await runtimeState.patchPromise;
-      await _chunkAXEKXGG7js.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+      await _chunkP6ACVBPQjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
     }
     onLoad();
     const loader = _nullishCoalesce(runtimeLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-runtime-loader.js")));
@@ -92,8 +99,8 @@ var UnifiedWebpackPluginV5 = class {
       ident: null,
       type: null
     });
-    compiler.hooks.compilation.tap(_chunkAXEKXGG7js.pluginName, (compilation) => {
-      NormalModule.getCompilationHooks(compilation).loader.tap(_chunkAXEKXGG7js.pluginName, (_loaderContext, module) => {
+    compiler.hooks.compilation.tap(_chunkP6ACVBPQjs.pluginName, (compilation) => {
+      NormalModule.getCompilationHooks(compilation).loader.tap(_chunkP6ACVBPQjs.pluginName, (_loaderContext, module) => {
         if (isExisted) {
           const idx = module.loaders.findIndex((x) => x.loader.includes("postcss-loader"));
           const runtimeLoaderEntry = createRuntimeLoaderEntry();
@@ -106,7 +113,7 @@ var UnifiedWebpackPluginV5 = class {
       });
       compilation.hooks.processAssets.tapPromise(
         {
-          name: _chunkAXEKXGG7js.pluginName,
+          name: _chunkP6ACVBPQjs.pluginName,
           stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
         },
         async (assets) => {
@@ -124,13 +131,13 @@ var UnifiedWebpackPluginV5 = class {
           const jsAssets = /* @__PURE__ */ new Map();
           for (const [file] of entries) {
             if (this.options.jsMatcher(file) || this.options.wxsMatcher(file)) {
-              const absolute = _chunkK234IGOTjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absolute = _chunkAB45L5FPjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               jsAssets.set(absolute, file);
             }
           }
           const moduleGraphOptions = {
             resolve(specifier, importer) {
-              return _chunkK234IGOTjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
+              return _chunkAB45L5FPjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
             },
             load: (id) => {
               const assetName = jsAssets.get(id);
@@ -175,7 +182,7 @@ var UnifiedWebpackPluginV5 = class {
           const groupedEntries = _chunkUW3WHSZ5js.getGroupedEntries.call(void 0, entries, this.options);
           await refreshRuntimeState(true);
           await runtimeState.patchPromise;
-          const runtimeSet = await _chunkAXEKXGG7js.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+          const runtimeSet = await _chunkP6ACVBPQjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
           debug("get runtimeSet, class count: %d", runtimeSet.size);
           const tasks = [];
           if (Array.isArray(groupedEntries.html)) {
@@ -212,12 +219,12 @@ var UnifiedWebpackPluginV5 = class {
           const jsTaskFactories = [];
           if (Array.isArray(groupedEntries.js)) {
             for (const [file] of groupedEntries.js) {
-              const cacheKey = _chunk47NJZTIWjs.getCacheKey.call(void 0, file);
+              const cacheKey = _chunkTWBCI2I3js.getCacheKey.call(void 0, file);
               const asset = compilation.getAsset(file);
               if (!asset) {
                 continue;
               }
-              const absoluteFile = _chunkK234IGOTjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absoluteFile = _chunkAB45L5FPjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               const initialSource = asset.source.source();
               const initialRawSource = typeof initialSource === "string" ? initialSource : initialSource.toString();
               jsTaskFactories.push(async () => {
@@ -292,7 +299,7 @@ var UnifiedWebpackPluginV5 = class {
               );
             }
           }
-          _chunkK234IGOTjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
+          _chunkAB45L5FPjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
           await Promise.all(tasks);
           debug("end");
           onEnd();

package/dist/{chunk-K234IGOT.js → chunk-AB45L5FP.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 _chunkWGLBMNPGjs = require('./chunk-WGLBMNPG.js');
+var _chunkUTZLVU3Mjs = require('./chunk-UTZLVU3M.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, _chunkWGLBMNPGjs.importMetaUrl);
+var require2 = _module.createRequire.call(void 0, _chunkUTZLVU3Mjs.importMetaUrl);
 function resolvePackageDir(name) {
   const pkgPath = require2.resolve(`${name}/package.json`);
   return _path2.default.dirname(pkgPath);

package/dist/{chunk-IHJU6M6B.mjs → chunk-FE63QKGM.mjs}

@@ -1,7 +1,7 @@
 import {
   applyTailwindcssCssImportRewrite,
   getCacheKey
-} from "./chunk-KSHK56CW.mjs";
+} from "./chunk-PSYJXCQJ.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveOutputSpecifier,
@@ -11,20 +11,22 @@ import {
 import {
   processCachedTask
 } from "./chunk-RRHPTTCP.mjs";
+import {
+  setupPatchRecorder
+} from "./chunk-SFQCTDJA.mjs";
 import {
   collectRuntimeClassSet,
   createDebug,
-  createTailwindPatchPromise,
   getCompilerContext,
   pluginName,
   refreshTailwindRuntimeState
-} from "./chunk-WTOLVORM.mjs";
+} from "./chunk-K62QTSOE.mjs";
 import {
   getGroupedEntries
 } from "./chunk-ZNKIYZRQ.mjs";
 import {
   __dirname
-} from "./chunk-JMYADIPN.mjs";
+} from "./chunk-67CD2S5L.mjs";
 
 // src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
 import fs from "fs";
@@ -64,10 +66,15 @@ var UnifiedWebpackPluginV5 = class {
         enabled: true
       });
     }
+    const patchRecorderState = setupPatchRecorder(initialTwPatcher, this.options.tailwindcssBasedir, {
+      source: "runtime",
+      cwd: this.options.tailwindcssBasedir ?? process.cwd()
+    });
     const runtimeState = {
       twPatcher: initialTwPatcher,
-      patchPromise: createTailwindPatchPromise(initialTwPatcher),
-      refreshTailwindcssPatcher
+      patchPromise: patchRecorderState.patchPromise,
+      refreshTailwindcssPatcher,
+      onPatchCompleted: patchRecorderState.onPatchCompleted
     };
     const refreshRuntimeState = async (force) => {
       await refreshTailwindRuntimeState(runtimeState, force);

package/dist/chunk-FVSKLXO5.js

@@ -0,0 +1,29 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); 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 _chunkP6ACVBPQjs = require('./chunk-P6ACVBPQ.js');
+
+
+var _chunkRJRLVYVJjs = require('./chunk-RJRLVYVJ.js');
+
+// src/tailwindcss/recorder.ts
+function setupPatchRecorder(patcher, baseDir, options) {
+  const recorder = _chunkP6ACVBPQjs.createPatchTargetRecorder.call(void 0, baseDir, patcher, options);
+  if (_optionalChain([recorder, 'optionalAccess', _ => _.message]) && _optionalChain([options, 'optionalAccess', _2 => _2.logMessage]) !== false) {
+    const prefix = _optionalChain([options, 'optionalAccess', _3 => _3.messagePrefix]) ? `${options.messagePrefix} ` : "";
+    _chunkRJRLVYVJjs.logger.info("%s%s", prefix, recorder.message);
+  }
+  const onPatchCompleted = _optionalChain([recorder, 'optionalAccess', _4 => _4.onPatched]) ? async () => {
+    await recorder.onPatched();
+  } : void 0;
+  const patchPromise = patcher ? _chunkP6ACVBPQjs.createTailwindPatchPromise.call(void 0, patcher, onPatchCompleted) : Promise.resolve();
+  return {
+    recorder,
+    patchPromise,
+    onPatchCompleted
+  };
+}
+
+
+
+exports.setupPatchRecorder = setupPatchRecorder;