better ProgressPlugin and fixed bug for multi-compilation

sokra · sokra · commit 46b12b209557 · 2016-01-09T23:48:37.000+01:00
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -379,12 +379,6 @@ module.exports = function(optimist, argv, convertOptions) {
 			}));
 		});
 
-		ifBooleanArg("progress", function() {
-			var ProgressPlugin = require("../lib/ProgressPlugin");
-			ensureArray(options, "plugins");
-			options.plugins.push(new ProgressPlugin());
-		});
-
 		ifArg("devtool", function(value) {
 			options.devtool = value;
 		});
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -151,6 +151,13 @@ function processOptions(options) {
 	var lastHash = null;
 	var compiler = webpack(options);
 
+	if(argv.progress) {
+		var ProgressPlugin = require("../lib/ProgressPlugin");
+		compiler.apply(new ProgressPlugin({
+			profile: argv.profile
+		}));
+	}
+
 	function compilerCallback(err, stats) {
 		if(!options.watch) {
 			// Do not keep cache anymore
diff --git a/lib/ProgressPlugin.js b/lib/ProgressPlugin.js
@@ -2,13 +2,21 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function ProgressPlugin(handler) {
-	this.handler = handler;
+function ProgressPlugin(options) {
+	if(typeof options === "function") {
+		options = {
+			handler: options
+		};
+	}
+	options = options || {};
+	this.profile = options.profile;
+	this.handler = options.handler;
 }
 module.exports = ProgressPlugin;
 
 ProgressPlugin.prototype.apply = function(compiler) {
 	var handler = this.handler || defaultHandler;
+	var profile = this.profile;
 	if(compiler.compilers) {
 		var states = new Array(compiler.compilers.length);
 		compiler.compilers.forEach(function(compiler, idx) {
@@ -18,9 +26,7 @@ ProgressPlugin.prototype.apply = function(compiler) {
 					return state && state[0] || 0;
 				}).reduce(function(a, b) {
 					return a + b;
-				}) / states.length, states.map(function(state) {
-					return state && state[1];
-				}).filter(Boolean).join(" | ")]
+				}) / states.length, "[" + idx + "] " + msg]
 				.concat(Array.prototype.slice.call(arguments, 2)));
 			}));
 		});
@@ -146,7 +152,7 @@ ProgressPlugin.prototype.apply = function(compiler) {
 				msg += " " + detail
 			});
 		}
-		if(compiler.options.profile) {
+		if(profile) {
 			state = state.replace(/^\d+\/\d+\s+/, "");
 			if(percentage === 0) {
 				lastState = null;
