feat(pack): 添加 beforePackCallbacks 回调

Author: yuhaoju

lib/models/Config.js

@@ -189,13 +189,6 @@ var Config = function () {
         value: function getMiddlewares() {
             return this._config.middleware;
         }
-    }, {
-        key: 'applyBeforePack',
-        value: function applyBeforePack(beforeCallback) {
-            if (typeof beforeCallback === 'function') {
-                this._config.beforePack = beforeCallback;
-            }
-        }
     }]);
 
     return Config;

lib/models/Project.js

@@ -33,6 +33,7 @@ var Project = function () {
         this.config = new Config(cwd);
         this.commands = Manager.getCommands();
         this.middlewares = [];
+        this.beforePackCallbacks = [];
         this.packCallbacks = [];
         this.eslintConfig = require('../config/eslint.json');
         this.configFile = globby.sync(['ykit.*.js', 'ykit.js'], { cwd: this.cwd })[0] || '';
@@ -95,7 +96,8 @@ var Project = function () {
                     config: this.config.getConfig(),
                     commands: this.commands,
                     middlewares: this.middlewares,
-                    applyBeforePack: this.config.applyBeforePack.bind(this.config),
+                    applyBeforePack: this.applyBeforePack.bind(this),
+                    beforePackCallbacks: this.beforePackCallbacks,
                     packCallbacks: this.packCallbacks,
                     eslintConfig: this.eslintConfig,
                     applyMiddleware: this.config.applyMiddleware.bind(this.config),
@@ -294,6 +296,15 @@ var Project = function () {
 
             callback(null, !report.errorCount);
         }
+    }, {
+        key: 'applyBeforePack',
+        value: function applyBeforePack(nextBeforePackCB) {
+            if (typeof nextBeforePackCB === 'function') {
+                this.beforePackCallbacks.push(nextBeforePackCB);
+            } else if (Array.isArray(nextBeforePackCB)) {
+                this.beforePackCallbacks.concat(nextBeforePackCB);
+            }
+        }
     }, {
         key: 'pack',
         value: function pack(opt, callback) {
@@ -305,12 +316,6 @@ var Project = function () {
 
             UtilFs.deleteFolderRecursive(this.cachePath);
 
-            if (!config.beforePack) {
-                config.beforePack = function (done) {
-                    done();
-                };
-            }
-
             var compilerProcess = function compilerProcess() {
                 // 打包前设置
                 if (opt.sourcemap) {
@@ -460,23 +465,14 @@ var Project = function () {
                 });
             };
 
-            config.beforePack(function () {
-                if (opt.lint) {
-                    async.series([function (callback) {
-                        return _this4.lint(callback);
-                    }], function (err, results) {
-                        if (!err) {
-                            if (results[0] && results[1]) {
-                                compilerProcess();
-                            }
-                        } else {
-                            error(err.stack);
-                        }
-                    });
-                } else {
-                    compilerProcess();
-                }
-            }, opt);
+            async.series(this.beforePackCallbacks.map(function (beforePackItem) {
+                return function (callback) {
+                    beforePackItem();
+                    callback(null);
+                };
+            }), function (err) {
+                compilerProcess();
+            });
 
             return this;
         }

src/models/Config.js

@@ -173,11 +173,6 @@ class Config {
         return this._config.middleware;
     }
 
-    applyBeforePack(beforeCallback) {
-        if (typeof beforeCallback === 'function') {
-            this._config.beforePack = beforeCallback;
-        }
-    }
 }
 
 module.exports = Config;

src/models/Project.js

@@ -25,6 +25,7 @@ class Project {
         this.config = new Config(cwd);
         this.commands = Manager.getCommands();
         this.middlewares = [];
+        this.beforePackCallbacks = [];
         this.packCallbacks = [];
         this.eslintConfig = require('../config/eslint.json');
         this.configFile = globby.sync(['ykit.*.js', 'ykit.js'], { cwd: this.cwd })[0] || '';
@@ -85,7 +86,8 @@ class Project {
                     config: this.config.getConfig(),
                     commands: this.commands,
                     middlewares: this.middlewares,
-                    applyBeforePack: this.config.applyBeforePack.bind(this.config),
+                    applyBeforePack: this.applyBeforePack.bind(this),
+                    beforePackCallbacks: this.beforePackCallbacks,
                     packCallbacks: this.packCallbacks,
                     eslintConfig: this.eslintConfig,
                     applyMiddleware: this.config.applyMiddleware.bind(this.config),
@@ -291,17 +293,19 @@ class Project {
         callback(null, !report.errorCount);
     }
 
+    applyBeforePack(nextBeforePackCB) {
+        if (typeof nextBeforePackCB === 'function') {
+            this.beforePackCallbacks.push(nextBeforePackCB)
+        } else if (Array.isArray(nextBeforePackCB)) {
+            this.beforePackCallbacks.concat(nextBeforePackCB)
+        }
+    }
+
     pack(opt, callback) {
         let self = this, packStartTime = Date.now(), config = this.config.getConfig();
 
         UtilFs.deleteFolderRecursive(this.cachePath);
 
-        if (!config.beforePack) {
-            config.beforePack = function(done) {
-                done();
-            };
-        }
-
         const compilerProcess = () => {
             // 打包前设置
             if (opt.sourcemap) {
@@ -471,23 +475,16 @@ class Project {
             });
         };
 
-        config.beforePack(
-            () => {
-                if (opt.lint) {
-                    async.series([callback => this.lint(callback)], (err, results) => {
-                        if (!err) {
-                            if (results[0] && results[1]) {
-                                compilerProcess();
-                            }
-                        } else {
-                            error(err.stack);
-                        }
-                    });
-                } else {
-                    compilerProcess();
-                }
-            },
-            opt
+        async.series(
+            this.beforePackCallbacks.map((beforePackItem) => {
+                return function(callback) {
+                    beforePackItem();
+                    callback(null);
+                };
+            }),
+            err => {
+                compilerProcess();
+            }
         );
 
         return this;