Merge pull request webpack#6209 from ooflorent/multicompiler_hooks

sokra · web-flow · commit 2591ebfde753 · 2018-01-02T09:42:06.000+01:00
Forward run and watchRun calls when using MultiCompiler
diff --git a/lib/MultiCompiler.js b/lib/MultiCompiler.js
@@ -6,6 +6,7 @@
 
 const Tapable = require("tapable").Tapable;
 const SyncHook = require("tapable").SyncHook;
+const MultiHook = require("tapable").MultiHook;
 const asyncLib = require("async");
 const MultiWatching = require("./MultiWatching");
 const MultiStats = require("./MultiStats");
@@ -15,8 +16,10 @@ module.exports = class MultiCompiler extends Tapable {
 		super();
 		this.hooks = {
 			done: new SyncHook(["stats"]),
-			invalid: new SyncHook([]),
-			watchClose: new SyncHook([])
+			invalid: new MultiHook(compilers.map(c => c.hooks.invalid)),
+			run: new MultiHook(compilers.map(c => c.hooks.run)),
+			watchClose: new SyncHook([]),
+			watchRun: new MultiHook(compilers.map(c => c.hooks.watchRun))
 		};
 		if(!Array.isArray(compilers)) {
 			compilers = Object.keys(compilers).map((name) => {
@@ -44,7 +47,6 @@ module.exports = class MultiCompiler extends Tapable {
 					compilerDone = false;
 					doneCompilers--;
 				}
-				this.hooks.invalid.call();
 			});
 		});
 	}
diff --git a/test/MultiCompiler.test.js b/test/MultiCompiler.test.js
@@ -0,0 +1,52 @@
+"use strict";
+
+/* globals describe it */
+const path = require("path");
+const should = require("should");
+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("MultiCompiler", function() {
+	it("should trigger 'run' for each child compiler", done => {
+		const compiler = createMultiCompiler();
+		let called = 0;
+
+		compiler.hooks.run.tap("MultiCompiler test", () => called++);
+		compiler.run(err => {
+			if(err) {
+				throw err;
+			} else {
+				should(called).be.equal(2);
+				done();
+			}
+		});
+	});
+
+	it("should trigger 'watchRun' for each child compiler", done => {
+		const compiler = createMultiCompiler();
+		let called = 0;
+
+		compiler.hooks.watchRun.tap("MultiCompiler test", () => called++);
+		const watcher = compiler.watch(1000, err => {
+			if(err) {
+				throw err;
+			} else {
+				watcher.close();
+				should(called).be.equal(2);
+				done();
+			}
+		});
+	});
+});
diff --git a/test/MultiCompiler.unittest.js b/test/MultiCompiler.unittest.js
