Merge pull request webpack#7279 from cokencode/progress-plugin-bug-fix

sokra · web-flow · commit ae6c7a4990ad · 2018-05-26T15:00:01.000+02:00
Fix a bug where ProgressPlugin is not working properly with MultiComp…
diff --git a/lib/ProgressPlugin.js b/lib/ProgressPlugin.js
@@ -83,7 +83,7 @@ class ProgressPlugin {
 			const states = new Array(compiler.compilers.length);
 			compiler.compilers.forEach((compiler, idx) => {
 				new ProgressPlugin((p, msg, ...args) => {
-					states[idx] = args;
+					states[idx] = [p, msg, ...args];
 					handler(
 						states
 							.map(state => (state && state[0]) || 0)
diff --git a/test/ProgressPlugin.test.js b/test/ProgressPlugin.test.js
@@ -0,0 +1,40 @@
+"use strict";
+
+const path = require("path");
+const MemoryFs = require("memory-fs");
+const webpack = require("../");
+
+const createMultiCompiler = () => {
+	const compiler = webpack([
+		{
+			context: path.join(__dirname, "fixtures"),
+			entry: "./a.js"
+		},
+		{
+			context: path.join(__dirname, "fixtures"),
+			entry: "./b.js"
+		}
+	]);
+	compiler.outputFileSystem = new MemoryFs();
+	return compiler;
+};
+
+describe("ProgressPlugin", function() {
+	it("should not contain NaN as a percentage when it is applied to MultiCompiler", function(done) {
+		const compiler = createMultiCompiler();
+
+		let percentage = 0;
+		new webpack.ProgressPlugin((p, msg, ...args) => {
+			percentage += p;
+		}).apply(compiler);
+
+		compiler.run(err => {
+			if (err) {
+				throw err;
+			} else {
+				expect(percentage).not.toBe(NaN);
+				done();
+			}
+		});
+	});
+});
