weapp-tailwindcss 4.8.0 → 4.8.1

package/dist/{chunk-FQ5MKRKX.js → chunk-5XFZ2DUB.js}

@@ -3,7 +3,9 @@
 
 
 
-var _chunkA5VN7CO5js = require('./chunk-A5VN7CO5.js');
+
+
+var _chunkU7OMIV3Sjs = require('./chunk-U7OMIV3S.js');
 
 
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
@@ -215,20 +217,13 @@ async function formatPostcssSourceMap(rawMap, file) {
 
 // src/bundlers/vite/index.ts
 var debug = _chunkX7QD7NUXjs.createDebug.call(void 0, );
-var weappTailwindcssPackageDir = _chunkA5VN7CO5js.resolvePackageDir.call(void 0, "weapp-tailwindcss");
+var weappTailwindcssPackageDir = _chunkU7OMIV3Sjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var weappTailwindcssDirPosix = slash(weappTailwindcssPackageDir);
-var tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
-function resolveCssTailwindImport(id) {
-  if (!tailwindcssImportRE.test(id)) {
-    return null;
-  }
-  if (id === "tailwindcss" || id === "tailwindcss$") {
-    return `${weappTailwindcssDirPosix}/index.css`;
+function joinPosixPath(base, subpath) {
+  if (base.endsWith("/")) {
+    return `${base}${subpath}`;
   }
-  if (id.startsWith("tailwindcss/")) {
-    return `${weappTailwindcssDirPosix}/${id.slice("tailwindcss/".length)}`;
-  }
-  return null;
+  return `${base}/${subpath}`;
 }
 function isCssLikeImporter(importer) {
   if (!importer) {
@@ -266,7 +261,7 @@ function isJavaScriptEntry(entry) {
 function createBundleModuleGraphOptions(outputDir, entries) {
   return {
     resolve(specifier, importer) {
-      return _chunkA5VN7CO5js.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => entries.has(candidate));
+      return _chunkU7OMIV3Sjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => entries.has(candidate));
     },
     load(id) {
       const entry = entries.get(id);
@@ -303,6 +298,7 @@ function applyLinkedResults(linked, entries, onLinkedUpdate, onApplied) {
   }
 }
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
+  const rewriteCssImportsSpecified = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
   const opts = _chunkX7QD7NUXjs.getCompilerContext.call(void 0, options);
   const {
     disabled,
@@ -365,12 +361,13 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     }
   }
   onLoad();
-  const rewritePlugins = opts.rewriteCssImports === false ? [] : [
+  const shouldRewriteCssImports = opts.rewriteCssImports !== false && (rewriteCssImportsSpecified || (_nullishCoalesce(runtimeState.twPatcher.majorVersion, () => ( 0))) >= 4);
+  const rewritePlugins = !shouldRewriteCssImports ? [] : [
     {
       name: `${_chunkX7QD7NUXjs.vitePluginName}:rewrite-css-imports`,
       enforce: "pre",
       resolveId(id, importer) {
-        const replacement = resolveCssTailwindImport(id);
+        const replacement = _chunkU7OMIV3Sjs.resolveTailwindcssImport.call(void 0, id, weappTailwindcssDirPosix, { join: joinPosixPath });
         if (!replacement) {
           return null;
         }
@@ -378,6 +375,19 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
           return null;
         }
         return replacement;
+      },
+      transform(code, id) {
+        if (!isCSSRequest(id)) {
+          return null;
+        }
+        const rewritten = _chunkU7OMIV3Sjs.rewriteTailwindcssImportsInCode.call(void 0, code, weappTailwindcssDirPosix, { join: joinPosixPath });
+        if (!rewritten) {
+          return null;
+        }
+        return {
+          code: rewritten,
+          map: null
+        };
       }
     }
   ];
@@ -410,7 +420,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         for (const [fileName, output] of entries) {
           const entry = { fileName, output };
           if (isJavaScriptEntry(entry)) {
-            const absolute = _chunkA5VN7CO5js.toAbsoluteOutputPath.call(void 0, fileName, outDir);
+            const absolute = _chunkU7OMIV3Sjs.toAbsoluteOutputPath.call(void 0, fileName, outDir);
             jsEntries.set(absolute, entry);
           }
         }
@@ -474,7 +484,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         if (Array.isArray(groupedEntries.js)) {
           for (const [file, originalSource] of groupedEntries.js) {
             if (originalSource.type === "chunk") {
-              const absoluteFile = _chunkA5VN7CO5js.toAbsoluteOutputPath.call(void 0, file, outDir);
+              const absoluteFile = _chunkU7OMIV3Sjs.toAbsoluteOutputPath.call(void 0, file, outDir);
               const initialRawSource = originalSource.code;
               jsTaskFactories.push(async () => {
                 await _chunkLTJQUORKjs.processCachedTask.call(void 0, {
@@ -500,7 +510,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                 });
               });
             } else if (uniAppX && originalSource.type === "asset") {
-              const absoluteFile = _chunkA5VN7CO5js.toAbsoluteOutputPath.call(void 0, file, outDir);
+              const absoluteFile = _chunkU7OMIV3Sjs.toAbsoluteOutputPath.call(void 0, file, outDir);
               const rawSource = originalSource.source.toString();
               jsTaskFactories.push(async () => {
                 await _chunkLTJQUORKjs.processCachedTask.call(void 0, {
@@ -571,7 +581,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
             );
           }
         }
-        _chunkA5VN7CO5js.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
+        _chunkU7OMIV3Sjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
         await Promise.all(tasks);
         for (const apply of pendingLinkedUpdates) {
           apply();

package/dist/{chunk-5RHSVID3.mjs → chunk-DHHTSM3K.mjs}

@@ -2,8 +2,10 @@ import {
   pushConcurrentTaskFactories,
   resolveOutputSpecifier,
   resolvePackageDir,
+  resolveTailwindcssImport,
+  rewriteTailwindcssImportsInCode,
   toAbsoluteOutputPath
-} from "./chunk-TTIRN5LZ.mjs";
+} from "./chunk-JW7P34IH.mjs";
 import {
   processCachedTask
 } from "./chunk-RRHPTTCP.mjs";
@@ -217,18 +219,11 @@ async function formatPostcssSourceMap(rawMap, file) {
 var debug = createDebug();
 var weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 var weappTailwindcssDirPosix = slash(weappTailwindcssPackageDir);
-var tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
-function resolveCssTailwindImport(id) {
-  if (!tailwindcssImportRE.test(id)) {
-    return null;
+function joinPosixPath(base, subpath) {
+  if (base.endsWith("/")) {
+    return `${base}${subpath}`;
   }
-  if (id === "tailwindcss" || id === "tailwindcss$") {
-    return `${weappTailwindcssDirPosix}/index.css`;
-  }
-  if (id.startsWith("tailwindcss/")) {
-    return `${weappTailwindcssDirPosix}/${id.slice("tailwindcss/".length)}`;
-  }
-  return null;
+  return `${base}/${subpath}`;
 }
 function isCssLikeImporter(importer) {
   if (!importer) {
@@ -303,6 +298,7 @@ function applyLinkedResults(linked, entries, onLinkedUpdate, onApplied) {
   }
 }
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
+  const rewriteCssImportsSpecified = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
   const opts = getCompilerContext(options);
   const {
     disabled,
@@ -365,12 +361,13 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     }
   }
   onLoad();
-  const rewritePlugins = opts.rewriteCssImports === false ? [] : [
+  const shouldRewriteCssImports = opts.rewriteCssImports !== false && (rewriteCssImportsSpecified || (runtimeState.twPatcher.majorVersion ?? 0) >= 4);
+  const rewritePlugins = !shouldRewriteCssImports ? [] : [
     {
       name: `${vitePluginName}:rewrite-css-imports`,
       enforce: "pre",
       resolveId(id, importer) {
-        const replacement = resolveCssTailwindImport(id);
+        const replacement = resolveTailwindcssImport(id, weappTailwindcssDirPosix, { join: joinPosixPath });
         if (!replacement) {
           return null;
         }
@@ -378,6 +375,19 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
           return null;
         }
         return replacement;
+      },
+      transform(code, id) {
+        if (!isCSSRequest(id)) {
+          return null;
+        }
+        const rewritten = rewriteTailwindcssImportsInCode(code, weappTailwindcssDirPosix, { join: joinPosixPath });
+        if (!rewritten) {
+          return null;
+        }
+        return {
+          code: rewritten,
+          map: null
+        };
       }
     }
   ];

package/dist/{chunk-TTIRN5LZ.mjs → chunk-JW7P34IH.mjs}

@@ -7,8 +7,49 @@ function resolvePackageDir(name) {
   return path.dirname(pkgPath);
 }
 
-// src/bundlers/shared/module-graph.ts
+// src/bundlers/shared/css-imports.ts
 import path2 from "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) {
+  const normalized = normalizeTailwindcssSpecifier(specifier);
+  if (!tailwindcssImportRE.test(normalized)) {
+    return null;
+  }
+  const join = options?.join ?? path2.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/shared/module-graph.ts
+import path3 from "path";
 var QUERY_HASH_RE = /[?#].*$/u;
 var PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
 var VIRTUAL_PREFIX = "\0";
@@ -27,16 +68,16 @@ function isResolvableSpecifier(specifier) {
   return !PROTOCOL_RE.test(normalized);
 }
 function toAbsoluteOutputPath(fileName, outDir) {
-  if (path2.isAbsolute(fileName)) {
+  if (path3.isAbsolute(fileName)) {
     return fileName;
   }
-  return path2.resolve(outDir, fileName);
+  return path3.resolve(outDir, fileName);
 }
 function matchWithExtensions(candidate, hasOutput) {
   if (hasOutput(candidate)) {
     return candidate;
   }
-  if (!path2.extname(candidate)) {
+  if (!path3.extname(candidate)) {
     for (const ext of JS_EXTENSIONS) {
       const extended = `${candidate}${ext}`;
       if (hasOutput(extended)) {
@@ -52,12 +93,12 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
   }
   const normalized = stripQueryAndHash(specifier);
   let candidate;
-  if (path2.isAbsolute(normalized)) {
+  if (path3.isAbsolute(normalized)) {
     candidate = normalized;
   } else if (normalized.startsWith("/")) {
-    candidate = path2.resolve(outDir, normalized.slice(1));
+    candidate = path3.resolve(outDir, normalized.slice(1));
   } else {
-    candidate = path2.resolve(path2.dirname(importer), normalized);
+    candidate = path3.resolve(path3.dirname(importer), normalized);
   }
   return matchWithExtensions(candidate, hasOutput);
 }
@@ -104,6 +145,8 @@ function pushConcurrentTaskFactories(queue, factories, limit) {
 
 export {
   resolvePackageDir,
+  resolveTailwindcssImport,
+  rewriteTailwindcssImportsInCode,
   toAbsoluteOutputPath,
   resolveOutputSpecifier,
   pushConcurrentTaskFactories

package/dist/{chunk-QK5QBH6X.mjs → chunk-MSFAEBH6.mjs}

@@ -1,13 +1,13 @@
 import {
   applyTailwindcssCssImportRewrite,
   getCacheKey
-} from "./chunk-UKAU6OXS.mjs";
+} from "./chunk-YHZB3KHY.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveOutputSpecifier,
   resolvePackageDir,
   toAbsoluteOutputPath
-} from "./chunk-TTIRN5LZ.mjs";
+} from "./chunk-JW7P34IH.mjs";
 import {
   processCachedTask
 } from "./chunk-RRHPTTCP.mjs";
@@ -35,6 +35,7 @@ var weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 var UnifiedWebpackPluginV5 = class {
   constructor(options = {}) {
     this.options = getCompilerContext(options);
+    this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
     this.appType = this.options.appType;
   }
   apply(compiler) {
@@ -56,10 +57,13 @@ var UnifiedWebpackPluginV5 = class {
     if (disabled) {
       return;
     }
-    applyTailwindcssCssImportRewrite(compiler, {
-      pkgDir: weappTailwindcssPackageDir,
-      enabled: this.options.rewriteCssImports !== false
-    });
+    const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (initialTwPatcher.majorVersion ?? 0) >= 4);
+    if (shouldRewriteCssImports) {
+      applyTailwindcssCssImportRewrite(compiler, {
+        pkgDir: weappTailwindcssPackageDir,
+        enabled: true
+      });
+    }
     const runtimeState = {
       twPatcher: initialTwPatcher,
       patchPromise: createTailwindPatchPromise(initialTwPatcher),

package/dist/{chunk-GI2M6KFD.js → chunk-MYNTKRVT.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 _chunkR3CUQGRMjs = require('./chunk-R3CUQGRM.js');
+var _chunkNQTLEEK5js = require('./chunk-NQTLEEK5.js');
 
 
 
 
 
-var _chunkA5VN7CO5js = require('./chunk-A5VN7CO5.js');
+var _chunkU7OMIV3Sjs = require('./chunk-U7OMIV3S.js');
 
 
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
@@ -28,10 +28,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 debug = _chunkX7QD7NUXjs.createDebug.call(void 0, );
-var weappTailwindcssPackageDir = _chunkA5VN7CO5js.resolvePackageDir.call(void 0, "weapp-tailwindcss");
+var weappTailwindcssPackageDir = _chunkU7OMIV3Sjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var UnifiedWebpackPluginV5 = class {
   constructor(options = {}) {
     this.options = _chunkX7QD7NUXjs.getCompilerContext.call(void 0, options);
+    this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
     this.appType = this.options.appType;
   }
   apply(compiler) {
@@ -53,10 +54,13 @@ var UnifiedWebpackPluginV5 = class {
     if (disabled) {
       return;
     }
-    _chunkR3CUQGRMjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
-      pkgDir: weappTailwindcssPackageDir,
-      enabled: this.options.rewriteCssImports !== false
-    });
+    const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4);
+    if (shouldRewriteCssImports) {
+      _chunkNQTLEEK5js.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+        pkgDir: weappTailwindcssPackageDir,
+        enabled: true
+      });
+    }
     const runtimeState = {
       twPatcher: initialTwPatcher,
       patchPromise: _chunkX7QD7NUXjs.createTailwindPatchPromise.call(void 0, initialTwPatcher),
@@ -112,13 +116,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 = _chunkA5VN7CO5js.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absolute = _chunkU7OMIV3Sjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               jsAssets.set(absolute, file);
             }
           }
           const moduleGraphOptions = {
             resolve(specifier, importer) {
-              return _chunkA5VN7CO5js.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
+              return _chunkU7OMIV3Sjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
             },
             load: (id) => {
               const assetName = jsAssets.get(id);
@@ -200,12 +204,12 @@ var UnifiedWebpackPluginV5 = class {
           const jsTaskFactories = [];
           if (Array.isArray(groupedEntries.js)) {
             for (const [file] of groupedEntries.js) {
-              const cacheKey = _chunkR3CUQGRMjs.getCacheKey.call(void 0, file);
+              const cacheKey = _chunkNQTLEEK5js.getCacheKey.call(void 0, file);
               const asset = compilation.getAsset(file);
               if (!asset) {
                 continue;
               }
-              const absoluteFile = _chunkA5VN7CO5js.toAbsoluteOutputPath.call(void 0, file, outputDir);
+              const absoluteFile = _chunkU7OMIV3Sjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
               const initialSource = asset.source.source();
               const initialRawSource = typeof initialSource === "string" ? initialSource : initialSource.toString();
               jsTaskFactories.push(async () => {
@@ -280,7 +284,7 @@ var UnifiedWebpackPluginV5 = class {
               );
             }
           }
-          _chunkA5VN7CO5js.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
+          _chunkU7OMIV3Sjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
           await Promise.all(tasks);
           debug("end");
           onEnd();

package/dist/{chunk-R3CUQGRM.js → chunk-NQTLEEK5.js}

@@ -1,9 +1,11 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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; }
+"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 _chunkU7OMIV3Sjs = require('./chunk-U7OMIV3S.js');
+
 
 var _chunkX7QD7NUXjs = require('./chunk-X7QD7NUX.js');
 
 // src/bundlers/webpack/shared/css-imports.ts
-var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var CSS_EXT_RE = /\.(?:css|scss|sass|less|styl|pcss)$/i;
 function stripResourceQuery(file) {
   let idx = file.indexOf("?");
@@ -16,7 +18,7 @@ function rewriteTailwindcssRequestForCss(data, pkgDir) {
   if (!data) {
     return;
   }
-  let request = data.request;
+  const request = data.request;
   if (!request) {
     return;
   }
@@ -31,11 +33,11 @@ function rewriteTailwindcssRequestForCss(data, pkgDir) {
   if (!CSS_EXT_RE.test(normalizedIssuer)) {
     return;
   }
-  if (request === "tailwindcss$") {
-    request = "tailwindcss";
+  const resolved = _chunkU7OMIV3Sjs.resolveTailwindcssImport.call(void 0, request, pkgDir);
+  if (!resolved) {
+    return;
   }
-  const subpath = request === "tailwindcss" ? "index.css" : request.slice("tailwindcss/".length);
-  data.request = _path2.default.join(pkgDir, subpath);
+  data.request = resolved;
 }
 function applyTailwindcssCssImportRewrite(compiler, options) {
   if (!options.enabled) {

package/dist/{chunk-A5VN7CO5.js → chunk-U7OMIV3S.js}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+"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 _chunkXGRBCPBIjs = require('./chunk-XGRBCPBI.js');
 
@@ -11,6 +11,47 @@ function resolvePackageDir(name) {
   return _path2.default.dirname(pkgPath);
 }
 
+// src/bundlers/shared/css-imports.ts
+
+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) {
+  const normalized = normalizeTailwindcssSpecifier(specifier);
+  if (!tailwindcssImportRE.test(normalized)) {
+    return null;
+  }
+  const join = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _ => _.join]), () => ( _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/shared/module-graph.ts
 
 var QUERY_HASH_RE = /[?#].*$/u;
@@ -111,4 +152,6 @@ function pushConcurrentTaskFactories(queue, factories, limit) {
 
 
 
-exports.resolvePackageDir = resolvePackageDir; exports.toAbsoluteOutputPath = toAbsoluteOutputPath; exports.resolveOutputSpecifier = resolveOutputSpecifier; exports.pushConcurrentTaskFactories = pushConcurrentTaskFactories;
+
+
+exports.resolvePackageDir = resolvePackageDir; exports.resolveTailwindcssImport = resolveTailwindcssImport; exports.rewriteTailwindcssImportsInCode = rewriteTailwindcssImportsInCode; exports.toAbsoluteOutputPath = toAbsoluteOutputPath; exports.resolveOutputSpecifier = resolveOutputSpecifier; exports.pushConcurrentTaskFactories = pushConcurrentTaskFactories;

package/dist/{chunk-UKAU6OXS.mjs → chunk-YHZB3KHY.mjs}

@@ -1,9 +1,11 @@
+import {
+  resolveTailwindcssImport
+} from "./chunk-JW7P34IH.mjs";
 import {
   pluginName
 } from "./chunk-TTCMOWCO.mjs";
 
 // src/bundlers/webpack/shared/css-imports.ts
-import path from "path";
 var CSS_EXT_RE = /\.(?:css|scss|sass|less|styl|pcss)$/i;
 function stripResourceQuery(file) {
   let idx = file.indexOf("?");
@@ -16,7 +18,7 @@ function rewriteTailwindcssRequestForCss(data, pkgDir) {
   if (!data) {
     return;
   }
-  let request = data.request;
+  const request = data.request;
   if (!request) {
     return;
   }
@@ -31,11 +33,11 @@ function rewriteTailwindcssRequestForCss(data, pkgDir) {
   if (!CSS_EXT_RE.test(normalizedIssuer)) {
     return;
   }
-  if (request === "tailwindcss$") {
-    request = "tailwindcss";
+  const resolved = resolveTailwindcssImport(request, pkgDir);
+  if (!resolved) {
+    return;
   }
-  const subpath = request === "tailwindcss" ? "index.css" : request.slice("tailwindcss/".length);
-  data.request = path.join(pkgDir, subpath);
+  data.request = resolved;
 }
 function applyTailwindcssCssImportRewrite(compiler, options) {
   if (!options.enabled) {

package/dist/index.js

@@ -2,15 +2,15 @@
 
 
 
-var _chunkGI2M6KFDjs = require('./chunk-GI2M6KFD.js');
-require('./chunk-R3CUQGRM.js');
+var _chunkMYNTKRVTjs = require('./chunk-MYNTKRVT.js');
+require('./chunk-NQTLEEK5.js');
 
 
 var _chunkQNGB574Ljs = require('./chunk-QNGB574L.js');
 
 
-var _chunkFQ5MKRKXjs = require('./chunk-FQ5MKRKX.js');
-require('./chunk-A5VN7CO5.js');
+var _chunk5XFZ2DUBjs = require('./chunk-5XFZ2DUB.js');
+require('./chunk-U7OMIV3S.js');
 require('./chunk-LTJQUORK.js');
 require('./chunk-X7QD7NUX.js');
 require('./chunk-KMCQEHJM.js');
@@ -22,4 +22,4 @@ require('./chunk-XGRBCPBI.js');
 
 
 
-exports.UnifiedViteWeappTailwindcssPlugin = _chunkFQ5MKRKXjs.UnifiedViteWeappTailwindcssPlugin; exports.UnifiedWebpackPluginV5 = _chunkGI2M6KFDjs.UnifiedWebpackPluginV5; exports.createPlugins = _chunkQNGB574Ljs.createPlugins; exports.weappTailwindcssPackageDir = _chunkGI2M6KFDjs.weappTailwindcssPackageDir;
+exports.UnifiedViteWeappTailwindcssPlugin = _chunk5XFZ2DUBjs.UnifiedViteWeappTailwindcssPlugin; exports.UnifiedWebpackPluginV5 = _chunkMYNTKRVTjs.UnifiedWebpackPluginV5; exports.createPlugins = _chunkQNGB574Ljs.createPlugins; exports.weappTailwindcssPackageDir = _chunkMYNTKRVTjs.weappTailwindcssPackageDir;

package/dist/index.mjs

@@ -2,15 +2,15 @@ import "./chunk-YAN7TO2B.mjs";
 import {
   UnifiedWebpackPluginV5,
   weappTailwindcssPackageDir
-} from "./chunk-QK5QBH6X.mjs";
-import "./chunk-UKAU6OXS.mjs";
+} from "./chunk-MSFAEBH6.mjs";
+import "./chunk-YHZB3KHY.mjs";
 import {
   createPlugins
 } from "./chunk-3RXY3OXF.mjs";
 import {
   UnifiedViteWeappTailwindcssPlugin
-} from "./chunk-5RHSVID3.mjs";
-import "./chunk-TTIRN5LZ.mjs";
+} from "./chunk-DHHTSM3K.mjs";
+import "./chunk-JW7P34IH.mjs";
 import "./chunk-RRHPTTCP.mjs";
 import "./chunk-TTCMOWCO.mjs";
 import "./chunk-YW5YW5D4.mjs";

package/dist/vite.js

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkFQ5MKRKXjs = require('./chunk-FQ5MKRKX.js');
-require('./chunk-A5VN7CO5.js');
+var _chunk5XFZ2DUBjs = require('./chunk-5XFZ2DUB.js');
+require('./chunk-U7OMIV3S.js');
 require('./chunk-LTJQUORK.js');
 require('./chunk-X7QD7NUX.js');
 require('./chunk-KMCQEHJM.js');
@@ -10,4 +10,4 @@ require('./chunk-UW3WHSZ5.js');
 require('./chunk-XGRBCPBI.js');
 
 
-exports.UnifiedViteWeappTailwindcssPlugin = _chunkFQ5MKRKXjs.UnifiedViteWeappTailwindcssPlugin;
+exports.UnifiedViteWeappTailwindcssPlugin = _chunk5XFZ2DUBjs.UnifiedViteWeappTailwindcssPlugin;

package/dist/vite.mjs

@@ -1,7 +1,7 @@
 import {
   UnifiedViteWeappTailwindcssPlugin
-} from "./chunk-5RHSVID3.mjs";
-import "./chunk-TTIRN5LZ.mjs";
+} from "./chunk-DHHTSM3K.mjs";
+import "./chunk-JW7P34IH.mjs";
 import "./chunk-RRHPTTCP.mjs";
 import "./chunk-TTCMOWCO.mjs";
 import "./chunk-YW5YW5D4.mjs";

package/dist/webpack.d.mts

@@ -17,6 +17,7 @@ declare const weappTailwindcssPackageDir: string;
 declare class UnifiedWebpackPluginV5 implements IBaseWebpackPlugin {
     options: InternalUserDefinedOptions;
     appType?: AppType;
+    private readonly userSpecifiedRewriteCssImports;
     constructor(options?: UserDefinedOptions);
     apply(compiler: Compiler): void;
 }

package/dist/webpack.d.ts

@@ -17,6 +17,7 @@ declare const weappTailwindcssPackageDir: string;
 declare class UnifiedWebpackPluginV5 implements IBaseWebpackPlugin {
     options: InternalUserDefinedOptions;
     appType?: AppType;
+    private readonly userSpecifiedRewriteCssImports;
     constructor(options?: UserDefinedOptions);
     apply(compiler: Compiler): void;
 }

package/dist/webpack.js

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkGI2M6KFDjs = require('./chunk-GI2M6KFD.js');
-require('./chunk-R3CUQGRM.js');
-require('./chunk-A5VN7CO5.js');
+var _chunkMYNTKRVTjs = require('./chunk-MYNTKRVT.js');
+require('./chunk-NQTLEEK5.js');
+require('./chunk-U7OMIV3S.js');
 require('./chunk-LTJQUORK.js');
 require('./chunk-X7QD7NUX.js');
 require('./chunk-KMCQEHJM.js');
@@ -13,4 +13,4 @@ require('./chunk-XGRBCPBI.js');
 
 
 
-exports.UnifiedWebpackPluginV5 = _chunkGI2M6KFDjs.UnifiedWebpackPluginV5; exports.weappTailwindcssPackageDir = _chunkGI2M6KFDjs.weappTailwindcssPackageDir;
+exports.UnifiedWebpackPluginV5 = _chunkMYNTKRVTjs.UnifiedWebpackPluginV5; exports.weappTailwindcssPackageDir = _chunkMYNTKRVTjs.weappTailwindcssPackageDir;

package/dist/webpack.mjs

@@ -1,9 +1,9 @@
 import {
   UnifiedWebpackPluginV5,
   weappTailwindcssPackageDir
-} from "./chunk-QK5QBH6X.mjs";
-import "./chunk-UKAU6OXS.mjs";
-import "./chunk-TTIRN5LZ.mjs";
+} from "./chunk-MSFAEBH6.mjs";
+import "./chunk-YHZB3KHY.mjs";
+import "./chunk-JW7P34IH.mjs";
 import "./chunk-RRHPTTCP.mjs";
 import "./chunk-TTCMOWCO.mjs";
 import "./chunk-YW5YW5D4.mjs";

package/dist/webpack4.d.mts

@@ -18,6 +18,7 @@ declare const weappTailwindcssPackageDir: string;
 declare class UnifiedWebpackPluginV4 implements IBaseWebpackPlugin {
     options: InternalUserDefinedOptions;
     appType?: AppType;
+    private readonly userSpecifiedRewriteCssImports;
     constructor(options?: UserDefinedOptions);
     apply(compiler: Compiler): void;
 }

package/dist/webpack4.d.ts

@@ -18,6 +18,7 @@ declare const weappTailwindcssPackageDir: string;
 declare class UnifiedWebpackPluginV4 implements IBaseWebpackPlugin {
     options: InternalUserDefinedOptions;
     appType?: AppType;
+    private readonly userSpecifiedRewriteCssImports;
     constructor(options?: UserDefinedOptions);
     apply(compiler: Compiler): void;
 }

package/dist/webpack4.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 _chunkR3CUQGRMjs = require('./chunk-R3CUQGRM.js');
+var _chunkNQTLEEK5js = require('./chunk-NQTLEEK5.js');
 
 
 
 
 
-var _chunkA5VN7CO5js = require('./chunk-A5VN7CO5.js');
+var _chunkU7OMIV3Sjs = require('./chunk-U7OMIV3S.js');
 
 
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
@@ -32,10 +32,11 @@ var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 var _webpacksources = require('webpack-sources');
 var debug = _chunkX7QD7NUXjs.createDebug.call(void 0, );
-var weappTailwindcssPackageDir = _chunkA5VN7CO5js.resolvePackageDir.call(void 0, "weapp-tailwindcss");
+var weappTailwindcssPackageDir = _chunkU7OMIV3Sjs.resolvePackageDir.call(void 0, "weapp-tailwindcss");
 var UnifiedWebpackPluginV4 = class {
   constructor(options = {}) {
     this.options = _chunkX7QD7NUXjs.getCompilerContext.call(void 0, options);
+    this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
     this.appType = this.options.appType;
   }
   apply(compiler) {
@@ -57,10 +58,13 @@ var UnifiedWebpackPluginV4 = class {
     if (disabled) {
       return;
     }
-    _chunkR3CUQGRMjs.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
-      pkgDir: weappTailwindcssPackageDir,
-      enabled: this.options.rewriteCssImports !== false
-    });
+    const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (_nullishCoalesce(initialTwPatcher.majorVersion, () => ( 0))) >= 4);
+    if (shouldRewriteCssImports) {
+      _chunkNQTLEEK5js.applyTailwindcssCssImportRewrite.call(void 0, compiler, {
+        pkgDir: weappTailwindcssPackageDir,
+        enabled: true
+      });
+    }
     const runtimeState = {
       twPatcher: initialTwPatcher,
       patchPromise: _chunkX7QD7NUXjs.createTailwindPatchPromise.call(void 0, initialTwPatcher),
@@ -110,13 +114,13 @@ var UnifiedWebpackPluginV4 = class {
       const jsAssets = /* @__PURE__ */ new Map();
       for (const [file] of entries) {
         if (this.options.jsMatcher(file) || this.options.wxsMatcher(file)) {
-          const absolute = _chunkA5VN7CO5js.toAbsoluteOutputPath.call(void 0, file, outputDir);
+          const absolute = _chunkU7OMIV3Sjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
           jsAssets.set(absolute, file);
         }
       }
       const moduleGraphOptions = {
         resolve(specifier, importer) {
-          return _chunkA5VN7CO5js.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
+          return _chunkU7OMIV3Sjs.resolveOutputSpecifier.call(void 0, specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
         },
         load: (id) => {
           const assetName = jsAssets.get(id);
@@ -198,14 +202,14 @@ var UnifiedWebpackPluginV4 = class {
       const jsTaskFactories = [];
       if (Array.isArray(groupedEntries.js)) {
         for (const [file] of groupedEntries.js) {
-          const cacheKey = _chunkR3CUQGRMjs.getCacheKey.call(void 0, file);
+          const cacheKey = _chunkNQTLEEK5js.getCacheKey.call(void 0, file);
           const assetSource = compilation.assets[file];
           if (!assetSource) {
             continue;
           }
           const initialValue = assetSource.source();
           const initialRawSource = typeof initialValue === "string" ? initialValue : initialValue.toString();
-          const absoluteFile = _chunkA5VN7CO5js.toAbsoluteOutputPath.call(void 0, file, outputDir);
+          const absoluteFile = _chunkU7OMIV3Sjs.toAbsoluteOutputPath.call(void 0, file, outputDir);
           jsTaskFactories.push(async () => {
             await _chunkLTJQUORKjs.processCachedTask.call(void 0, {
               cache,
@@ -278,7 +282,7 @@ var UnifiedWebpackPluginV4 = class {
           );
         }
       }
-      _chunkA5VN7CO5js.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
+      _chunkU7OMIV3Sjs.pushConcurrentTaskFactories.call(void 0, tasks, jsTaskFactories);
       await Promise.all(tasks);
       debug("end");
       onEnd();

package/dist/webpack4.mjs

@@ -1,13 +1,13 @@
 import {
   applyTailwindcssCssImportRewrite,
   getCacheKey
-} from "./chunk-UKAU6OXS.mjs";
+} from "./chunk-YHZB3KHY.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveOutputSpecifier,
   resolvePackageDir,
   toAbsoluteOutputPath
-} from "./chunk-TTIRN5LZ.mjs";
+} from "./chunk-JW7P34IH.mjs";
 import {
   processCachedTask
 } from "./chunk-RRHPTTCP.mjs";
@@ -38,6 +38,7 @@ var weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 var UnifiedWebpackPluginV4 = class {
   constructor(options = {}) {
     this.options = getCompilerContext(options);
+    this.userSpecifiedRewriteCssImports = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
     this.appType = this.options.appType;
   }
   apply(compiler) {
@@ -59,10 +60,13 @@ var UnifiedWebpackPluginV4 = class {
     if (disabled) {
       return;
     }
-    applyTailwindcssCssImportRewrite(compiler, {
-      pkgDir: weappTailwindcssPackageDir,
-      enabled: this.options.rewriteCssImports !== false
-    });
+    const shouldRewriteCssImports = this.options.rewriteCssImports !== false && (this.userSpecifiedRewriteCssImports || (initialTwPatcher.majorVersion ?? 0) >= 4);
+    if (shouldRewriteCssImports) {
+      applyTailwindcssCssImportRewrite(compiler, {
+        pkgDir: weappTailwindcssPackageDir,
+        enabled: true
+      });
+    }
     const runtimeState = {
       twPatcher: initialTwPatcher,
       patchPromise: createTailwindPatchPromise(initialTwPatcher),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "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",