feat(pack): 添加pack静默模式

YMFE · Oct 9, 2016 · f5b9139 · f5b9139
1 parent 34f162e
commit f5b9139
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 11 deletions.
diff --git a/lib/commands/pack.js b/lib/commands/pack.js
@@ -15,13 +15,16 @@ exports.setOptions = function (optimist) {
     optimist.describe('g', 'exports 分组');
     optimist.alias('c', 'clean');
     optimist.describe('c', '打包前清空输出目录');
+    optimist.alias('q', 'quiet');
+    optimist.describe('q', '静默模式');
 };
 
 exports.run = function (options) {
     var cwd = options.cwd,
         min = options.m || options.min || false,
         lint = options.l || options.lint || false,
         clean = options.c || options.clean || false,
+        quiet = options.q || options.quiet || false,
         group = options.g || options.group,
         sourcemap = options.s || options.sourcemap,
         project = this.project;
@@ -39,7 +42,8 @@ exports.run = function (options) {
         lint: lint,
         min: min,
         sourcemap: sourcemap,
-        clean: clean
+        clean: clean,
+        quiet: quiet
     }, function (err, stats) {
         if (err) {
             if (err !== true) {
@@ -50,5 +54,6 @@ exports.run = function (options) {
         project.packCallbacks.forEach(function (cb) {
             return cb(options, stats);
         });
+        process.exit(0);
     });
 };
diff --git a/lib/commands/server.js b/lib/commands/server.js
@@ -172,6 +172,8 @@ exports.run = function (options) {
                                     }
                                 });
 
+                                nextConfig.plugins.push(require('../plugins/progressBarPlugin.js'));
+
                                 return nextConfig;
                             });
 
@@ -230,6 +232,7 @@ exports.run = function (options) {
 
                             if (project.check()) {
                                 compiler = project.getServerCompiler(function (config) {
+                                    config.plugins.push(require('../plugins/progressBarPlugin.js'));
                                     return config;
                                 });
 

diff --git a/lib/models/Config.js b/lib/models/Config.js
@@ -42,7 +42,7 @@ var Config = function () {
                 }],
                 postLoaders: []
             },
-            plugins: [require('../plugins/extTemplatedPathPlugin.js'), require('../plugins/requireModulePlugin.js'), require('../plugins/progressBarPlugin.js'), require('../plugins/compileInfoPlugin.js')],
+            plugins: [require('../plugins/extTemplatedPathPlugin.js'), require('../plugins/requireModulePlugin.js'), require('../plugins/compileInfoPlugin.js')],
             resolve: {
                 root: [],
                 extensions: ['', '.js', '.css', '.json', '.string', '.tpl'],

diff --git a/lib/models/Project.js b/lib/models/Project.js
@@ -300,6 +300,10 @@ var Project = function () {
                     config.devtool = opt.sourcemap;
                 }
 
+                if (!opt.quiet) {
+                    config.plugins.push(require('../plugins/progressBarPlugin.js'));
+                }
+
                 if (opt.min) {
                     config.plugins.push(new webpack.optimize.UglifyJsPlugin({
                         compress: {
@@ -470,4 +474,4 @@ var Project = function () {
     return Project;
 }();
 
-module.exports = Project;
+module.exports = Project;
diff --git a/lib/plugins/progressBarPlugin.js b/lib/plugins/progressBarPlugin.js
@@ -10,9 +10,9 @@ function ProgressBarPlugin() {
 
     return new webpack.ProgressPlugin(function (percent, msg) {
         if (stream) {
-            stream.clearLine();
-            stream.cursorTo(0);
-            if (msg) {
+            stream.clearLine && stream.clearLine();
+            stream.cursorTo && stream.cursorTo(0);
+            if (msg && stream.write) {
                 stream.write(colors.grey('[Bundler] ') + colors.green(msg));
             }
         }

diff --git a/src/commands/pack.js b/src/commands/pack.js
@@ -15,13 +15,16 @@ exports.setOptions = (optimist) => {
     optimist.describe('g', 'exports 分组');
     optimist.alias('c', 'clean');
     optimist.describe('c', '打包前清空输出目录');
+    optimist.alias('q', 'quiet');
+    optimist.describe('q', '静默模式');
 };
 
 exports.run = function (options) {
     let cwd = options.cwd,
         min = options.m || options.min || false,
         lint = options.l || options.lint || false,
         clean = options.c || options.clean || false,
+        quiet = options.q || options.quiet || false,
         group = options.g || options.group,
         sourcemap = options.s || options.sourcemap,
         project = this.project;
@@ -39,7 +42,8 @@ exports.run = function (options) {
         lint: lint,
         min: min,
         sourcemap: sourcemap,
-        clean: clean
+        clean: clean,
+        quiet: quiet,
     }, (err, stats) => {
         if (err) {
             if (err !== true) {
@@ -48,5 +52,6 @@ exports.run = function (options) {
         }
 
         project.packCallbacks.forEach(cb => cb(options, stats));
+        process.exit(0);
     });
 };
diff --git a/src/commands/server.js b/src/commands/server.js
@@ -171,6 +171,8 @@ exports.run = (options) => {
                                 }
                             })
 
+                            nextConfig.plugins.push(require('../plugins/progressBarPlugin.js'))
+
                             return nextConfig
                         });
 
@@ -220,6 +222,7 @@ exports.run = (options) => {
 
                     if (project.check()) {
                         compiler = project.getServerCompiler(function(config) {
+                            config.plugins.push(require('../plugins/progressBarPlugin.js'))
                             return config
                         });
 

diff --git a/src/models/Config.js b/src/models/Config.js
@@ -40,7 +40,6 @@ class Config {
             plugins: [
                 require('../plugins/extTemplatedPathPlugin.js'),
                 require('../plugins/requireModulePlugin.js'),
-                require('../plugins/progressBarPlugin.js'),
                 require('../plugins/compileInfoPlugin.js'),
             ],
             resolve: {

diff --git a/src/models/Project.js b/src/models/Project.js
@@ -272,6 +272,10 @@ class Project {
                 config.devtool = opt.sourcemap
             }
 
+            if (!opt.quiet) {
+                config.plugins.push(require('../plugins/progressBarPlugin.js'));
+            }
+
             if (opt.min) {
                 config.plugins.push(new webpack.optimize.UglifyJsPlugin({
                     compress: {

diff --git a/src/plugins/progressBarPlugin.js b/src/plugins/progressBarPlugin.js
@@ -8,9 +8,9 @@ function ProgressBarPlugin() {
 
     return new webpack.ProgressPlugin(function(percent, msg) {
         if(stream) {
-            stream.clearLine();
-            stream.cursorTo(0);
-            if(msg) {
+            stream.clearLine && stream.clearLine();
+            stream.cursorTo && stream.cursorTo(0);
+            if(msg && stream.write) {
                 stream.write(colors.grey('[Bundler] ') + colors.green(msg));
             }
         }