weapp-tailwindcss 4.8.2 → 4.8.4

package/dist/{chunk-JPLWILCP.js → chunk-47NJZTIW.js}

@@ -1,9 +1,9 @@
 "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 _chunkH34KPZQWjs = require('./chunk-H34KPZQW.js');
+var _chunkK234IGOTjs = require('./chunk-K234IGOT.js');
 
 
-var _chunkACSKKIYMjs = require('./chunk-ACSKKIYM.js');
+var _chunkAXEKXGG7js = require('./chunk-AXEKXGG7.js');
 
 // src/bundlers/webpack/shared/css-imports.ts
 var CSS_EXT_RE = /\.(?:css|scss|sass|less|styl|pcss)$/i;
@@ -33,7 +33,7 @@ function rewriteTailwindcssRequestForCss(data, pkgDir) {
   if (!CSS_EXT_RE.test(normalizedIssuer)) {
     return;
   }
-  const resolved = _chunkH34KPZQWjs.resolveTailwindcssImport.call(void 0, request, pkgDir);
+  const resolved = _chunkK234IGOTjs.resolveTailwindcssImport.call(void 0, request, pkgDir);
   if (!resolved) {
     return;
   }
@@ -43,8 +43,8 @@ function applyTailwindcssCssImportRewrite(compiler, options) {
   if (!options.enabled) {
     return;
   }
-  compiler.hooks.normalModuleFactory.tap(_chunkACSKKIYMjs.pluginName, (factory) => {
-    factory.hooks.beforeResolve.tap(_chunkACSKKIYMjs.pluginName, (data) => {
+  compiler.hooks.normalModuleFactory.tap(_chunkAXEKXGG7js.pluginName, (factory) => {
+    factory.hooks.beforeResolve.tap(_chunkAXEKXGG7js.pluginName, (data) => {
       rewriteTailwindcssRequestForCss(data, options.pkgDir);
     });
   });

package/dist/{chunk-Z6IWSDU3.js → chunk-5P342MNS.js}

@@ -5,7 +5,7 @@
 
 
 
-var _chunkH34KPZQWjs = require('./chunk-H34KPZQW.js');
+var _chunkK234IGOTjs = require('./chunk-K234IGOT.js');
 
 
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
@@ -20,7 +20,7 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
 
-var _chunkACSKKIYMjs = require('./chunk-ACSKKIYM.js');
+var _chunkAXEKXGG7js = require('./chunk-AXEKXGG7.js');
 
 
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
@@ -52,7 +52,7 @@ function updateStaticAttribute(ms, prop) {
   const start = prop.value.loc.start.offset + 1;
   const end = prop.value.loc.end.offset - 1;
   if (start < end) {
-    ms.update(start, end, _chunkACSKKIYMjs.replaceWxml.call(void 0, prop.value.content));
+    ms.update(start, end, _chunkAXEKXGG7js.replaceWxml.call(void 0, prop.value.content));
   }
 }
 function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet) {
@@ -64,7 +64,7 @@ function updateDirectiveExpression(ms, prop, jsHandler, runtimeSet) {
   if (start >= end) {
     return;
   }
-  const generated = _chunkACSKKIYMjs.generateCode.call(void 0, prop.exp.content, {
+  const generated = _chunkAXEKXGG7js.generateCode.call(void 0, prop.exp.content, {
     jsHandler,
     runtimeSet,
     wrapExpression: true
@@ -93,7 +93,7 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
     return;
   }
   const { customAttributesEntities, disabledDefaultTemplateHandler = false } = options;
-  const matchCustomAttribute = _chunkACSKKIYMjs.createAttributeMatcher.call(void 0, customAttributesEntities);
+  const matchCustomAttribute = _chunkAXEKXGG7js.createAttributeMatcher.call(void 0, customAttributesEntities);
   const ms = new (0, _magicstring2.default)(code);
   const { descriptor, errors } = _compilersfc.parse.call(void 0, code);
   if (errors.length === 0) {
@@ -216,8 +216,8 @@ async function formatPostcssSourceMap(rawMap, file) {
 }
 
 // src/bundlers/vite/index.ts
-var debug = _chunkACSKKIYMjs.createDebug.call(void 0, );
-var weappTailwindcssPackageDir = _chunkH34KPZQWjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
+var debug = _chunkAXEKXGG7js.createDebug.call(void 0, );
+var weappTailwindcssPackageDir = _chunkK234IGOTjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var weappTailwindcssDirPosix = slash(weappTailwindcssPackageDir);
 function joinPosixPath(base, subpath) {
   if (base.endsWith("/")) {
@@ -261,7 +261,7 @@ function isJavaScriptEntry(entry) {
 function createBundleModuleGraphOptions(outputDir, entries) {
   return {
     resolve(specifier, importer) {
-      return _chunkH34KPZQWjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => entries.has(candidate));
+      return _chunkK234IGOTjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => entries.has(candidate));
     },
     load(id) {
       const entry = entries.get(id);
@@ -299,7 +299,7 @@ function applyLinkedResults(linked, entries, onLinkedUpdate, onApplied) {
 }
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   const rewriteCssImportsSpecified = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
-  const opts = _chunkACSKKIYMjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkAXEKXGG7js.getCompilerContext.call(void 0, options);
   const {
     disabled,
     customAttributes,
@@ -321,17 +321,17 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   if (disabled) {
     return;
   }
-  const customAttributesEntities = _chunkACSKKIYMjs.toCustomAttributesEntities.call(void 0, customAttributes);
+  const customAttributesEntities = _chunkAXEKXGG7js.toCustomAttributesEntities.call(void 0, customAttributes);
   const runtimeState = {
     twPatcher: initialTwPatcher,
-    patchPromise: _chunkACSKKIYMjs.createTailwindPatchPromise.call(void 0, initialTwPatcher),
+    patchPromise: _chunkAXEKXGG7js.createTailwindPatchPromise.call(void 0, initialTwPatcher),
     refreshTailwindcssPatcher
   };
   let runtimeSet;
   let runtimeSetPromise;
   let resolvedConfig;
   async function refreshRuntimeState(force) {
-    const refreshed = await _chunkACSKKIYMjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+    const refreshed = await _chunkAXEKXGG7js.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
     if (refreshed) {
       runtimeSet = void 0;
       runtimeSetPromise = void 0;
@@ -344,7 +344,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
       return runtimeSet;
     }
     if (force || !runtimeSetPromise) {
-      const task2 = _chunkACSKKIYMjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, {
+      const task2 = _chunkAXEKXGG7js.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, {
         force: force || !runtimeSet,
         skipRefresh: force
       });
@@ -364,10 +364,10 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   const shouldRewriteCssImports = opts.rewriteCssImports !== false && (rewriteCssImportsSpecified || (_nullishCoalesce(runtimeState.twPatcher.majorVersion, () => ( 0))) >= 4);
   const rewritePlugins = !shouldRewriteCssImports ? [] : [
     {
-      name: `${_chunkACSKKIYMjs.vitePluginName}:rewrite-css-imports`,
+      name: `${_chunkAXEKXGG7js.vitePluginName}:rewrite-css-imports`,
       enforce: "pre",
       resolveId(id, importer) {
-        const replacement = _chunkH34KPZQWjs.resolveTailwindcssImport.call(void 0, id, weappTailwindcssDirPosix, { join: joinPosixPath });
+        const replacement = _chunkK234IGOTjs.resolveTailwindcssImport.call(void 0, id, weappTailwindcssDirPosix, { join: joinPosixPath });
         if (!replacement) {
           return null;
         }
@@ -380,7 +380,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         if (!isCSSRequest(id)) {
           return null;
         }
-        const rewritten = _chunkH34KPZQWjs.rewriteTailwindcssImportsInCode.call(void 0, code, weappTailwindcssDirPosix, { join: joinPosixPath });
+        const rewritten = _chunkK234IGOTjs.rewriteTailwindcssImportsInCode.call(void 0, code, weappTailwindcssDirPosix, { join: joinPosixPath });
         if (!rewritten) {
           return null;
         }
@@ -394,7 +394,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   const plugins = [
     ...rewritePlugins,
     {
-      name: `${_chunkACSKKIYMjs.vitePluginName}:post`,
+      name: `${_chunkAXEKXGG7js.vitePluginName}:post`,
       enforce: "post",
       configResolved(config) {
         resolvedConfig = config;
@@ -420,7 +420,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         for (const [fileName, output] of entries) {
           const entry = { fileName, output };
           if (isJavaScriptEntry(entry)) {
-            const absolute = _chunkH34KPZQWjs.toAbsoluteOutputPath.call(void 0, fileName, outDir);
+            const absolute = _chunkK234IGOTjs.toAbsoluteOutputPath.call(void 0, fileName, outDir);
             jsEntries.set(absolute, entry);
           }
         }
@@ -484,7 +484,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         if (Array.isArray(groupedEntries.js)) {
           for (const [file, originalSource] of groupedEntries.js) {
             if (originalSource.type === "chunk") {
-              const absoluteFile = _chunkH34KPZQWjs.toAbsoluteOutputPath.call(void 0, file, outDir);
+              const absoluteFile = _chunkK234IGOTjs.toAbsoluteOutputPath.call(void 0, file, outDir);
               const initialRawSource = originalSource.code;
               jsTaskFactories.push(async () => {
                 await _chunkLTJQUORKjs.processCachedTask.call(void 0, {
@@ -510,7 +510,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                 });
               });
             } else if (uniAppX && originalSource.type === "asset") {
-              const absoluteFile = _chunkH34KPZQWjs.toAbsoluteOutputPath.call(void 0, file, outDir);
+              const absoluteFile = _chunkK234IGOTjs.toAbsoluteOutputPath.call(void 0, file, outDir);
               const rawSource = originalSource.source.toString();
               jsTaskFactories.push(async () => {
                 await _chunkLTJQUORKjs.processCachedTask.call(void 0, {
@@ -581,7 +581,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
             );
           }
         }
-        _chunkH34KPZQWjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
+        _chunkK234IGOTjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
         await Promise.all(tasks);
         for (const apply of pendingLinkedUpdates) {
           apply();

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

@@ -1,13 +1,13 @@
 "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 _chunkJPLWILCPjs = require('./chunk-JPLWILCP.js');
+var _chunk47NJZTIWjs = require('./chunk-47NJZTIW.js');
 
 
 
 
 
-var _chunkH34KPZQWjs = require('./chunk-H34KPZQW.js');
+var _chunkK234IGOTjs = require('./chunk-K234IGOT.js');
 
 
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
@@ -18,7 +18,7 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
 
-var _chunkACSKKIYMjs = require('./chunk-ACSKKIYM.js');
+var _chunkAXEKXGG7js = require('./chunk-AXEKXGG7.js');
 
 
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
@@ -27,11 +27,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 = _chunkACSKKIYMjs.createDebug.call(void 0, );
-var weappTailwindcssPackageDir = _chunkH34KPZQWjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
+var debug = _chunkAXEKXGG7js.createDebug.call(void 0, );
+var weappTailwindcssPackageDir = _chunkK234IGOTjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var UnifiedWebpackPluginV5 = class {
   constructor(options = {}) {
-    this.options = _chunkACSKKIYMjs.getCompilerContext.call(void 0, options);
+    this.options = _chunkAXEKXGG7js.getCompilerContext.call(void 0, options);
     this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
     this.appType = this.options.appType;
   }
@@ -56,49 +56,57 @@ var UnifiedWebpackPluginV5 = class {
     }
     const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4);
     if (shouldRewriteCssImports) {
-      _chunkJPLWILCPjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+      _chunk47NJZTIWjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
         pkgDir: weappTailwindcssPackageDir,
         enabled: true
       });
     }
     const runtimeState = {
       twPatcher: initialTwPatcher,
-      patchPromise: _chunkACSKKIYMjs.createTailwindPatchPromise.call(void 0, initialTwPatcher),
+      patchPromise: _chunkAXEKXGG7js.createTailwindPatchPromise.call(void 0, initialTwPatcher),
       refreshTailwindcssPatcher
     };
     const refreshRuntimeState = async (force) => {
-      await _chunkACSKKIYMjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+      await _chunkAXEKXGG7js.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 _chunkACSKKIYMjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+      await _chunkAXEKXGG7js.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
     }
     onLoad();
     const loader = _nullishCoalesce(runtimeLoaderPath, () => ( _path2.default.resolve(__dirname, "./weapp-tw-runtime-loader.js")));
     const isExisted = _fs2.default.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(_chunkACSKKIYMjs.pluginName, (compilation) => {
-      NormalModule.getCompilationHooks(compilation).loader.tap(_chunkACSKKIYMjs.pluginName, (_loaderContext, module) => {
+    });
+    compiler.hooks.compilation.tap(_chunkAXEKXGG7js.pluginName, (compilation) => {
+      NormalModule.getCompilationHooks(compilation).loader.tap(_chunkAXEKXGG7js.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);
           }
         }
       });
       compilation.hooks.processAssets.tapPromise(
         {
-          name: _chunkACSKKIYMjs.pluginName,
+          name: _chunkAXEKXGG7js.pluginName,
           stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
         },
         async (assets) => {
@@ -116,13 +124,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 = _chunkH34KPZQWjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absolute = _chunkK234IGOTjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               jsAssets.set(absolute, file);
             }
           }
           const moduleGraphOptions = {
             resolve(specifier, importer) {
-              return _chunkH34KPZQWjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
+              return _chunkK234IGOTjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
             },
             load: (id) => {
               const assetName = jsAssets.get(id);
@@ -167,7 +175,7 @@ var UnifiedWebpackPluginV5 = class {
           const groupedEntries = _chunkUW3WHSZ5js.getGroupedEntries.call(void 0, entries, this.options);
           await refreshRuntimeState(true);
           await runtimeState.patchPromise;
-          const runtimeSet = await _chunkACSKKIYMjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+          const runtimeSet = await _chunkAXEKXGG7js.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)) {
@@ -204,12 +212,12 @@ var UnifiedWebpackPluginV5 = class {
           const jsTaskFactories = [];
           if (Array.isArray(groupedEntries.js)) {
             for (const [file] of groupedEntries.js) {
-              const cacheKey = _chunkJPLWILCPjs.getCacheKey.call(void 0, file);
+              const cacheKey = _chunk47NJZTIWjs.getCacheKey.call(void 0, file);
               const asset = compilation.getAsset(file);
               if (!asset) {
                 continue;
               }
-              const absoluteFile = _chunkH34KPZQWjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absoluteFile = _chunkK234IGOTjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               const initialSource = asset.source.source();
               const initialRawSource = typeof initialSource === "string" ? initialSource : initialSource.toString();
               jsTaskFactories.push(async () => {
@@ -284,7 +292,7 @@ var UnifiedWebpackPluginV5 = class {
               );
             }
           }
-          _chunkH34KPZQWjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
+          _chunkK234IGOTjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
           await Promise.all(tasks);
           debug("end");
           onEnd();