weapp-tailwindcss 4.10.0-beta.4 → 4.10.0-beta.5

package/dist/{chunk-RGXLY3HG.mjs → chunk-3XVUGMTY.mjs}

@@ -8,7 +8,11 @@ function createNegativeMediaQuery(value) {
 }
 function normalComment(text) {
   if (typeof text === "string") {
-    return text.replaceAll(/(?<!\\)_/g, " ");
+    const normalized = text.replaceAll(/(?<!\\)_/g, " ").replaceAll(/\s+/g, " ").trim();
+    if (normalized.includes("\\")) {
+      return normalized;
+    }
+    return normalized.replaceAll(/\s*(\|\||&&)\s*/g, " $1 ").replaceAll(/\s+/g, " ").trim();
   }
   return text;
 }

package/dist/{chunk-3A7VW4BZ.mjs → chunk-5RSRTTH3.mjs}

@@ -10,7 +10,7 @@ import {
   isMpx,
   patchMpxLoaderResolve,
   setupMpxTailwindcssRedirect
-} from "./chunk-JP45MK3F.mjs";
+} from "./chunk-SGPYGQ6Z.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveDisabledOptions,
@@ -23,14 +23,14 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-KAK3XMAW.mjs";
+} from "./chunk-BG6EFR2X.mjs";
 import {
   createDebug,
   ensureRuntimeClassSet,
   getCompilerContext,
   getRuntimeClassSetSignature,
   pluginName
-} from "./chunk-OYR4XWM4.mjs";
+} from "./chunk-KTKHUVCE.mjs";
 import {
   getGroupedEntries
 } from "./chunk-OOHJLO5M.mjs";

package/dist/{chunk-KAK3XMAW.mjs → chunk-BG6EFR2X.mjs}

@@ -1,7 +1,7 @@
 import {
   createPatchTargetRecorder,
   createTailwindPatchPromise
-} from "./chunk-OYR4XWM4.mjs";
+} from "./chunk-KTKHUVCE.mjs";
 import {
   logger
 } from "./chunk-QOTLDKI4.mjs";

package/dist/{chunk-OCV5QLZM.js → chunk-D3ZZ4SOD.js}

@@ -10,7 +10,7 @@
 
 
 
-var _chunkGQVBN7UTjs = require('./chunk-GQVBN7UT.js');
+var _chunkNESY7YODjs = require('./chunk-NESY7YOD.js');
 
 
 
@@ -23,14 +23,14 @@ var _chunkIIDSY4XZjs = require('./chunk-IIDSY4XZ.js');
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
-var _chunkY6OZDS7Vjs = require('./chunk-Y6OZDS7V.js');
+var _chunkFVUZDDYHjs = require('./chunk-FVUZDDYH.js');
 
 
 
 
 
 
-var _chunkBFZDZRA5js = require('./chunk-BFZDZRA5.js');
+var _chunkDFA5DHMZjs = require('./chunk-DFA5DHMZ.js');
 
 
 var _chunkDYLQ6UOIjs = require('./chunk-DYLQ6UOI.js');
@@ -51,10 +51,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
   } = options;
   const { Compilation, sources } = compiler.webpack;
   const { ConcatSource } = sources;
-  compiler.hooks.compilation.tap(_chunkBFZDZRA5js.pluginName, (compilation) => {
+  compiler.hooks.compilation.tap(_chunkDFA5DHMZjs.pluginName, (compilation) => {
     compilation.hooks.processAssets.tapPromise(
       {
-        name: _chunkBFZDZRA5js.pluginName,
+        name: _chunkDFA5DHMZjs.pluginName,
         stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
       },
       async (assets) => {
@@ -66,7 +66,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
             compilerOptions.cache.calcHashValueChanged(chunk.id, chunk.hash);
           }
         }
-        const assetHashByChunk = _chunkGQVBN7UTjs.createAssetHashByChunkMap.call(void 0, compilation.chunks);
+        const assetHashByChunk = _chunkNESY7YODjs.createAssetHashByChunkMap.call(void 0, compilation.chunks);
         const entries = Object.entries(assets);
         const compilerOutputPath = _nullishCoalesce(_optionalChain([compilation, 'access', _ => _.compiler, 'optionalAccess', _2 => _2.outputPath]), () => ( compiler.outputPath));
         const outputDir = compilerOutputPath ? _path2.default.resolve(compilerOutputPath) : _nullishCoalesce(_optionalChain([compilation, 'access', _3 => _3.outputOptions, 'optionalAccess', _4 => _4.path]), () => ( _process2.default.cwd()));
@@ -122,7 +122,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
           }
         };
         const groupedEntries = _chunkDYLQ6UOIjs.getGroupedEntries.call(void 0, entries, compilerOptions);
-        const runtimeSet = await _chunkBFZDZRA5js.ensureRuntimeClassSet.call(void 0, runtimeState, {
+        const runtimeSet = await _chunkDFA5DHMZjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
           forceCollect: false,
           allowEmpty: false
         });
@@ -165,7 +165,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
         const jsTaskFactories = [];
         if (Array.isArray(groupedEntries.js)) {
           for (const [file] of groupedEntries.js) {
-            const cacheKey = _chunkGQVBN7UTjs.getCacheKey.call(void 0, file);
+            const cacheKey = _chunkNESY7YODjs.getCacheKey.call(void 0, file);
             const asset = compilation.getAsset(file);
             if (!asset) {
               continue;
@@ -276,9 +276,9 @@ function setupWebpackV5Loaders(options) {
     getClassSetInLoader,
     debug: debug2
   } = options;
-  const isMpxApp = _chunkGQVBN7UTjs.isMpx.call(void 0, appType);
+  const isMpxApp = _chunkNESY7YODjs.isMpx.call(void 0, appType);
   if (shouldRewriteCssImports && isMpxApp) {
-    _chunkGQVBN7UTjs.ensureMpxTailwindcssAliases.call(void 0, compiler, weappTailwindcssPackageDir2);
+    _chunkNESY7YODjs.ensureMpxTailwindcssAliases.call(void 0, compiler, weappTailwindcssPackageDir2);
   }
   const runtimeClassSetLoader = _nullishCoalesce(runtimeLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js")));
   const runtimeCssImportRewriteLoader = shouldRewriteCssImports ? _nullishCoalesce(runtimeCssImportRewriteLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js"))) : void 0;
@@ -291,12 +291,12 @@ function setupWebpackV5Loaders(options) {
   const classSetLoaderOptions = {
     getClassSet: getClassSetInLoader
   };
-  const { findRewriteAnchor, findClassSetAnchor } = _chunkGQVBN7UTjs.createLoaderAnchorFinders.call(void 0, appType);
+  const { findRewriteAnchor, findClassSetAnchor } = _chunkNESY7YODjs.createLoaderAnchorFinders.call(void 0, appType);
   const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? {
     rewriteCssImports: runtimeLoaderRewriteOptions
   } : void 0;
   if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) {
-    _chunkGQVBN7UTjs.injectMpxCssRewritePreRules.call(void 0, compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
+    _chunkNESY7YODjs.injectMpxCssRewritePreRules.call(void 0, compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
   }
   const createRuntimeClassSetLoaderEntry = () => ({
     loader: runtimeClassSetLoader,
@@ -316,17 +316,17 @@ function setupWebpackV5Loaders(options) {
     };
   };
   const { NormalModule } = compiler.webpack;
-  compiler.hooks.compilation.tap(_chunkBFZDZRA5js.pluginName, (compilation) => {
-    NormalModule.getCompilationHooks(compilation).loader.tap(_chunkBFZDZRA5js.pluginName, (_loaderContext, module) => {
+  compiler.hooks.compilation.tap(_chunkDFA5DHMZjs.pluginName, (compilation) => {
+    NormalModule.getCompilationHooks(compilation).loader.tap(_chunkDFA5DHMZjs.pluginName, (_loaderContext, module) => {
       const hasRuntimeLoader = runtimeClassSetLoaderExists || runtimeCssImportRewriteLoaderExists;
       if (!hasRuntimeLoader) {
         return;
       }
-      _chunkGQVBN7UTjs.patchMpxLoaderResolve.call(void 0, _loaderContext, weappTailwindcssPackageDir2, shouldRewriteCssImports && isMpxApp);
+      _chunkNESY7YODjs.patchMpxLoaderResolve.call(void 0, _loaderContext, weappTailwindcssPackageDir2, shouldRewriteCssImports && isMpxApp);
       const loaderEntries = module.loaders || [];
       let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
       const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
-      const isCssModule = _chunkGQVBN7UTjs.isCssLikeModuleResource.call(void 0, module.resource, compilerOptions.cssMatcher, appType);
+      const isCssModule = _chunkNESY7YODjs.isCssLikeModuleResource.call(void 0, module.resource, compilerOptions.cssMatcher, appType);
       if (_process2.default.env.WEAPP_TW_LOADER_DEBUG && isCssModule) {
         debug2("loader hook css module: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), { rewriteAnchorIdx, classSetAnchorIdx });
       }
@@ -358,7 +358,7 @@ function setupWebpackV5Loaders(options) {
           rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
         }
       }
-      if (runtimeClassSetLoaderExists && !_chunkGQVBN7UTjs.hasLoaderEntry.call(void 0, loaderEntries, runtimeClassSetLoader)) {
+      if (runtimeClassSetLoaderExists && !_chunkNESY7YODjs.hasLoaderEntry.call(void 0, loaderEntries, runtimeClassSetLoader)) {
         const classSetLoaderEntry = createRuntimeClassSetLoaderEntry();
         const anchorIndex = findClassSetAnchor(loaderEntries);
         if (anchorIndex === -1) {
@@ -373,11 +373,11 @@ function setupWebpackV5Loaders(options) {
 }
 
 // src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
-var debug = _chunkBFZDZRA5js.createDebug.call(void 0, );
+var debug = _chunkDFA5DHMZjs.createDebug.call(void 0, );
 var weappTailwindcssPackageDir = _chunkIIDSY4XZjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var UnifiedWebpackPluginV5 = class {
   constructor(options = {}) {
-    this.options = _chunkBFZDZRA5js.getCompilerContext.call(void 0, options);
+    this.options = _chunkDFA5DHMZjs.getCompilerContext.call(void 0, options);
     this.appType = this.options.appType;
   }
   apply(compiler) {
@@ -393,19 +393,19 @@ var UnifiedWebpackPluginV5 = class {
     const disabledOptions = _chunkIIDSY4XZjs.resolveDisabledOptions.call(void 0, disabled);
     const isTailwindcssV4 = (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4;
     const shouldRewriteCssImports = isTailwindcssV4 && this.options.rewriteCssImports !== false && !disabledOptions.rewriteCssImports;
-    const isMpxApp = _chunkGQVBN7UTjs.isMpx.call(void 0, this.appType);
+    const isMpxApp = _chunkNESY7YODjs.isMpx.call(void 0, this.appType);
     if (shouldRewriteCssImports) {
-      _chunkGQVBN7UTjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+      _chunkNESY7YODjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
         pkgDir: weappTailwindcssPackageDir,
         enabled: true,
         appType: this.appType
       });
-      _chunkGQVBN7UTjs.setupMpxTailwindcssRedirect.call(void 0, weappTailwindcssPackageDir, isMpxApp);
+      _chunkNESY7YODjs.setupMpxTailwindcssRedirect.call(void 0, weappTailwindcssPackageDir, isMpxApp);
     }
     if (disabledOptions.plugin) {
       return;
     }
-    const patchRecorderState = _chunkY6OZDS7Vjs.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
+    const patchRecorderState = _chunkFVUZDDYHjs.setupPatchRecorder.call(void 0, initialTwPatcher, this.options.tailwindcssBasedir, {
       source: "runtime",
       cwd: _nullishCoalesce(this.options.tailwindcssBasedir, () => ( _process2.default.cwd()))
     });
@@ -421,18 +421,18 @@ var UnifiedWebpackPluginV5 = class {
       runtimeSetPrepared = false;
     };
     if (_optionalChain([compiler, 'access', _13 => _13.hooks, 'access', _14 => _14.thisCompilation, 'optionalAccess', _15 => _15.tap])) {
-      compiler.hooks.thisCompilation.tap(_chunkBFZDZRA5js.pluginName, resetRuntimePreparation);
+      compiler.hooks.thisCompilation.tap(_chunkDFA5DHMZjs.pluginName, resetRuntimePreparation);
     } else if (_optionalChain([compiler, 'access', _16 => _16.hooks, 'access', _17 => _17.compilation, 'optionalAccess', _18 => _18.tap])) {
-      compiler.hooks.compilation.tap(_chunkBFZDZRA5js.pluginName, resetRuntimePreparation);
+      compiler.hooks.compilation.tap(_chunkDFA5DHMZjs.pluginName, resetRuntimePreparation);
     }
     async function getClassSetInLoader() {
       if (runtimeSetPrepared) {
         return;
       }
-      const signature = _chunkBFZDZRA5js.getRuntimeClassSetSignature.call(void 0, runtimeState.twPatcher);
+      const signature = _chunkDFA5DHMZjs.getRuntimeClassSetSignature.call(void 0, runtimeState.twPatcher);
       const forceRefresh = signature !== runtimeSetSignature;
       runtimeSetPrepared = true;
-      await _chunkBFZDZRA5js.ensureRuntimeClassSet.call(void 0, runtimeState, {
+      await _chunkDFA5DHMZjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
         forceRefresh,
         forceCollect: true,
         clearCache: forceRefresh,