weapp-tailwindcss 2.9.2 → 2.10.0

package/dist/webpack.js

@@ -2,22 +2,23 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var options = require('./options-jeQuZCU1.js');
 var path = require('node:path');
 var fs = require('node:fs');
-var options = require('./options-9dd8de2e.js');
-var postcss = require('./postcss-8d7f67b4.js');
-var defaults = require('./defaults-b7341550.js');
-var index = require('./index-aede98ce.js');
+var postcss = require('./postcss-03jfy6ZA.js');
+var defaults = require('./defaults-0O-zKoXE.js');
+var index = require('./index-z25r_Htj.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('@ast-core/escape');
-require('./shared-8b9be5f0.js');
+require('./shared-nXoJWFdz.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
+require('./defu-d2wgbAKv.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
@@ -35,7 +36,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var path__default = /*#__PURE__*/_interopDefaultCompat(path);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
-const debug = index.createDebug('');
+const debug = index.createDebug('processAssets: ');
 class UnifiedWebpackPluginV5 {
     constructor(options$1 = {}) {
         if (options$1.customReplaceDictionary === undefined) {
@@ -45,7 +46,7 @@ class UnifiedWebpackPluginV5 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, tailwindcssBasedir } = this.options;
         if (disabled) {
             return;
         }
@@ -54,7 +55,9 @@ class UnifiedWebpackPluginV5 {
         const { ConcatSource, RawSource } = sources;
         const twPatcher = options.createTailwindcssPatcher();
         function getClassSet() {
-            return twPatcher.getClassSet();
+            return twPatcher.getClassSet({
+                basedir: tailwindcssBasedir
+            });
         }
         onLoad();
         const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path__default["default"].resolve(__dirname, './weapp-tw-runtime-loader.js');
@@ -76,10 +79,10 @@ class UnifiedWebpackPluginV5 {
                     }
                 }
             });
-            compilation.hooks.processAssets.tap({
+            compilation.hooks.processAssets.tapPromise({
                 name: postcss.pluginName,
                 stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
-            }, (assets) => {
+            }, (assets) => options.__awaiter(this, void 0, void 0, function* () {
                 onStart();
                 debug('start');
                 for (const chunk of compilation.chunks) {
@@ -100,7 +103,7 @@ class UnifiedWebpackPluginV5 {
                         const hash = cache.computeHash(rawSource);
                         const cacheKey = file;
                         cache.calcHashValueChanged(cacheKey, hash);
-                        cache.process(cacheKey, () => {
+                        yield cache.process(cacheKey, () => {
                             const source = cache.get(cacheKey);
                             if (source) {
                                 compilation.updateAsset(file, source);
@@ -131,7 +134,7 @@ class UnifiedWebpackPluginV5 {
                     for (let i = 0; i < groupedEntries.js.length; i++) {
                         const [file, originalSource] = groupedEntries.js[i];
                         const cacheKey = defaults.removeExt(file);
-                        cache.process(cacheKey, () => {
+                        yield cache.process(cacheKey, () => {
                             const source = cache.get(cacheKey);
                             if (source) {
                                 compilation.updateAsset(file, source);
@@ -172,7 +175,7 @@ class UnifiedWebpackPluginV5 {
                         const hash = cache.computeHash(rawSource);
                         const cacheKey = file;
                         cache.calcHashValueChanged(cacheKey, hash);
-                        cache.process(cacheKey, () => {
+                        yield cache.process(cacheKey, () => {
                             const source = cache.get(cacheKey);
                             if (source) {
                                 compilation.updateAsset(file, source);
@@ -181,8 +184,8 @@ class UnifiedWebpackPluginV5 {
                             else {
                                 return false;
                             }
-                        }, () => {
-                            const css = styleHandler(rawSource, {
+                        }, () => options.__awaiter(this, void 0, void 0, function* () {
+                            const css = yield styleHandler(rawSource, {
                                 isMainChunk: mainCssChunkMatcher(file, this.appType)
                             });
                             const source = new ConcatSource(css);
@@ -194,13 +197,13 @@ class UnifiedWebpackPluginV5 {
                                 key: cacheKey,
                                 source
                             };
-                        });
+                        }));
                     }
                     debug('css handle finish, total: %d, no-cached: %d', groupedEntries.css.length, noCachedCount);
                 }
                 debug('end');
                 onEnd();
-            });
+            }));
         });
     }
 }

package/dist/webpack.mjs

@@ -1,19 +1,20 @@
+import { g as getOptions, a as createTailwindcssPatcher, _ as __awaiter } from './options-1ejnE5kK.mjs';
 import path from 'node:path';
 import fs from 'node:fs';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-e1a9fdd3.mjs';
-import { a as pluginName } from './postcss-55ed4d42.mjs';
-import { g as getGroupedEntries, r as removeExt } from './defaults-d2c66d23.mjs';
-import { c as createDebug } from './index-84c7aa87.mjs';
+import { a as pluginName } from './postcss-GEOOjC-4.mjs';
+import { g as getGroupedEntries, r as removeExt } from './defaults-dz6xGhOP.mjs';
+import { c as createDebug } from './index-06BoOZig.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import '@ast-core/escape';
-import './shared-283aac78.mjs';
+import './shared-S0v7ZvWs.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
+import './defu-R3SAEzGq.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
@@ -26,7 +27,7 @@ import 'md5';
 import 'postcss-selector-parser';
 import 'debug';
 
-const debug = createDebug('');
+const debug = createDebug('processAssets: ');
 class UnifiedWebpackPluginV5 {
     constructor(options = {}) {
         if (options.customReplaceDictionary === undefined) {
@@ -36,7 +37,7 @@ class UnifiedWebpackPluginV5 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, tailwindcssBasedir } = this.options;
         if (disabled) {
             return;
         }
@@ -45,7 +46,9 @@ class UnifiedWebpackPluginV5 {
         const { ConcatSource, RawSource } = sources;
         const twPatcher = createTailwindcssPatcher();
         function getClassSet() {
-            return twPatcher.getClassSet();
+            return twPatcher.getClassSet({
+                basedir: tailwindcssBasedir
+            });
         }
         onLoad();
         const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path.resolve(__dirname, './weapp-tw-runtime-loader.js');
@@ -67,10 +70,10 @@ class UnifiedWebpackPluginV5 {
                     }
                 }
             });
-            compilation.hooks.processAssets.tap({
+            compilation.hooks.processAssets.tapPromise({
                 name: pluginName,
                 stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
-            }, (assets) => {
+            }, (assets) => __awaiter(this, void 0, void 0, function* () {
                 onStart();
                 debug('start');
                 for (const chunk of compilation.chunks) {
@@ -91,7 +94,7 @@ class UnifiedWebpackPluginV5 {
                         const hash = cache.computeHash(rawSource);
                         const cacheKey = file;
                         cache.calcHashValueChanged(cacheKey, hash);
-                        cache.process(cacheKey, () => {
+                        yield cache.process(cacheKey, () => {
                             const source = cache.get(cacheKey);
                             if (source) {
                                 compilation.updateAsset(file, source);
@@ -122,7 +125,7 @@ class UnifiedWebpackPluginV5 {
                     for (let i = 0; i < groupedEntries.js.length; i++) {
                         const [file, originalSource] = groupedEntries.js[i];
                         const cacheKey = removeExt(file);
-                        cache.process(cacheKey, () => {
+                        yield cache.process(cacheKey, () => {
                             const source = cache.get(cacheKey);
                             if (source) {
                                 compilation.updateAsset(file, source);
@@ -163,7 +166,7 @@ class UnifiedWebpackPluginV5 {
                         const hash = cache.computeHash(rawSource);
                         const cacheKey = file;
                         cache.calcHashValueChanged(cacheKey, hash);
-                        cache.process(cacheKey, () => {
+                        yield cache.process(cacheKey, () => {
                             const source = cache.get(cacheKey);
                             if (source) {
                                 compilation.updateAsset(file, source);
@@ -172,8 +175,8 @@ class UnifiedWebpackPluginV5 {
                             else {
                                 return false;
                             }
-                        }, () => {
-                            const css = styleHandler(rawSource, {
+                        }, () => __awaiter(this, void 0, void 0, function* () {
+                            const css = yield styleHandler(rawSource, {
                                 isMainChunk: mainCssChunkMatcher(file, this.appType)
                             });
                             const source = new ConcatSource(css);
@@ -185,13 +188,13 @@ class UnifiedWebpackPluginV5 {
                                 key: cacheKey,
                                 source
                             };
-                        });
+                        }));
                     }
                     debug('css handle finish, total: %d, no-cached: %d', groupedEntries.css.length, noCachedCount);
                 }
                 debug('end');
                 onEnd();
-            });
+            }));
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,6 +41,16 @@
       "require": "./dist/defaults.js",
       "import": "./dist/defaults.mjs"
     },
+    "./css-macro/postcss": {
+      "types": "./dist/css-macro/postcss.d.ts",
+      "require": "./dist/css-macro/postcss.js",
+      "import": "./dist/css-macro/postcss.mjs"
+    },
+    "./css-macro": {
+      "types": "./dist/css-macro/index.d.ts",
+      "require": "./dist/css-macro/index.js",
+      "import": "./dist/css-macro/index.mjs"
+    },
     "./*": "./*"
   },
   "typesVersions": {
@@ -102,51 +112,52 @@
   },
   "homepage": "https://weapp-tw.icebreaker.top",
   "devDependencies": {
-    "@babel/core": "^7.22.20",
+    "@babel/core": "^7.23.2",
     "@icebreakers/cli": "0.1.1",
     "@icebreakers/readme": "0.1.0",
-    "@rollup/plugin-alias": "^5.0.0",
-    "@rollup/plugin-commonjs": "^25.0.4",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.2.1",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.1.3",
+    "@rollup/plugin-alias": "^5.0.1",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.5",
     "@tsconfig/recommended": "^1.0.3",
     "@types/babel__generator": "^7.6.5",
     "@types/babel__traverse": "^7.20.2",
-    "@types/debug": "^4.1.8",
-    "@types/diff": "^5.0.4",
+    "@types/debug": "^4.1.9",
+    "@types/diff": "^5.0.6",
     "@types/fs-extra": "^11.0.2",
-    "@types/gulp": "^4.0.13",
-    "@types/gulp-postcss": "^8.0.3",
+    "@types/gulp": "^4.0.15",
+    "@types/gulp-postcss": "^8.0.4",
     "@types/jest": "^29.5.5",
     "@types/js-beautify": "^1.14.1",
     "@types/klaw": "^3.0.4",
     "@types/loader-utils": "^2.0.4",
-    "@types/lodash": "^4.14.198",
-    "@types/md5": "^2.3.2",
-    "@types/micromatch": "^4.0.2",
-    "@types/node": "^20.6.2",
-    "@types/semver": "^7.5.2",
-    "@types/vinyl": "^2.0.7",
-    "@types/webpack": "^5.28.2",
-    "@types/webpack-sources": "^3.2.0",
-    "@vitest/coverage-v8": "^0.34.4",
-    "autoprefixer": "^10.4.15",
+    "@types/lodash": "^4.14.199",
+    "@types/md5": "^2.3.3",
+    "@types/micromatch": "^4.0.3",
+    "@types/node": "^20.8.6",
+    "@types/semver": "^7.5.3",
+    "@types/vinyl": "^2.0.8",
+    "@types/webpack": "^5.28.3",
+    "@types/webpack-sources": "^3.2.1",
+    "@vitest/coverage-v8": "^0.34.6",
+    "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "bumpp": "^9.2.0",
     "colorette": "^2.0.20",
     "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",
+    "css-to-tailwindcss-plugin": "^0.2.5",
     "dedent": "^1.5.1",
     "defu": "6.1.2",
     "del": "^7.1.0",
     "diff": "^5.1.0",
     "domhandler": "^5.0.3",
-    "eslint": "8.49.0",
+    "eslint": "8.51.0",
     "eslint-config-icebreaker": "^1.2.2",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "execa": "^7.2.0",
     "fast-glob": "^3.3.1",
     "fs-extra": "^11.1.1",
@@ -165,8 +176,9 @@
     "postcss-rem-to-responsive-pixel": "^5.1.3",
     "prettier": "^3.0.3",
     "promisify-loader-runner": "^1.0.0",
-    "rollup": "^3.29.2",
+    "rollup": "^4.1.4",
     "rollup-plugin-visualizer": "^5.9.2",
+    "sass": "^1.69.3",
     "style-loader": "^3.3.3",
     "tailwind-children": "^0.5.0",
     "tailwindcss": "^3.3.3",
@@ -178,33 +190,33 @@
     "typescript": "^5.2.2",
     "typescript-transform-paths": "^3.4.6",
     "vinyl": "^3.0.0",
-    "vite": "^4.4.9",
-    "vitest": "^0.34.4",
+    "vite": "^4.4.11",
+    "vitest": "^0.34.6",
     "weapp-tailwindcss-children": "^0.1.0",
-    "webpack": "^5.88.2",
+    "webpack": "^5.89.0",
     "webpack-build-utils": "^0.0.4"
   },
   "dependencies": {
     "@ast-core/escape": "^1.0.1",
-    "@babel/generator": "^7.22.15",
-    "@babel/parser": "^7.22.16",
-    "@babel/traverse": "^7.22.20",
-    "@babel/types": "^7.22.19",
-    "@csstools/postcss-is-pseudo-class": "^4.0.2",
-    "@tailwindcss-mangle/shared": "^2.2.1",
+    "@babel/generator": "^7.23.0",
+    "@babel/parser": "^7.23.0",
+    "@babel/traverse": "^7.23.2",
+    "@babel/types": "^7.23.0",
+    "@csstools/postcss-is-pseudo-class": "^4.0.3",
+    "@tailwindcss-mangle/shared": "^2.2.2",
     "@weapp-core/escape": "^2.0.0",
     "@weapp-core/regex": "^1.0.1",
     "debug": "^4.3.4",
     "htmlparser2": "^9.0.0",
     "loader-utils": "^2.0.3",
     "lru-cache": "^10.0.1",
-    "magic-string": "^0.30.3",
+    "magic-string": "^0.30.5",
     "md5": "^2.3.0",
     "micromatch": "^4.0.5",
-    "postcss": "8.4.30",
+    "postcss": "8.4.31",
     "postcss-selector-parser": "^6.0.13",
     "semver": "^7.5.4",
-    "tailwindcss-patch": "^2.2.1"
+    "tailwindcss-patch": "^2.2.2"
   },
   "packageManager": "pnpm@8.7.4",
   "engines": {
@@ -247,6 +259,8 @@
     "ls:pack": "npm pack --dry-run",
     "cli:patch": "node bin/weapp-tailwindcss.js patch",
     "release": "bumpp",
+    "css-build": "css2plugin build css-plugin.css css-plugin-scss.scss --cwd test/fixtures/css",
+    "css-build-out": "css2plugin build css-plugin.css css-plugin-scss.scss --cwd test/fixtures/css --out tw-plugins",
     "-------": "-----------",
     "postinstall": "node bin/weapp-tailwindcss.js patch"
   }