weapp-tailwindcss 4.7.0 → 4.7.2

package/dist/{chunk-Q5TPAJI4.js → chunk-2SI3KT2H.js}

@@ -4,10 +4,11 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
 
-var _chunkFB5P4TRHjs = require('./chunk-FB5P4TRH.js');
 
+var _chunkBUMQQPAOjs = require('./chunk-BUMQQPAO.js');
 
-var _chunkW3JU6K3Tjs = require('./chunk-W3JU6K3T.js');
+
+var _chunkFPDJ3BCMjs = require('./chunk-FPDJ3BCM.js');
 
 // src/bundlers/gulp/index.ts
 var _buffer = require('buffer');
@@ -15,13 +16,13 @@ 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 = _chunkFB5P4TRHjs.createDebug.call(void 0, );
+var debug = _chunkBUMQQPAOjs.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunkW3JU6K3Tjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkFPDJ3BCMjs.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher } = opts;
   let runtimeSet = /* @__PURE__ */ new Set();
-  const patchPromise = Promise.resolve(twPatcher.patch());
+  const patchPromise = _chunkBUMQQPAOjs.createTailwindPatchPromise.call(void 0, twPatcher);
   const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"];
   let runtimeSetInitialized = false;
   async function refreshRuntimeSet(force = false) {
@@ -29,7 +30,7 @@ function createPlugins(options = {}) {
     if (!force && runtimeSetInitialized && runtimeSet.size > 0) {
       return runtimeSet;
     }
-    runtimeSet = await _chunkFB5P4TRHjs.collectRuntimeClassSet.call(void 0, twPatcher);
+    runtimeSet = await _chunkBUMQQPAOjs.collectRuntimeClassSet.call(void 0, twPatcher, { force });
     runtimeSetInitialized = true;
     return runtimeSet;
   }

package/dist/{chunk-IY2OKZE6.mjs → chunk-3ARXMTWC.mjs}

@@ -243,25 +243,29 @@ function normalizeTailwindcssPatcherOptions(options) {
 function createTailwindcssPatcher(options) {
   const { basedir, cacheDir, supportCustomLengthUnitsPatch, tailwindcss, tailwindcssPatcherOptions } = options || {};
   const cache = {};
+  const normalizedBasedir = basedir ? path.resolve(basedir) : void 0;
+  const cacheRoot = findNearestPackageRoot(normalizedBasedir) ?? normalizedBasedir ?? process.cwd();
   if (cacheDir) {
     if (path.isAbsolute(cacheDir)) {
       cache.dir = cacheDir;
-    } else if (basedir) {
-      cache.dir = path.resolve(basedir, cacheDir);
+    } else if (normalizedBasedir) {
+      cache.dir = path.resolve(normalizedBasedir, cacheDir);
     } else {
       cache.dir = path.resolve(process.cwd(), cacheDir);
     }
+  } else {
+    cache.dir = path.join(cacheRoot, "node_modules", ".cache", "tailwindcss-patch");
   }
-  if (basedir) {
-    cache.cwd = basedir;
+  if (normalizedBasedir) {
+    cache.cwd = normalizedBasedir;
   }
-  const resolvePaths = createDefaultResolvePaths(cache.cwd ?? basedir ?? process.cwd());
+  const resolvePaths = createDefaultResolvePaths(cache.cwd ?? normalizedBasedir ?? process.cwd());
   const normalizedUserOptions = normalizeTailwindcssPatcherOptions(tailwindcssPatcherOptions);
   const extendLengthUnits = normalizeExtendLengthUnits(supportCustomLengthUnitsPatch);
   const baseTailwindOptions = defuOverrideArray2(
     tailwindcss ?? {},
     {
-      cwd: basedir,
+      cwd: normalizedBasedir,
       resolve: {
         paths: resolvePaths
       }
@@ -287,7 +291,7 @@ function createTailwindcssPatcher(options) {
     }
   }
   const baseOptions = {
-    cwd: basedir,
+    cwd: normalizedBasedir,
     cache,
     tailwind: baseTailwindOptions,
     features: {
@@ -380,6 +384,12 @@ var ENV_BASEDIR_KEYS = [
   "PWD"
 ];
 var GENERIC_ENV_BASEDIR_KEYS = /* @__PURE__ */ new Set(["INIT_CWD", "PWD"]);
+function isLegacyTailwindcssPatcherOptions(options) {
+  return typeof options === "object" && options !== null && "patch" in options;
+}
+function isModernTailwindcssPatchOptions(options) {
+  return typeof options === "object" && options !== null && !("patch" in options);
+}
 function pickEnvBasedir() {
   for (const key of ENV_BASEDIR_KEYS) {
     const value = process2.env[key];
@@ -538,7 +548,7 @@ function overrideTailwindcssPatcherOptionsForBase(options, baseDir, cssEntries)
   if (!options) {
     return options;
   }
-  if ("patch" in options) {
+  if (isLegacyTailwindcssPatcherOptions(options)) {
     const patchOptions = options.patch;
     if (!patchOptions) {
       return options;
@@ -563,6 +573,9 @@ function overrideTailwindcssPatcherOptionsForBase(options, baseDir, cssEntries)
       patch: nextPatch
     };
   }
+  if (!isModernTailwindcssPatchOptions(options)) {
+    return options;
+  }
   if (!options.tailwind) {
     return options;
   }

package/dist/{chunk-D7SF52F6.mjs → chunk-5BW6X6AJ.mjs}

@@ -2,20 +2,22 @@ import {
   getCacheKey
 } from "./chunk-2F7HOQQY.mjs";
 import {
+  pushConcurrentTaskFactories,
   resolveOutputSpecifier,
   toAbsoluteOutputPath
-} from "./chunk-34T2BFTJ.mjs";
+} from "./chunk-KZUIVLPP.mjs";
 import {
   processCachedTask
 } from "./chunk-RRHPTTCP.mjs";
 import {
   collectRuntimeClassSet,
-  createDebug
-} from "./chunk-YPBRGP6K.mjs";
+  createDebug,
+  createTailwindPatchPromise
+} from "./chunk-667CYXAH.mjs";
 import {
   getCompilerContext,
   pluginName
-} from "./chunk-7TKAJ3P6.mjs";
+} from "./chunk-JYCQWWYU.mjs";
 import {
   getGroupedEntries
 } from "./chunk-ZNKIYZRQ.mjs";
@@ -51,12 +53,12 @@ var UnifiedWebpackPluginV5 = class {
     if (disabled) {
       return;
     }
-    const patchPromise = Promise.resolve(twPatcher.patch());
+    const patchPromise = createTailwindPatchPromise(twPatcher);
     const { Compilation, sources, NormalModule } = compiler.webpack;
     const { ConcatSource } = sources;
     async function getClassSetInLoader() {
       await patchPromise;
-      await collectRuntimeClassSet(twPatcher);
+      await collectRuntimeClassSet(twPatcher, { force: true });
     }
     onLoad();
     const loader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-loader.js");
@@ -147,7 +149,7 @@ var UnifiedWebpackPluginV5 = class {
             }
           };
           const groupedEntries = getGroupedEntries(entries, this.options);
-          const runtimeSet = await collectRuntimeClassSet(twPatcher);
+          const runtimeSet = await collectRuntimeClassSet(twPatcher, { force: true });
           debug("get runtimeSet, class count: %d", runtimeSet.size);
           const tasks = [];
           if (Array.isArray(groupedEntries.html)) {
@@ -181,6 +183,7 @@ var UnifiedWebpackPluginV5 = class {
               );
             }
           }
+          const jsTaskFactories = [];
           if (Array.isArray(groupedEntries.js)) {
             for (const [file] of groupedEntries.js) {
               const cacheKey = getCacheKey(file);
@@ -191,35 +194,37 @@ var UnifiedWebpackPluginV5 = class {
               const absoluteFile = toAbsoluteOutputPath(file, outputDir);
               const initialSource = asset.source.source();
               const initialRawSource = typeof initialSource === "string" ? initialSource : initialSource.toString();
-              await processCachedTask({
-                cache,
-                cacheKey,
-                rawSource: initialRawSource,
-                applyResult(source) {
-                  compilation.updateAsset(file, source);
-                },
-                onCacheHit() {
-                  debug("js cache hit: %s", file);
-                },
-                transform: async () => {
-                  const currentAsset = compilation.getAsset(file);
-                  const currentSourceValue = currentAsset?.source.source();
-                  const currentSource = typeof currentSourceValue === "string" ? currentSourceValue : currentSourceValue?.toString() ?? "";
-                  const { code, linked } = await jsHandler(currentSource, runtimeSet, {
-                    filename: absoluteFile,
-                    moduleGraph: moduleGraphOptions,
-                    babelParserOptions: {
-                      sourceFilename: absoluteFile
-                    }
-                  });
-                  const source = new ConcatSource(code);
-                  onUpdate(file, currentSource, code);
-                  debug("js handle: %s", file);
-                  applyLinkedResults(linked);
-                  return {
-                    result: source
-                  };
-                }
+              jsTaskFactories.push(async () => {
+                await processCachedTask({
+                  cache,
+                  cacheKey,
+                  rawSource: initialRawSource,
+                  applyResult(source) {
+                    compilation.updateAsset(file, source);
+                  },
+                  onCacheHit() {
+                    debug("js cache hit: %s", file);
+                  },
+                  transform: async () => {
+                    const currentAsset = compilation.getAsset(file);
+                    const currentSourceValue = currentAsset?.source.source();
+                    const currentSource = typeof currentSourceValue === "string" ? currentSourceValue : currentSourceValue?.toString() ?? "";
+                    const { code, linked } = await jsHandler(currentSource, runtimeSet, {
+                      filename: absoluteFile,
+                      moduleGraph: moduleGraphOptions,
+                      babelParserOptions: {
+                        sourceFilename: absoluteFile
+                      }
+                    });
+                    const source = new ConcatSource(code);
+                    onUpdate(file, currentSource, code);
+                    debug("js handle: %s", file);
+                    applyLinkedResults(linked);
+                    return {
+                      result: source
+                    };
+                  }
+                });
               });
             }
           }
@@ -261,6 +266,7 @@ var UnifiedWebpackPluginV5 = class {
               );
             }
           }
+          pushConcurrentTaskFactories(tasks, jsTaskFactories);
           await Promise.all(tasks);
           debug("end");
           onEnd();

package/dist/chunk-667CYXAH.mjs

@@ -0,0 +1,133 @@
+// src/tailwindcss/runtime.ts
+import { statSync } from "fs";
+
+// src/debug/index.ts
+import _createDebug from "debug";
+var _debug = _createDebug("weapp-tw");
+function createDebug(prefix) {
+  function debug2(formatter, ...args) {
+    return _debug((prefix ?? "") + formatter, ...args);
+  }
+  return debug2;
+}
+
+// src/tailwindcss/runtime.ts
+var debug = createDebug("[tailwindcss:runtime] ");
+var runtimeClassSetCache = /* @__PURE__ */ new WeakMap();
+function getCacheEntry(twPatcher) {
+  let entry = runtimeClassSetCache.get(twPatcher);
+  if (!entry) {
+    entry = {};
+    runtimeClassSetCache.set(twPatcher, entry);
+  }
+  return entry;
+}
+function getTailwindConfigSignature(twPatcher) {
+  const configPath = twPatcher.options?.tailwind?.config;
+  if (typeof configPath !== "string" || configPath.length === 0) {
+    return void 0;
+  }
+  try {
+    const stats = statSync(configPath);
+    return `${configPath}:${stats.size}:${stats.mtimeMs}`;
+  } catch {
+    return `${configPath}:missing`;
+  }
+}
+function invalidateRuntimeClassSet(twPatcher) {
+  if (!twPatcher) {
+    return;
+  }
+  runtimeClassSetCache.delete(twPatcher);
+}
+function createTailwindPatchPromise(twPatcher) {
+  return Promise.resolve(twPatcher.patch()).then((result) => {
+    invalidateRuntimeClassSet(twPatcher);
+    return result;
+  });
+}
+function shouldPreferSync(majorVersion) {
+  if (majorVersion == null) {
+    return true;
+  }
+  if (majorVersion === 3) {
+    return true;
+  }
+  if (majorVersion === 4) {
+    return true;
+  }
+  return false;
+}
+function tryGetRuntimeClassSetSync(twPatcher) {
+  if (typeof twPatcher.getClassSetSync !== "function") {
+    return void 0;
+  }
+  if (!shouldPreferSync(twPatcher.majorVersion)) {
+    return void 0;
+  }
+  try {
+    return twPatcher.getClassSetSync();
+  } catch (error) {
+    if (twPatcher.majorVersion === 4) {
+      debug("getClassSetSync() unavailable for tailwindcss v4, fallback to async getClassSet(): %O", error);
+    } else {
+      debug("getClassSetSync() failed, fallback to async getClassSet(): %O", error);
+    }
+    return void 0;
+  }
+}
+async function collectRuntimeClassSet(twPatcher, options = {}) {
+  const entry = getCacheEntry(twPatcher);
+  const signature = getTailwindConfigSignature(twPatcher);
+  if (!options.force) {
+    if (entry.value && entry.signature === signature) {
+      return entry.value;
+    }
+    if (entry.promise) {
+      return entry.promise;
+    }
+  } else {
+    entry.value = void 0;
+  }
+  const task = (async () => {
+    const syncSet = tryGetRuntimeClassSetSync(twPatcher);
+    if (syncSet) {
+      return syncSet;
+    }
+    try {
+      const result = await twPatcher.extract({ write: false });
+      if (result?.classSet) {
+        return result.classSet;
+      }
+    } catch (error) {
+      debug("extract() failed, fallback to getClassSet(): %O", error);
+    }
+    try {
+      const fallbackSet = await Promise.resolve(twPatcher.getClassSet());
+      if (fallbackSet) {
+        return fallbackSet;
+      }
+    } catch (error) {
+      debug("getClassSet() failed, returning empty set: %O", error);
+    }
+    return /* @__PURE__ */ new Set();
+  })();
+  entry.promise = task;
+  entry.signature = signature;
+  try {
+    const resolved = await task;
+    entry.value = resolved;
+    entry.promise = void 0;
+    entry.signature = signature;
+    return resolved;
+  } catch (error) {
+    entry.promise = void 0;
+    throw error;
+  }
+}
+
+export {
+  createDebug,
+  createTailwindPatchPromise,
+  collectRuntimeClassSet
+};

package/dist/chunk-BUMQQPAO.js

@@ -0,0 +1,133 @@
+"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; }// src/tailwindcss/runtime.ts
+var _fs = require('fs');
+
+// src/debug/index.ts
+var _debug2 = require('debug'); var _debug3 = _interopRequireDefault(_debug2);
+var _debug = _debug3.default.call(void 0, "weapp-tw");
+function createDebug(prefix) {
+  function debug2(formatter, ...args) {
+    return _debug((_nullishCoalesce(prefix, () => ( ""))) + formatter, ...args);
+  }
+  return debug2;
+}
+
+// src/tailwindcss/runtime.ts
+var debug = createDebug("[tailwindcss:runtime] ");
+var runtimeClassSetCache = /* @__PURE__ */ new WeakMap();
+function getCacheEntry(twPatcher) {
+  let entry = runtimeClassSetCache.get(twPatcher);
+  if (!entry) {
+    entry = {};
+    runtimeClassSetCache.set(twPatcher, entry);
+  }
+  return entry;
+}
+function getTailwindConfigSignature(twPatcher) {
+  const configPath = _optionalChain([twPatcher, 'access', _ => _.options, 'optionalAccess', _2 => _2.tailwind, 'optionalAccess', _3 => _3.config]);
+  if (typeof configPath !== "string" || configPath.length === 0) {
+    return void 0;
+  }
+  try {
+    const stats = _fs.statSync.call(void 0, configPath);
+    return `${configPath}:${stats.size}:${stats.mtimeMs}`;
+  } catch (e) {
+    return `${configPath}:missing`;
+  }
+}
+function invalidateRuntimeClassSet(twPatcher) {
+  if (!twPatcher) {
+    return;
+  }
+  runtimeClassSetCache.delete(twPatcher);
+}
+function createTailwindPatchPromise(twPatcher) {
+  return Promise.resolve(twPatcher.patch()).then((result) => {
+    invalidateRuntimeClassSet(twPatcher);
+    return result;
+  });
+}
+function shouldPreferSync(majorVersion) {
+  if (majorVersion == null) {
+    return true;
+  }
+  if (majorVersion === 3) {
+    return true;
+  }
+  if (majorVersion === 4) {
+    return true;
+  }
+  return false;
+}
+function tryGetRuntimeClassSetSync(twPatcher) {
+  if (typeof twPatcher.getClassSetSync !== "function") {
+    return void 0;
+  }
+  if (!shouldPreferSync(twPatcher.majorVersion)) {
+    return void 0;
+  }
+  try {
+    return twPatcher.getClassSetSync();
+  } catch (error) {
+    if (twPatcher.majorVersion === 4) {
+      debug("getClassSetSync() unavailable for tailwindcss v4, fallback to async getClassSet(): %O", error);
+    } else {
+      debug("getClassSetSync() failed, fallback to async getClassSet(): %O", error);
+    }
+    return void 0;
+  }
+}
+async function collectRuntimeClassSet(twPatcher, options = {}) {
+  const entry = getCacheEntry(twPatcher);
+  const signature = getTailwindConfigSignature(twPatcher);
+  if (!options.force) {
+    if (entry.value && entry.signature === signature) {
+      return entry.value;
+    }
+    if (entry.promise) {
+      return entry.promise;
+    }
+  } else {
+    entry.value = void 0;
+  }
+  const task = (async () => {
+    const syncSet = tryGetRuntimeClassSetSync(twPatcher);
+    if (syncSet) {
+      return syncSet;
+    }
+    try {
+      const result = await twPatcher.extract({ write: false });
+      if (_optionalChain([result, 'optionalAccess', _4 => _4.classSet])) {
+        return result.classSet;
+      }
+    } catch (error) {
+      debug("extract() failed, fallback to getClassSet(): %O", error);
+    }
+    try {
+      const fallbackSet = await Promise.resolve(twPatcher.getClassSet());
+      if (fallbackSet) {
+        return fallbackSet;
+      }
+    } catch (error) {
+      debug("getClassSet() failed, returning empty set: %O", error);
+    }
+    return /* @__PURE__ */ new Set();
+  })();
+  entry.promise = task;
+  entry.signature = signature;
+  try {
+    const resolved = await task;
+    entry.value = resolved;
+    entry.promise = void 0;
+    entry.signature = signature;
+    return resolved;
+  } catch (error) {
+    entry.promise = void 0;
+    throw error;
+  }
+}
+
+
+
+
+
+exports.createDebug = createDebug; exports.createTailwindPatchPromise = createTailwindPatchPromise; exports.collectRuntimeClassSet = collectRuntimeClassSet;