Merge branch 'master' into next

sokra · sokra · commit e208f44bea6f · 2017-11-24T07:42:07.000+01:00
# Conflicts:
#	lib/Compiler.js
#	lib/HotModuleReplacementPlugin.js
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
@@ -26,6 +26,11 @@ module.exports = class HotModuleReplacementPlugin {
 		const requestTimeout = this.requestTimeout;
 		const hotUpdateChunkFilename = compiler.options.output.hotUpdateChunkFilename;
 		const hotUpdateMainFilename = compiler.options.output.hotUpdateMainFilename;
+		compiler.plugin("additional-pass", callback => {
+			if(multiStep)
+				return setTimeout(callback, fullBuildTimeout);
+			return callback();
+		});
 		compiler.plugin("compilation", (compilation, params) => {
 			const hotUpdateChunkTemplate = compilation.hotUpdateChunkTemplate;
 			if(!hotUpdateChunkTemplate) return;
@@ -89,11 +94,6 @@ module.exports = class HotModuleReplacementPlugin {
 				if(multiStep && !recompilation && !initialPass)
 					return true;
 			});
-			compiler.plugin("additional-pass", callback => {
-				if(multiStep)
-					return setTimeout(callback, fullBuildTimeout);
-				return callback();
-			});
 			compilation.plugin("additional-chunk-assets", () => {
 				const records = compilation.records;
 				if(records.hash === compilation.hash) return;
