weapp-tailwindcss 4.2.2-alpha.1 → 4.2.2

package/dist/{chunk-JJBOP2VI.js → chunk-6DZTQZYI.js}

@@ -65,6 +65,7 @@ function transformUVue(code, id, jsHandler, runtimeSet) {
   }
   return {
     code: ms.toString(),
+    // @ts-ignore
     get map() {
       return ms.generateMap();
     }
@@ -96,13 +97,46 @@ function parseVueRequest(id) {
   };
 }
 
-// src/bundlers/vite/index.ts
-var debug = _chunkLSSLYD6Bjs.createDebug.call(void 0, );
+// src/bundlers/vite/utils.ts
+var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+var _process = require('process'); var _process2 = _interopRequireDefault(_process);
+function slash(p) {
+  return p.replace(/\\/g, "/");
+}
+var isWindows = _process2.default.platform === "win32";
 var cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 var cssLangRE = new RegExp(cssLangs);
 function isCSSRequest(request) {
   return cssLangRE.test(request);
 }
+function normalizePath(id) {
+  return _path2.default.posix.normalize(isWindows ? slash(id) : id);
+}
+var postfixRE = /[?#].*$/;
+function cleanUrl(url) {
+  return url.replace(postfixRE, "");
+}
+async function formatPostcssSourceMap(rawMap, file) {
+  const inputFileDir = _path2.default.dirname(file);
+  const sources = rawMap.sources.map((source) => {
+    const cleanSource = cleanUrl(decodeURIComponent(source));
+    if (cleanSource[0] === "<" && cleanSource.endsWith(">")) {
+      return `\0${cleanSource}`;
+    }
+    return normalizePath(_path2.default.resolve(inputFileDir, cleanSource));
+  });
+  return {
+    file,
+    mappings: rawMap.mappings,
+    names: rawMap.names,
+    sources,
+    sourcesContent: rawMap.sourcesContent,
+    version: rawMap.version
+  };
+}
+
+// src/bundlers/vite/index.ts
+var debug = _chunkLSSLYD6Bjs.createDebug.call(void 0, );
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   const opts = _chunkPLEG4SRNjs.getCompilerContext.call(void 0, options);
   const {
@@ -323,53 +357,48 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     }
   ];
   if (uniAppX) {
-    plugins.push(
-      {
-        name: "weapp-tailwindcss:uni-app-x:css:pre",
-        enforce: "pre",
-        async transform(code, id) {
-          const { query } = parseVueRequest(id);
-          if (isCSSRequest(id) || query.vue && query.type === "style") {
-            const { css, map } = await styleHandler(code, {
-              isMainChunk: mainCssChunkMatcher(id, appType),
-              postcssOptions: {
-                options: {
-                  from: id,
-                  map: true
-                }
-              }
-            });
-            return {
-              code: css,
-              map: _optionalChain([map, 'optionalAccess', _5 => _5.toString, 'call', _6 => _6()])
-            };
-          }
-        }
-      }
-    );
-    plugins.push(
-      {
-        name: "weapp-tailwindcss:uni-app-x:css",
-        async transform(code, id) {
-          const { query } = parseVueRequest(id);
-          if (isCSSRequest(id) || query.vue && query.type === "style") {
-            const { css, map } = await styleHandler(code, {
-              isMainChunk: mainCssChunkMatcher(id, appType),
-              postcssOptions: {
-                options: {
-                  from: id,
-                  map: true
+    ;
+    [void 0, "pre"].forEach((enforce) => {
+      plugins.push(
+        {
+          name: `weapp-tailwindcss:uni-app-x:css${enforce ? `:${enforce}` : ""}`,
+          enforce,
+          async transform(code, id) {
+            const { query } = parseVueRequest(id);
+            if (isCSSRequest(id) || query.vue && query.type === "style") {
+              const postcssResult = await styleHandler(code, {
+                isMainChunk: mainCssChunkMatcher(id, appType),
+                postcssOptions: {
+                  options: {
+                    from: id,
+                    map: {
+                      inline: false,
+                      annotation: false,
+                      // postcss may return virtual files
+                      // we cannot obtain content of them, so this needs to be enabled
+                      sourcesContent: true
+                      // when "prev: preprocessorMap", the result map may include duplicate filename in `postcssResult.map.sources`
+                      // prev: preprocessorMap,
+                    }
+                  }
                 }
-              }
-            });
-            return {
-              code: css,
-              map: _optionalChain([map, 'optionalAccess', _7 => _7.toString, 'call', _8 => _8()])
-            };
+              });
+              const rawPostcssMap = postcssResult.map.toJSON();
+              const postcssMap = await formatPostcssSourceMap(
+                // version property of rawPostcssMap is declared as string
+                // but actually it is a number
+                rawPostcssMap,
+                cleanUrl(id)
+              );
+              return {
+                code: postcssResult.css,
+                map: postcssMap
+              };
+            }
           }
         }
-      }
-    );
+      );
+    });
     plugins.push(
       {
         name: "weapp-tailwindcss:uni-app-x:nvue",
@@ -391,6 +420,4 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
 
 
 
-
-
-exports.cssLangRE = cssLangRE; exports.isCSSRequest = isCSSRequest; exports.UnifiedViteWeappTailwindcssPlugin = UnifiedViteWeappTailwindcssPlugin;
+exports.UnifiedViteWeappTailwindcssPlugin = UnifiedViteWeappTailwindcssPlugin;

package/dist/{chunk-DHRJQIWW.mjs → chunk-S75INQRJ.mjs}

@@ -65,6 +65,7 @@ function transformUVue(code, id, jsHandler, runtimeSet) {
   }
   return {
     code: ms.toString(),
+    // @ts-ignore
     get map() {
       return ms.generateMap();
     }
@@ -96,13 +97,46 @@ function parseVueRequest(id) {
   };
 }
 
-// src/bundlers/vite/index.ts
-var debug = createDebug();
+// src/bundlers/vite/utils.ts
+import path from "path";
+import process from "process";
+function slash(p) {
+  return p.replace(/\\/g, "/");
+}
+var isWindows = process.platform === "win32";
 var cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 var cssLangRE = new RegExp(cssLangs);
 function isCSSRequest(request) {
   return cssLangRE.test(request);
 }
+function normalizePath(id) {
+  return path.posix.normalize(isWindows ? slash(id) : id);
+}
+var postfixRE = /[?#].*$/;
+function cleanUrl(url) {
+  return url.replace(postfixRE, "");
+}
+async function formatPostcssSourceMap(rawMap, file) {
+  const inputFileDir = path.dirname(file);
+  const sources = rawMap.sources.map((source) => {
+    const cleanSource = cleanUrl(decodeURIComponent(source));
+    if (cleanSource[0] === "<" && cleanSource.endsWith(">")) {
+      return `\0${cleanSource}`;
+    }
+    return normalizePath(path.resolve(inputFileDir, cleanSource));
+  });
+  return {
+    file,
+    mappings: rawMap.mappings,
+    names: rawMap.names,
+    sources,
+    sourcesContent: rawMap.sourcesContent,
+    version: rawMap.version
+  };
+}
+
+// src/bundlers/vite/index.ts
+var debug = createDebug();
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
   const opts = getCompilerContext(options);
   const {
@@ -323,53 +357,48 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     }
   ];
   if (uniAppX) {
-    plugins.push(
-      {
-        name: "weapp-tailwindcss:uni-app-x:css:pre",
-        enforce: "pre",
-        async transform(code, id) {
-          const { query } = parseVueRequest(id);
-          if (isCSSRequest(id) || query.vue && query.type === "style") {
-            const { css, map } = await styleHandler(code, {
-              isMainChunk: mainCssChunkMatcher(id, appType),
-              postcssOptions: {
-                options: {
-                  from: id,
-                  map: true
-                }
-              }
-            });
-            return {
-              code: css,
-              map: map?.toString()
-            };
-          }
-        }
-      }
-    );
-    plugins.push(
-      {
-        name: "weapp-tailwindcss:uni-app-x:css",
-        async transform(code, id) {
-          const { query } = parseVueRequest(id);
-          if (isCSSRequest(id) || query.vue && query.type === "style") {
-            const { css, map } = await styleHandler(code, {
-              isMainChunk: mainCssChunkMatcher(id, appType),
-              postcssOptions: {
-                options: {
-                  from: id,
-                  map: true
+    ;
+    [void 0, "pre"].forEach((enforce) => {
+      plugins.push(
+        {
+          name: `weapp-tailwindcss:uni-app-x:css${enforce ? `:${enforce}` : ""}`,
+          enforce,
+          async transform(code, id) {
+            const { query } = parseVueRequest(id);
+            if (isCSSRequest(id) || query.vue && query.type === "style") {
+              const postcssResult = await styleHandler(code, {
+                isMainChunk: mainCssChunkMatcher(id, appType),
+                postcssOptions: {
+                  options: {
+                    from: id,
+                    map: {
+                      inline: false,
+                      annotation: false,
+                      // postcss may return virtual files
+                      // we cannot obtain content of them, so this needs to be enabled
+                      sourcesContent: true
+                      // when "prev: preprocessorMap", the result map may include duplicate filename in `postcssResult.map.sources`
+                      // prev: preprocessorMap,
+                    }
+                  }
                 }
-              }
-            });
-            return {
-              code: css,
-              map: map?.toString()
-            };
+              });
+              const rawPostcssMap = postcssResult.map.toJSON();
+              const postcssMap = await formatPostcssSourceMap(
+                // version property of rawPostcssMap is declared as string
+                // but actually it is a number
+                rawPostcssMap,
+                cleanUrl(id)
+              );
+              return {
+                code: postcssResult.css,
+                map: postcssMap
+              };
+            }
           }
         }
-      }
-    );
+      );
+    });
     plugins.push(
       {
         name: "weapp-tailwindcss:uni-app-x:nvue",
@@ -390,7 +419,5 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
 }
 
 export {
-  cssLangRE,
-  isCSSRequest,
   UnifiedViteWeappTailwindcssPlugin
 };

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 export { createPlugins } from './gulp.mjs';
 export { AppType, CreateJsHandlerOptions, IArbitraryValues, IBaseWebpackPlugin, ICommonReplaceOptions, ICustomAttributes, ICustomAttributesEntities, IJsHandlerOptions, ITemplateHandlerOptions, InternalCssSelectorReplacerOptions, InternalPatchResult, InternalPostcssOptions, InternalUserDefinedOptions, ItemOrItemArray, JsHandler, JsHandlerResult, UserDefinedOptions } from './types.mjs';
-export { UnifiedViteWeappTailwindcssPlugin, cssLangRE, isCSSRequest } from './vite.mjs';
+export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { UnifiedWebpackPluginV5 } from './webpack.mjs';
 export { CssPreflightOptions, IStyleHandlerOptions } from '@weapp-tailwindcss/postcss';
 export { IMangleScopeContext } from '@weapp-tailwindcss/mangle';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { createPlugins } from './gulp.js';
 export { AppType, CreateJsHandlerOptions, IArbitraryValues, IBaseWebpackPlugin, ICommonReplaceOptions, ICustomAttributes, ICustomAttributesEntities, IJsHandlerOptions, ITemplateHandlerOptions, InternalCssSelectorReplacerOptions, InternalPatchResult, InternalPostcssOptions, InternalUserDefinedOptions, ItemOrItemArray, JsHandler, JsHandlerResult, UserDefinedOptions } from './types.js';
-export { UnifiedViteWeappTailwindcssPlugin, cssLangRE, isCSSRequest } from './vite.js';
+export { UnifiedViteWeappTailwindcssPlugin } from './vite.js';
 export { UnifiedWebpackPluginV5 } from './webpack.js';
 export { CssPreflightOptions, IStyleHandlerOptions } from '@weapp-tailwindcss/postcss';
 export { IMangleScopeContext } from '@weapp-tailwindcss/mangle';

package/dist/index.js

@@ -7,9 +7,7 @@ var _chunkZK5OYQKNjs = require('./chunk-ZK5OYQKN.js');
 var _chunkXPJSMUIZjs = require('./chunk-XPJSMUIZ.js');
 
 
-
-
-var _chunkJJBOP2VIjs = require('./chunk-JJBOP2VI.js');
+var _chunk6DZTQZYIjs = require('./chunk-6DZTQZYI.js');
 require('./chunk-LSSLYD6B.js');
 require('./chunk-OGROHM4L.js');
 require('./chunk-PLEG4SRN.js');
@@ -21,6 +19,4 @@ require('./chunk-U5U4QBHD.js');
 
 
 
-
-
-exports.UnifiedViteWeappTailwindcssPlugin = _chunkJJBOP2VIjs.UnifiedViteWeappTailwindcssPlugin; exports.UnifiedWebpackPluginV5 = _chunkZK5OYQKNjs.UnifiedWebpackPluginV5; exports.createPlugins = _chunkXPJSMUIZjs.createPlugins; exports.cssLangRE = _chunkJJBOP2VIjs.cssLangRE; exports.isCSSRequest = _chunkJJBOP2VIjs.isCSSRequest;
+exports.UnifiedViteWeappTailwindcssPlugin = _chunk6DZTQZYIjs.UnifiedViteWeappTailwindcssPlugin; exports.UnifiedWebpackPluginV5 = _chunkZK5OYQKNjs.UnifiedWebpackPluginV5; exports.createPlugins = _chunkXPJSMUIZjs.createPlugins;

package/dist/index.mjs

@@ -6,10 +6,8 @@ import {
   createPlugins
 } from "./chunk-RF63Y6B4.mjs";
 import {
-  UnifiedViteWeappTailwindcssPlugin,
-  cssLangRE,
-  isCSSRequest
-} from "./chunk-DHRJQIWW.mjs";
+  UnifiedViteWeappTailwindcssPlugin
+} from "./chunk-S75INQRJ.mjs";
 import "./chunk-3AUX4FGE.mjs";
 import "./chunk-CMUA5KCO.mjs";
 import "./chunk-FOPIY67W.mjs";
@@ -20,7 +18,5 @@ import "./chunk-QKNCXAGV.mjs";
 export {
   UnifiedViteWeappTailwindcssPlugin,
   UnifiedWebpackPluginV5,
-  createPlugins,
-  cssLangRE,
-  isCSSRequest
+  createPlugins
 };

package/dist/vite.d.mts

@@ -11,8 +11,6 @@ import 'webpack';
 import 'lru-cache';
 import 'postcss-preset-env';
 
-declare const cssLangRE: RegExp;
-declare function isCSSRequest(request: string): boolean;
 /**
  * @name UnifiedViteWeappTailwindcssPlugin
  * @description uni-app vite vue3 版本插件
@@ -20,4 +18,4 @@ declare function isCSSRequest(request: string): boolean;
  */
 declare function UnifiedViteWeappTailwindcssPlugin(options?: UserDefinedOptions): Plugin[] | undefined;
 
-export { UnifiedViteWeappTailwindcssPlugin, cssLangRE, isCSSRequest };
+export { UnifiedViteWeappTailwindcssPlugin };

package/dist/vite.d.ts

@@ -11,8 +11,6 @@ import 'webpack';
 import 'lru-cache';
 import 'postcss-preset-env';
 
-declare const cssLangRE: RegExp;
-declare function isCSSRequest(request: string): boolean;
 /**
  * @name UnifiedViteWeappTailwindcssPlugin
  * @description uni-app vite vue3 版本插件
@@ -20,4 +18,4 @@ declare function isCSSRequest(request: string): boolean;
  */
 declare function UnifiedViteWeappTailwindcssPlugin(options?: UserDefinedOptions): Plugin[] | undefined;
 
-export { UnifiedViteWeappTailwindcssPlugin, cssLangRE, isCSSRequest };
+export { UnifiedViteWeappTailwindcssPlugin };

package/dist/vite.js

@@ -1,8 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-
-
-var _chunkJJBOP2VIjs = require('./chunk-JJBOP2VI.js');
+var _chunk6DZTQZYIjs = require('./chunk-6DZTQZYI.js');
 require('./chunk-LSSLYD6B.js');
 require('./chunk-OGROHM4L.js');
 require('./chunk-PLEG4SRN.js');
@@ -12,6 +10,4 @@ require('./chunk-O335YLYH.js');
 require('./chunk-U5U4QBHD.js');
 
 
-
-
-exports.UnifiedViteWeappTailwindcssPlugin = _chunkJJBOP2VIjs.UnifiedViteWeappTailwindcssPlugin; exports.cssLangRE = _chunkJJBOP2VIjs.cssLangRE; exports.isCSSRequest = _chunkJJBOP2VIjs.isCSSRequest;
+exports.UnifiedViteWeappTailwindcssPlugin = _chunk6DZTQZYIjs.UnifiedViteWeappTailwindcssPlugin;

package/dist/vite.mjs

@@ -1,8 +1,6 @@
 import {
-  UnifiedViteWeappTailwindcssPlugin,
-  cssLangRE,
-  isCSSRequest
-} from "./chunk-DHRJQIWW.mjs";
+  UnifiedViteWeappTailwindcssPlugin
+} from "./chunk-S75INQRJ.mjs";
 import "./chunk-3AUX4FGE.mjs";
 import "./chunk-CMUA5KCO.mjs";
 import "./chunk-FOPIY67W.mjs";
@@ -11,7 +9,5 @@ import "./chunk-ABB7LXDE.mjs";
 import "./chunk-JXBLHLFR.mjs";
 import "./chunk-QKNCXAGV.mjs";
 export {
-  UnifiedViteWeappTailwindcssPlugin,
-  cssLangRE,
-  isCSSRequest
+  UnifiedViteWeappTailwindcssPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "4.2.2-alpha.1",
+  "version": "4.2.2",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -178,7 +178,7 @@
     "@weapp-tailwindcss/init": "1.0.3",
     "@weapp-tailwindcss/logger": "1.0.2",
     "@weapp-tailwindcss/mangle": "1.0.5",
-    "@weapp-tailwindcss/postcss": "1.0.18",
+    "@weapp-tailwindcss/postcss": "1.0.19",
     "@weapp-tailwindcss/shared": "1.0.3"
   },
   "scripts": {