weapp-tailwindcss 3.2.1 → 3.3.0

package/dist/webpack4.mjs

@@ -1,15 +1,15 @@
-import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-D1IYbX_E.mjs';
+import { g as getOptions, _ as __awaiter } from './options-SmfRHxH0.mjs';
 import path from 'node:path';
 import fs from 'node:fs';
 import { ConcatSource, RawSource } from 'webpack-sources';
-import { b as pluginName } from './index-DC60ES8u.mjs';
-import { g as getGroupedEntries, r as removeExt } from './defaults-DOGbAFEj.mjs';
+import { b as pluginName } from './index-BPzIdybK.mjs';
+import { g as getGroupedEntries, r as removeExt } from './defaults-BDivGN-J.mjs';
 import { c as createDebug } from './index-BEIjgKpF.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import '@ast-core/escape';
-import './shared-BX0VV-pr.mjs';
+import './shared-DbJl6i6a.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/traverse';
@@ -17,6 +17,7 @@ import '@babel/parser';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
+import 'node:process';
 import 'semver';
 import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';
@@ -35,16 +36,13 @@ class UnifiedWebpackPluginV4 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, tailwindcssBasedir } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, twPatcher, } = this.options;
         if (disabled) {
             return;
         }
         patch === null || patch === void 0 ? void 0 : patch();
-        const twPatcher = createTailwindcssPatcher();
         function getClassSet() {
-            return twPatcher.getClassSet({
-                basedir: tailwindcssBasedir
-            });
+            return twPatcher.getClassSet();
         }
         onLoad();
         const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path.resolve(__dirname, './weapp-tw-runtime-loader.js');
@@ -52,15 +50,15 @@ class UnifiedWebpackPluginV4 {
         const WeappTwRuntimeAopLoader = {
             loader,
             options: {
-                getClassSet
+                getClassSet,
             },
             ident: null,
-            type: 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'));
+                    const idx = module.loaders.findIndex(x => x.loader.includes('postcss-loader'));
                     if (idx > -1) {
                         module.loaders.unshift(WeappTwRuntimeAopLoader);
                     }
@@ -100,7 +98,7 @@ class UnifiedWebpackPluginV4 {
                         }
                     }, () => __awaiter(this, void 0, void 0, function* () {
                         const wxml = yield templateHandler(rawSource, {
-                            runtimeSet
+                            runtimeSet,
                         });
                         const source = new ConcatSource(wxml);
                         compilation.updateAsset(file, source);
@@ -109,7 +107,7 @@ class UnifiedWebpackPluginV4 {
                         noCachedCount++;
                         return {
                             key: cacheKey,
-                            source
+                            source,
                         };
                     }));
                 }
@@ -131,10 +129,10 @@ class UnifiedWebpackPluginV4 {
                         }
                     }, () => __awaiter(this, void 0, void 0, function* () {
                         const rawSource = originalSource.source().toString();
-                        const mapFilename = file + '.map';
+                        const mapFilename = `${file}.map`;
                         const hasMap = Boolean(assets[mapFilename]);
                         const { code, map } = yield jsHandler(rawSource, runtimeSet, {
-                            generateMap: hasMap
+                            generateMap: hasMap,
                         });
                         const source = new ConcatSource(code);
                         compilation.updateAsset(file, source);
@@ -147,7 +145,7 @@ class UnifiedWebpackPluginV4 {
                         }
                         return {
                             key: cacheKey,
-                            source
+                            source,
                         };
                     }));
                 }
@@ -172,7 +170,7 @@ class UnifiedWebpackPluginV4 {
                         }
                     }, () => __awaiter(this, void 0, void 0, function* () {
                         const css = yield styleHandler(rawSource, {
-                            isMainChunk: mainCssChunkMatcher(file, this.appType)
+                            isMainChunk: mainCssChunkMatcher(file, this.appType),
                         });
                         const source = new ConcatSource(css);
                         compilation.updateAsset(file, source);
@@ -181,7 +179,7 @@ class UnifiedWebpackPluginV4 {
                         noCachedCount++;
                         return {
                             key: cacheKey,
-                            source
+                            source,
                         };
                     }));
                 }

package/dist/wxml/shared.d.ts

@@ -1,2 +1,2 @@
-import { ITemplateHandlerOptions } from "../types";
+import type { ITemplateHandlerOptions } from "../types";
 export declare function replaceWxml(original: string, options?: ITemplateHandlerOptions): string;

package/dist/wxml/utils.d.ts

@@ -1,5 +1,5 @@
-import { ItemOrItemArray } from "../reg";
-import type { RawSource, ITemplateHandlerOptions } from "../types";
+import type { ItemOrItemArray } from "../reg";
+import type { ITemplateHandlerOptions, RawSource } from "../types";
 export declare function generateCode(match: string, options?: ITemplateHandlerOptions): string;
 export declare function extractSource(original: string): RawSource[];
 export declare function templateReplacer(original: string, options?: ITemplateHandlerOptions): string;

package/package.json

@@ -1,68 +1,105 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "author": "SonOfMagic <qq1324318532@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://weapp-tw.icebreaker.top",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sonofmagic/weapp-tailwindcss.git"
+  },
+  "bugs": {
+    "url": "https://github.com/sonofmagic/weapp-tailwindcss/issues"
+  },
+  "keywords": [
+    "tailwindcss",
+    "weapp",
+    "wechat",
+    "mini",
+    "miniprogram",
+    "mini app",
+    "weapp-tw",
+    "weapp-tailwindcss",
+    "taro",
+    "uni-app",
+    "remax",
+    "rax",
+    "mpx",
+    "jit",
+    "mp",
+    "android",
+    "ios",
+    "小程序",
+    "vite",
+    "postcss",
+    "webpack",
+    "webpack-plugin",
+    "gulp",
+    "gulp-plugin"
+  ],
+  "sideEffects": false,
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
     },
     "./replace": {
       "types": "./dist/replace.d.ts",
-      "require": "./dist/replace.js",
-      "import": "./dist/replace.mjs"
+      "import": "./dist/replace.mjs",
+      "require": "./dist/replace.js"
     },
     "./postcss": {
       "types": "./dist/postcss.d.ts",
-      "require": "./dist/postcss.js",
-      "import": "./dist/postcss.mjs"
+      "import": "./dist/postcss.mjs",
+      "require": "./dist/postcss.js"
     },
     "./vite": {
       "types": "./dist/vite.d.ts",
-      "require": "./dist/vite.js",
-      "import": "./dist/vite.mjs"
+      "import": "./dist/vite.mjs",
+      "require": "./dist/vite.js"
     },
     "./webpack": {
       "types": "./dist/webpack.d.ts",
-      "require": "./dist/webpack.js",
-      "import": "./dist/webpack.mjs"
+      "import": "./dist/webpack.mjs",
+      "require": "./dist/webpack.js"
     },
     "./webpack4": {
       "types": "./dist/webpack4.d.ts",
-      "require": "./dist/webpack4.js",
-      "import": "./dist/webpack4.mjs"
+      "import": "./dist/webpack4.mjs",
+      "require": "./dist/webpack4.js"
     },
     "./core": {
       "types": "./dist/core.d.ts",
-      "require": "./dist/core.js",
-      "import": "./dist/core.mjs"
+      "import": "./dist/core.mjs",
+      "require": "./dist/core.js"
     },
     "./gulp": {
       "types": "./dist/gulp.d.ts",
-      "require": "./dist/gulp.js",
-      "import": "./dist/gulp.mjs"
+      "import": "./dist/gulp.mjs",
+      "require": "./dist/gulp.js"
     },
     "./defaults": {
       "types": "./dist/defaults.d.ts",
-      "require": "./dist/defaults.js",
-      "import": "./dist/defaults.mjs"
+      "import": "./dist/defaults.mjs",
+      "require": "./dist/defaults.js"
     },
     "./css-macro/postcss": {
       "types": "./dist/css-macro/postcss.d.ts",
-      "require": "./dist/css-macro/postcss.js",
-      "import": "./dist/css-macro/postcss.mjs"
+      "import": "./dist/css-macro/postcss.mjs",
+      "require": "./dist/css-macro/postcss.js"
     },
     "./css-macro": {
       "types": "./dist/css-macro/index.d.ts",
-      "require": "./dist/css-macro/index.js",
-      "import": "./dist/css-macro/index.mjs"
+      "import": "./dist/css-macro/index.mjs",
+      "require": "./dist/css-macro/index.js"
     },
     "./*": "./*"
   },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "typesVersions": {
     "*": {
       "*": [
@@ -71,67 +108,33 @@
       ]
     }
   },
-  "sideEffects": false,
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sonofmagic/weapp-tailwindcss.git"
+  "bin": {
+    "weapp-tailwindcss-webpack-plugin": "bin/weapp-tailwindcss.js",
+    "weapp-tailwindcss": "bin/weapp-tailwindcss.js",
+    "weapp-tw": "bin/weapp-tailwindcss.js"
   },
   "files": [
     "bin",
     "dist"
   ],
-  "bin": {
-    "weapp-tailwindcss-webpack-plugin": "bin/weapp-tailwindcss.js",
-    "weapp-tailwindcss": "bin/weapp-tailwindcss.js",
-    "weapp-tw": "bin/weapp-tailwindcss.js"
+  "engines": {
+    "node": ">=16.6.0"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "keywords": [
-    "tailwindcss",
-    "weapp",
-    "wechat",
-    "mini",
-    "miniprogram",
-    "mini app",
-    "weapp-tw",
-    "weapp-tailwindcss",
-    "taro",
-    "uni-app",
-    "remax",
-    "rax",
-    "mpx",
-    "jit",
-    "mp",
-    "android",
-    "ios",
-    "小程序",
-    "vite",
-    "postcss",
-    "webpack",
-    "webpack-plugin",
-    "gulp",
-    "gulp-plugin"
-  ],
-  "author": "SonOfMagic <qq1324318532@gmail.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/sonofmagic/weapp-tailwindcss/issues"
-  },
-  "homepage": "https://weapp-tw.icebreaker.top",
   "dependencies": {
     "@ast-core/escape": "^1.0.1",
-    "@babel/generator": "7.24.5",
-    "@babel/parser": "7.24.5",
-    "@babel/traverse": "7.24.5",
-    "@babel/types": "7.24.5",
-    "@csstools/postcss-is-pseudo-class": "4.0.6",
+    "@babel/generator": "7.24.7",
+    "@babel/parser": "7.24.7",
+    "@babel/traverse": "7.24.7",
+    "@babel/types": "7.24.7",
+    "@csstools/postcss-is-pseudo-class": "4.0.8",
     "@tailwindcss-mangle/shared": "^2.2.2",
     "@weapp-core/escape": "^2.0.0",
     "@weapp-core/regex": "^1.0.1",
-    "debug": "4.3.4",
+    "debug": "4.3.5",
     "htmlparser2": "9.1.0",
     "loader-utils": "2.0.4",
     "lru-cache": "10.2.2",
@@ -139,14 +142,11 @@
     "md5": "2.3.0",
     "postcss": "8.4.38",
     "postcss-rem-to-responsive-pixel": "^6.0.1",
-    "postcss-selector-parser": "6.0.16",
-    "semver": "7.6.1",
-    "tailwindcss-patch": "^2.2.3",
+    "postcss-selector-parser": "6.1.0",
+    "semver": "7.6.2",
+    "tailwindcss-patch": "^3.0.0",
     "webpack-sources": "3.2.3"
   },
-  "engines": {
-    "node": ">=16.6.0"
-  },
   "scripts": {
     "dev": "pnpm clean && pnpm dts && cross-env NODE_ENV=development rollup -c rollup.config.ts --configPlugin typescript -w",
     "build": "pnpm clean && cross-env NODE_ENV=production rollup -c rollup.config.ts --configPlugin typescript && pnpm dts",
@@ -168,6 +168,8 @@
     "bump": "bumpp",
     "release": "node scripts/release.js",
     "generate:readme": "ts-node scripts/readme/write.ts",
+    "lint": "eslint .",
+    "lint:fix": "eslint ./test --fix",
     "-------": "-----------",
     "postinstall": "node bin/weapp-tailwindcss.js patch"
   }