weapp-tailwindcss 4.8.2 → 4.8.3

package/dist/cli.js

@@ -7,8 +7,8 @@ var _chunkOXASK55Qjs = require('./chunk-OXASK55Q.js');
 
 
 
-var _chunkACSKKIYMjs = require('./chunk-ACSKKIYM.js');
-require('./chunk-467NHGLF.js');
+var _chunkPLV4QGF4js = require('./chunk-PLV4QGF4.js');
+require('./chunk-2ZEOKKVA.js');
 require('./chunk-ZSTF2AEN.js');
 
 
@@ -124,7 +124,7 @@ function createCliContext(overrides, resolvedCwd) {
       current
     );
   }
-  return _chunkACSKKIYMjs.getCompilerContext.call(void 0, userOptions);
+  return _chunkPLV4QGF4js.getCompilerContext.call(void 0, userOptions);
 }
 function formatOutputPath(target, baseDir) {
   const root = _nullishCoalesce(baseDir, () => ( _process2.default.cwd()));
@@ -429,9 +429,9 @@ async function generateVscodeIntellisenseEntry(options) {
 
 // src/cli.ts
 _process2.default.title = "node (weapp-tailwindcss)";
-if (_semver2.default.lt(_process2.default.versions.node, _chunkACSKKIYMjs.WEAPP_TW_REQUIRED_NODE_VERSION)) {
+if (_semver2.default.lt(_process2.default.versions.node, _chunkPLV4QGF4js.WEAPP_TW_REQUIRED_NODE_VERSION)) {
   _chunkOXASK55Qjs.logger.warn(
-    `You are using Node.js ${_process2.default.versions.node}. For weapp-tailwindcss, Node.js version >= v${_chunkACSKKIYMjs.WEAPP_TW_REQUIRED_NODE_VERSION} is required.`
+    `You are using Node.js ${_process2.default.versions.node}. For weapp-tailwindcss, Node.js version >= v${_chunkPLV4QGF4js.WEAPP_TW_REQUIRED_NODE_VERSION} is required.`
   );
 }
 var cli = _cac2.default.call(void 0, "weapp-tailwindcss");
@@ -441,13 +441,13 @@ cli.command("patch", "Apply Tailwind CSS runtime patches").alias("install").opti
     const ctx = createCliContext(void 0, resolvedCwd);
     const shouldClearCache = toBoolean(options.clearCache, false);
     if (shouldClearCache) {
-      await _chunkACSKKIYMjs.clearTailwindcssPatcherCache.call(void 0, ctx.twPatcher, { removeDirectory: true });
+      await _chunkPLV4QGF4js.clearTailwindcssPatcherCache.call(void 0, ctx.twPatcher, { removeDirectory: true });
     }
-    _chunkACSKKIYMjs.logTailwindcssTarget.call(void 0, "cli", ctx.twPatcher, ctx.tailwindcssBasedir);
+    _chunkPLV4QGF4js.logTailwindcssTarget.call(void 0, "cli", ctx.twPatcher, ctx.tailwindcssBasedir);
     await ctx.twPatcher.patch();
     const shouldRecordTarget = toBoolean(options.recordTarget, true);
     if (shouldRecordTarget) {
-      const recordPath = await _chunkACSKKIYMjs.saveCliPatchTargetRecord.call(void 0, ctx.tailwindcssBasedir, ctx.twPatcher);
+      const recordPath = await _chunkPLV4QGF4js.saveCliPatchTargetRecord.call(void 0, ctx.tailwindcssBasedir, ctx.twPatcher);
       if (recordPath) {
         _chunkOXASK55Qjs.logger.info(`\u8BB0\u5F55 weapp-tw patch \u76EE\u6807 -> ${formatOutputPath(recordPath, resolvedCwd)}`);
       }

package/dist/cli.mjs

@@ -7,8 +7,8 @@ import {
   getCompilerContext,
   logTailwindcssTarget,
   saveCliPatchTargetRecord
-} from "./chunk-W4ERVC6L.mjs";
-import "./chunk-HCXLLOIU.mjs";
+} from "./chunk-WTOLVORM.mjs";
+import "./chunk-7KTLLGAG.mjs";
 import "./chunk-DKPIYG24.mjs";
 import {
   defuOverrideArray

package/dist/core.js

@@ -3,8 +3,8 @@
 
 
 
-var _chunkACSKKIYMjs = require('./chunk-ACSKKIYM.js');
-require('./chunk-467NHGLF.js');
+var _chunkPLV4QGF4js = require('./chunk-PLV4QGF4.js');
+require('./chunk-2ZEOKKVA.js');
 require('./chunk-ZSTF2AEN.js');
 require('./chunk-UW3WHSZ5.js');
 require('./chunk-UJIUFWXE.js');
@@ -12,16 +12,16 @@ require('./chunk-UJIUFWXE.js');
 // src/core.ts
 var _shared = require('@weapp-tailwindcss/shared');
 function createContext(options = {}) {
-  const opts = _chunkACSKKIYMjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkPLV4QGF4js.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
   let runtimeSet = /* @__PURE__ */ new Set();
   const runtimeState = {
     twPatcher: initialTwPatcher,
-    patchPromise: _chunkACSKKIYMjs.createTailwindPatchPromise.call(void 0, initialTwPatcher),
+    patchPromise: _chunkPLV4QGF4js.createTailwindPatchPromise.call(void 0, initialTwPatcher),
     refreshTailwindcssPatcher
   };
   async function refreshRuntimeState(force) {
-    await _chunkACSKKIYMjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+    await _chunkPLV4QGF4js.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
   }
   async function transformWxss(rawCss, options2) {
     await runtimeState.patchPromise;
@@ -30,7 +30,7 @@ function createContext(options = {}) {
     }));
     await refreshRuntimeState(true);
     await runtimeState.patchPromise;
-    runtimeSet = await _chunkACSKKIYMjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+    runtimeSet = await _chunkPLV4QGF4js.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
     return result;
   }
   async function transformJs(rawJs, options2 = {}) {
@@ -40,7 +40,7 @@ function createContext(options = {}) {
     } else {
       await refreshRuntimeState(true);
       await runtimeState.patchPromise;
-      runtimeSet = await _chunkACSKKIYMjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+      runtimeSet = await _chunkPLV4QGF4js.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
     }
     return await jsHandler(rawJs, runtimeSet, options2);
   }
@@ -49,7 +49,7 @@ function createContext(options = {}) {
     if (!_optionalChain([options2, 'optionalAccess', _2 => _2.runtimeSet]) && runtimeSet.size === 0) {
       await refreshRuntimeState(true);
       await runtimeState.patchPromise;
-      runtimeSet = await _chunkACSKKIYMjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+      runtimeSet = await _chunkPLV4QGF4js.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
     }
     return templateHandler(rawWxml, _shared.defuOverrideArray.call(void 0, options2, {
       runtimeSet

package/dist/core.mjs

@@ -3,8 +3,8 @@ import {
   createTailwindPatchPromise,
   getCompilerContext,
   refreshTailwindRuntimeState
-} from "./chunk-W4ERVC6L.mjs";
-import "./chunk-HCXLLOIU.mjs";
+} from "./chunk-WTOLVORM.mjs";
+import "./chunk-7KTLLGAG.mjs";
 import "./chunk-DKPIYG24.mjs";
 import "./chunk-ZNKIYZRQ.mjs";
 import "./chunk-QGH4JZRW.mjs";

package/dist/gulp.js

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkK7AD7FLJjs = require('./chunk-K7AD7FLJ.js');
+var _chunkN2ZUYGKAjs = require('./chunk-N2ZUYGKA.js');
 require('./chunk-LTJQUORK.js');
-require('./chunk-ACSKKIYM.js');
-require('./chunk-467NHGLF.js');
+require('./chunk-PLV4QGF4.js');
+require('./chunk-2ZEOKKVA.js');
 require('./chunk-ZSTF2AEN.js');
 require('./chunk-UW3WHSZ5.js');
 require('./chunk-UJIUFWXE.js');
 
 
-exports.createPlugins = _chunkK7AD7FLJjs.createPlugins;
+exports.createPlugins = _chunkN2ZUYGKAjs.createPlugins;

package/dist/gulp.mjs

@@ -1,9 +1,9 @@
 import {
   createPlugins
-} from "./chunk-5BZA7BAP.mjs";
+} from "./chunk-NLLCK6RM.mjs";
 import "./chunk-RRHPTTCP.mjs";
-import "./chunk-W4ERVC6L.mjs";
-import "./chunk-HCXLLOIU.mjs";
+import "./chunk-WTOLVORM.mjs";
+import "./chunk-7KTLLGAG.mjs";
 import "./chunk-DKPIYG24.mjs";
 import "./chunk-ZNKIYZRQ.mjs";
 import "./chunk-QGH4JZRW.mjs";

package/dist/index.js

@@ -2,18 +2,18 @@
 
 
 
-var _chunkIXZDFEPLjs = require('./chunk-IXZDFEPL.js');
-require('./chunk-JPLWILCP.js');
+var _chunk26ZRX6OHjs = require('./chunk-26ZRX6OH.js');
+require('./chunk-UCA2DMVN.js');
 
 
-var _chunkK7AD7FLJjs = require('./chunk-K7AD7FLJ.js');
+var _chunkN2ZUYGKAjs = require('./chunk-N2ZUYGKA.js');
 
 
-var _chunkZ6IWSDU3js = require('./chunk-Z6IWSDU3.js');
+var _chunkW5Z3I3S2js = require('./chunk-W5Z3I3S2.js');
 require('./chunk-H34KPZQW.js');
 require('./chunk-LTJQUORK.js');
-require('./chunk-ACSKKIYM.js');
-require('./chunk-467NHGLF.js');
+require('./chunk-PLV4QGF4.js');
+require('./chunk-2ZEOKKVA.js');
 require('./chunk-ZSTF2AEN.js');
 require('./chunk-UW3WHSZ5.js');
 require('./chunk-UJIUFWXE.js');
@@ -22,4 +22,4 @@ require('./chunk-UJIUFWXE.js');
 
 
 
-exports.UnifiedViteWeappTailwindcssPlugin = _chunkZ6IWSDU3js.UnifiedViteWeappTailwindcssPlugin; exports.UnifiedWebpackPluginV5 = _chunkIXZDFEPLjs.UnifiedWebpackPluginV5; exports.createPlugins = _chunkK7AD7FLJjs.createPlugins; exports.weappTailwindcssPackageDir = _chunkIXZDFEPLjs.weappTailwindcssPackageDir;
+exports.UnifiedViteWeappTailwindcssPlugin = _chunkW5Z3I3S2js.UnifiedViteWeappTailwindcssPlugin; exports.UnifiedWebpackPluginV5 = _chunk26ZRX6OHjs.UnifiedWebpackPluginV5; exports.createPlugins = _chunkN2ZUYGKAjs.createPlugins; exports.weappTailwindcssPackageDir = _chunk26ZRX6OHjs.weappTailwindcssPackageDir;

package/dist/index.mjs

@@ -2,18 +2,18 @@ import "./chunk-YAN7TO2B.mjs";
 import {
   UnifiedWebpackPluginV5,
   weappTailwindcssPackageDir
-} from "./chunk-OJRQGFJR.mjs";
-import "./chunk-GVPBDBX4.mjs";
+} from "./chunk-E3GZQTOH.mjs";
+import "./chunk-KSHK56CW.mjs";
 import {
   createPlugins
-} from "./chunk-5BZA7BAP.mjs";
+} from "./chunk-NLLCK6RM.mjs";
 import {
   UnifiedViteWeappTailwindcssPlugin
-} from "./chunk-6OTI5FPH.mjs";
+} from "./chunk-UUVGNRUM.mjs";
 import "./chunk-JW7P34IH.mjs";
 import "./chunk-RRHPTTCP.mjs";
-import "./chunk-W4ERVC6L.mjs";
-import "./chunk-HCXLLOIU.mjs";
+import "./chunk-WTOLVORM.mjs";
+import "./chunk-7KTLLGAG.mjs";
 import "./chunk-DKPIYG24.mjs";
 import "./chunk-ZNKIYZRQ.mjs";
 import "./chunk-QGH4JZRW.mjs";

package/dist/presets.js

@@ -3,7 +3,7 @@
 var _chunkOXASK55Qjs = require('./chunk-OXASK55Q.js');
 
 
-var _chunk467NHGLFjs = require('./chunk-467NHGLF.js');
+var _chunk2ZEOKKVAjs = require('./chunk-2ZEOKKVA.js');
 
 
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
@@ -57,7 +57,7 @@ function toCssEntries(entries) {
   return Array.isArray(entries) ? entries : [entries];
 }
 function hbuilderx(options = {}) {
-  const baseDir = _chunk467NHGLFjs.resolveTailwindcssBasedir.call(void 0, options.base);
+  const baseDir = _chunk2ZEOKKVAjs.resolveTailwindcssBasedir.call(void 0, options.base);
   const cssEntries = toCssEntries(options.cssEntries);
   const tailwindConfig = {
     v2: {

package/dist/presets.mjs

@@ -3,7 +3,7 @@ import {
 } from "./chunk-PMF2CCKK.mjs";
 import {
   resolveTailwindcssBasedir
-} from "./chunk-HCXLLOIU.mjs";
+} from "./chunk-7KTLLGAG.mjs";
 import {
   defuOverrideArray
 } from "./chunk-ZNKIYZRQ.mjs";

package/dist/vite.js

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkZ6IWSDU3js = require('./chunk-Z6IWSDU3.js');
+var _chunkW5Z3I3S2js = require('./chunk-W5Z3I3S2.js');
 require('./chunk-H34KPZQW.js');
 require('./chunk-LTJQUORK.js');
-require('./chunk-ACSKKIYM.js');
-require('./chunk-467NHGLF.js');
+require('./chunk-PLV4QGF4.js');
+require('./chunk-2ZEOKKVA.js');
 require('./chunk-ZSTF2AEN.js');
 require('./chunk-UW3WHSZ5.js');
 require('./chunk-UJIUFWXE.js');
 
 
-exports.UnifiedViteWeappTailwindcssPlugin = _chunkZ6IWSDU3js.UnifiedViteWeappTailwindcssPlugin;
+exports.UnifiedViteWeappTailwindcssPlugin = _chunkW5Z3I3S2js.UnifiedViteWeappTailwindcssPlugin;

package/dist/vite.mjs

@@ -1,10 +1,10 @@
 import {
   UnifiedViteWeappTailwindcssPlugin
-} from "./chunk-6OTI5FPH.mjs";
+} from "./chunk-UUVGNRUM.mjs";
 import "./chunk-JW7P34IH.mjs";
 import "./chunk-RRHPTTCP.mjs";
-import "./chunk-W4ERVC6L.mjs";
-import "./chunk-HCXLLOIU.mjs";
+import "./chunk-WTOLVORM.mjs";
+import "./chunk-7KTLLGAG.mjs";
 import "./chunk-DKPIYG24.mjs";
 import "./chunk-ZNKIYZRQ.mjs";
 import "./chunk-QGH4JZRW.mjs";

package/dist/weapp-tw-runtime-loader.js

@@ -1,13 +1,77 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }// src/bundlers/webpack/loaders/weapp-tw-runtime-loader.ts
 var _loaderutils = require('loader-utils'); var _loaderutils2 = _interopRequireDefault(_loaderutils);
+
+// src/bundlers/shared/css-imports.ts
+var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+var tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
+var tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])(tailwindcss(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
+function normalizeTailwindcssSpecifier(specifier) {
+  if (specifier === "tailwindcss$") {
+    return "tailwindcss";
+  }
+  return specifier;
+}
+function getTailwindcssSubpath(specifier) {
+  if (specifier === "tailwindcss") {
+    return "index.css";
+  }
+  return specifier.slice("tailwindcss/".length);
+}
+function resolveTailwindcssImport(specifier, pkgDir, options) {
+  var _a;
+  const normalized = normalizeTailwindcssSpecifier(specifier);
+  if (!tailwindcssImportRE.test(normalized)) {
+    return null;
+  }
+  const join = (_a = options == null ? void 0 : options.join) != null ? _a : _path2.default.join;
+  const subpath = getTailwindcssSubpath(normalized);
+  return join(pkgDir, subpath);
+}
+function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
+  let hasReplacements = false;
+  const rewritten = code.replace(
+    tailwindcssCssImportStatementRE,
+    (full, prefix, quote, specifier, suffix) => {
+      const replacement = resolveTailwindcssImport(specifier, pkgDir, options);
+      if (!replacement) {
+        return full;
+      }
+      hasReplacements = true;
+      return `${prefix}${quote}${replacement}${suffix}`;
+    }
+  );
+  return hasReplacements ? rewritten : void 0;
+}
+
+// src/bundlers/webpack/loaders/weapp-tw-runtime-loader.ts
+function slash(p) {
+  return p.replace(/\\/g, "/");
+}
+function joinPosixPath(base, subpath) {
+  if (base.endsWith("/")) {
+    return `${base}${subpath}`;
+  }
+  return `${base}/${subpath}`;
+}
+function applyCssImportRewrite(source, options) {
+  const rewriteOptions = options == null ? void 0 : options.rewriteCssImports;
+  const pkgDir = rewriteOptions == null ? void 0 : rewriteOptions.pkgDir;
+  if (!pkgDir) {
+    return source;
+  }
+  const rewritten = rewriteTailwindcssImportsInCode(source, slash(pkgDir), {
+    join: joinPosixPath
+  });
+  return rewritten != null ? rewritten : source;
+}
 var WeappTwRuntimeAopLoader = function(source) {
   var _a;
   const opt = _loaderutils2.default.getOptions(this);
   const maybePromise = (_a = opt == null ? void 0 : opt.getClassSet) == null ? void 0 : _a.call(opt);
   if (maybePromise && typeof maybePromise.then === "function") {
-    return Promise.resolve(maybePromise).then(() => source);
+    return Promise.resolve(maybePromise).then(() => applyCssImportRewrite(source, opt));
   }
-  return source;
+  return applyCssImportRewrite(source, opt);
 };
 var weapp_tw_runtime_loader_default = WeappTwRuntimeAopLoader;
 

package/dist/webpack.js

@@ -1,16 +1,16 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkIXZDFEPLjs = require('./chunk-IXZDFEPL.js');
-require('./chunk-JPLWILCP.js');
+var _chunk26ZRX6OHjs = require('./chunk-26ZRX6OH.js');
+require('./chunk-UCA2DMVN.js');
 require('./chunk-H34KPZQW.js');
 require('./chunk-LTJQUORK.js');
-require('./chunk-ACSKKIYM.js');
-require('./chunk-467NHGLF.js');
+require('./chunk-PLV4QGF4.js');
+require('./chunk-2ZEOKKVA.js');
 require('./chunk-ZSTF2AEN.js');
 require('./chunk-UW3WHSZ5.js');
 require('./chunk-UJIUFWXE.js');
 
 
 
-exports.UnifiedWebpackPluginV5 = _chunkIXZDFEPLjs.UnifiedWebpackPluginV5; exports.weappTailwindcssPackageDir = _chunkIXZDFEPLjs.weappTailwindcssPackageDir;
+exports.UnifiedWebpackPluginV5 = _chunk26ZRX6OHjs.UnifiedWebpackPluginV5; exports.weappTailwindcssPackageDir = _chunk26ZRX6OHjs.weappTailwindcssPackageDir;

package/dist/webpack.mjs

@@ -1,12 +1,12 @@
 import {
   UnifiedWebpackPluginV5,
   weappTailwindcssPackageDir
-} from "./chunk-OJRQGFJR.mjs";
-import "./chunk-GVPBDBX4.mjs";
+} from "./chunk-E3GZQTOH.mjs";
+import "./chunk-KSHK56CW.mjs";
 import "./chunk-JW7P34IH.mjs";
 import "./chunk-RRHPTTCP.mjs";
-import "./chunk-W4ERVC6L.mjs";
-import "./chunk-HCXLLOIU.mjs";
+import "./chunk-WTOLVORM.mjs";
+import "./chunk-7KTLLGAG.mjs";
 import "./chunk-DKPIYG24.mjs";
 import "./chunk-ZNKIYZRQ.mjs";
 import "./chunk-QGH4JZRW.mjs";

package/dist/webpack4.js

@@ -1,7 +1,7 @@
 "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 _chunkUCA2DMVNjs = require('./chunk-UCA2DMVN.js');
 
 
 
@@ -18,8 +18,8 @@ var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
 
-var _chunkACSKKIYMjs = require('./chunk-ACSKKIYM.js');
-require('./chunk-467NHGLF.js');
+var _chunkPLV4QGF4js = require('./chunk-PLV4QGF4.js');
+require('./chunk-2ZEOKKVA.js');
 require('./chunk-ZSTF2AEN.js');
 
 
@@ -31,11 +31,11 @@ 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 _webpacksources = require('webpack-sources');
-var debug = _chunkACSKKIYMjs.createDebug.call(void 0, );
+var debug = _chunkPLV4QGF4js.createDebug.call(void 0, );
 var weappTailwindcssPackageDir = _chunkH34KPZQWjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var UnifiedWebpackPluginV4 = class {
   constructor(options = {}) {
-    this.options = _chunkACSKKIYMjs.getCompilerContext.call(void 0, options);
+    this.options = _chunkPLV4QGF4js.getCompilerContext.call(void 0, options);
     this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
     this.appType = this.options.appType;
   }
@@ -60,46 +60,53 @@ var UnifiedWebpackPluginV4 = class {
     }
     const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4);
     if (shouldRewriteCssImports) {
-      _chunkJPLWILCPjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+      _chunkUCA2DMVNjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
         pkgDir: weappTailwindcssPackageDir,
         enabled: true
       });
     }
     const runtimeState = {
       twPatcher: initialTwPatcher,
-      patchPromise: _chunkACSKKIYMjs.createTailwindPatchPromise.call(void 0, initialTwPatcher),
+      patchPromise: _chunkPLV4QGF4js.createTailwindPatchPromise.call(void 0, initialTwPatcher),
       refreshTailwindcssPatcher
     };
     const refreshRuntimeState = async (force) => {
-      await _chunkACSKKIYMjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+      await _chunkPLV4QGF4js.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
     };
     async function getClassSetInLoader() {
       await refreshRuntimeState(true);
       await runtimeState.patchPromise;
-      await _chunkACSKKIYMjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force: true, skipRefresh: true });
+      await _chunkPLV4QGF4js.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) => {
-      compilation.hooks.normalModuleLoader.tap(_chunkACSKKIYMjs.pluginName, (_loaderContext, module) => {
+    });
+    compiler.hooks.compilation.tap(_chunkPLV4QGF4js.pluginName, (compilation) => {
+      compilation.hooks.normalModuleLoader.tap(_chunkPLV4QGF4js.pluginName, (_loaderContext, module) => {
         if (isExisted) {
           const idx = module.loaders.findIndex((x) => x.loader.includes("postcss-loader"));
           if (idx > -1) {
-            module.loaders.unshift(WeappTwRuntimeAopLoader);
+            module.loaders.splice(idx + 1, 0, createRuntimeLoaderEntry());
+          } else {
+            module.loaders.push(createRuntimeLoaderEntry());
           }
         }
       });
     });
-    compiler.hooks.emit.tapPromise(_chunkACSKKIYMjs.pluginName, async (compilation) => {
+    compiler.hooks.emit.tapPromise(_chunkPLV4QGF4js.pluginName, async (compilation) => {
       await runtimeState.patchPromise;
       onStart();
       debug("start");
@@ -165,7 +172,7 @@ var UnifiedWebpackPluginV4 = 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 _chunkPLV4QGF4js.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)) {
@@ -202,7 +209,7 @@ var UnifiedWebpackPluginV4 = class {
       const jsTaskFactories = [];
       if (Array.isArray(groupedEntries.js)) {
         for (const [file] of groupedEntries.js) {
-          const cacheKey = _chunkJPLWILCPjs.getCacheKey.call(void 0, file);
+          const cacheKey = _chunkUCA2DMVNjs.getCacheKey.call(void 0, file);
           const assetSource = compilation.assets[file];
           if (!assetSource) {
             continue;

package/dist/webpack4.mjs

@@ -1,7 +1,7 @@
 import {
   applyTailwindcssCssImportRewrite,
   getCacheKey
-} from "./chunk-GVPBDBX4.mjs";
+} from "./chunk-KSHK56CW.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveOutputSpecifier,
@@ -18,8 +18,8 @@ import {
   getCompilerContext,
   pluginName,
   refreshTailwindRuntimeState
-} from "./chunk-W4ERVC6L.mjs";
-import "./chunk-HCXLLOIU.mjs";
+} from "./chunk-WTOLVORM.mjs";
+import "./chunk-7KTLLGAG.mjs";
 import "./chunk-DKPIYG24.mjs";
 import {
   getGroupedEntries
@@ -83,20 +83,27 @@ var UnifiedWebpackPluginV4 = 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) => {
       compilation.hooks.normalModuleLoader.tap(pluginName, (_loaderContext, module) => {
         if (isExisted) {
           const idx = module.loaders.findIndex((x) => x.loader.includes("postcss-loader"));
           if (idx > -1) {
-            module.loaders.unshift(WeappTwRuntimeAopLoader);
+            module.loaders.splice(idx + 1, 0, createRuntimeLoaderEntry());
+          } else {
+            module.loaders.push(createRuntimeLoaderEntry());
           }
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -178,8 +178,8 @@
     "tailwindcss-patch": "^8.2.4",
     "webpack-sources": "3.3.3",
     "@weapp-tailwindcss/logger": "1.1.0",
-    "@weapp-tailwindcss/postcss": "2.0.3",
-    "@weapp-tailwindcss/shared": "1.1.0"
+    "@weapp-tailwindcss/shared": "1.1.0",
+    "@weapp-tailwindcss/postcss": "2.0.3"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",