feat: 增加minify include exclude

ximing · Dec 16, 2020 · 1bfdce0 · 1bfdce0
1 parent 1973774
commit 1bfdce0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mpbuild",
-    "version": "1.4.9",
+    "version": "1.4.10",
     "description": "",
     "main": "src/index.js",
     "scripts": {

diff --git a/src/loaderManager.js b/src/loaderManager.js
@@ -34,8 +34,8 @@ module.exports = class LoaderManager {
                 if (test.test(asset.name)) {
                     let shouleRunLoder = true;
                     if (Array.isArray(exclude)) {
-                        const shouldExclude = mm.any(asset.path, exclude);
-                        if (shouldExclude && Array.isArray(include)) {
+                        shouleRunLoder = mm.any(asset.path, exclude);
+                        if (!shouldExclude && Array.isArray(include)) {
                             shouleRunLoder = mm.any(asset.path, include);
                         }
                     }

diff --git a/src/plugin/minifyPlugin.js b/src/plugin/minifyPlugin.js
@@ -5,6 +5,7 @@
 // const jsonminify = require('jsonminify');
 // const htmlmin = require('html-minifier');
 const workerpool = require('workerpool');
+const mm = require('micromatch');
 
 const pool = workerpool.pool();
 
@@ -51,6 +52,27 @@ function minifyJSON(contents) {
     return jsonminify(contents).toString();
 }
 
+function sholdRunMiniFunc(asset, rule) {
+    if(!rule) {
+        return false;
+    }
+    if(typeof rule === "boolean" && rule) {
+        return true;
+    }
+    if(Object.prototype.toString.call(rule) === '[object Object]') {
+        const {include, exclude} = rule || {};
+        let sholdRunMini = true;
+        if (Array.isArray(exclude)) {
+            sholdRunMini = !mm.any(asset.path, exclude);
+            if (!sholdRunMini && Array.isArray(include)) {
+                sholdRunMini = mm.any(asset.path, include);
+            }
+        }
+        return sholdRunMini;
+    }
+    return false
+}
+
 module.exports = class MinifyPlugin {
     constructor() {
         this.js = true;
@@ -80,10 +102,10 @@ module.exports = class MinifyPlugin {
                             asset.contents,
                             this.js
                         ]);
-                    } else if (/\.json$/.test(asset.outputFilePath) && this.json) {
+                    } else if (/\.json$/.test(asset.outputFilePath) && sholdRunMiniFunc(asset, this.json)) {
                         // asset.contents = jsonminify(asset.contents).toString();
                         asset.contents = await pool.exec(minifyJSON, [asset.contents]);
-                    } else if (/\.wxml$/.test(asset.outputFilePath) && this.wxml) {
+                    } else if (/\.wxml$/.test(asset.outputFilePath) && sholdRunMiniFunc(asset, this.wxml)) {
                         // asset.contents = asset.contents = htmlmin.minify(asset.contents, {
                         //     removeComments: true,
                         //     keepClosingSlash: true,