Merge pull request webpack#3934 from timse/refactor-watching-in-compiler

sokra · web-flow · commit 53bb15b1ed64 · 2017-04-23T12:10:20.000+02:00
Refactor _done of Watching in compiler
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -14,14 +14,14 @@ const ModuleDependencyError = require("./ModuleDependencyError");
 const Module = require("./Module");
 const Chunk = require("./Chunk");
 const Entrypoint = require("./Entrypoint");
-const Stats = require("./Stats");
 const MainTemplate = require("./MainTemplate");
 const ChunkTemplate = require("./ChunkTemplate");
 const HotUpdateChunkTemplate = require("./HotUpdateChunkTemplate");
 const ModuleTemplate = require("./ModuleTemplate");
 const Dependency = require("./Dependency");
 const ChunkRenderError = require("./ChunkRenderError");
 const CachedSource = require("webpack-sources").CachedSource;
+const Stats = require("./Stats");
 
 function byId(a, b) {
 	if(a.id < b.id) return -1;
@@ -82,6 +82,10 @@ class Compilation extends Tapable {
 		this.dependencyTemplates = new Map();
 	}
 
+	getStats() {
+		return new Stats(this);
+	}
+
 	templatesPlugin(name, fn) {
 		this.mainTemplate.plugin(name, fn);
 		this.chunkTemplate.plugin(name, fn);
@@ -1214,10 +1218,6 @@ class Compilation extends Tapable {
 		return this.mainTemplate.applyPluginsWaterfall("asset-path", filename, data);
 	}
 
-	getStats() {
-		return new Stats(this);
-	}
-
 	createChildCompiler(name, outputOptions) {
 		return this.compiler.createChildCompiler(this, name, outputOptions);
 	}
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -6,15 +6,13 @@ var path = require("path");
 var Tapable = require("tapable");
 
 var Compilation = require("./Compilation");
-
+var Stats = require("./Stats");
 var NormalModuleFactory = require("./NormalModuleFactory");
 var ContextModuleFactory = require("./ContextModuleFactory");
 
 function Watching(compiler, watchOptions, handler) {
 	this.startTime = null;
 	this.invalid = false;
-	this.error = null;
-	this.stats = null;
 	this.handler = handler;
 	this.closed = false;
 	if(typeof watchOptions === "number") {
@@ -61,7 +59,7 @@ Watching.prototype._go = function() {
 					if(compilation.applyPluginsBailResult("need-additional-pass")) {
 						compilation.needAdditionalPass = true;
 
-						var stats = compilation.getStats();
+						var stats = new Stats(compilation);
 						stats.startTime = self.startTime;
 						stats.endTime = new Date().getTime();
 						self.compiler.applyPlugins("done", stats);
@@ -79,22 +77,29 @@ Watching.prototype._go = function() {
 	});
 };
 
+Watching.prototype._getStats = function(compilation) {
+	var stats = new Stats(compilation);
+	stats.startTime = this.startTime;
+	stats.endTime = new Date().getTime();
+	return stats;
+};
+
 Watching.prototype._done = function(err, compilation) {
 	this.running = false;
 	if(this.invalid) return this._go();
-	this.error = err || null;
-	this.stats = compilation ? compilation.getStats() : null;
-	if(this.stats) {
-		this.stats.startTime = this.startTime;
-		this.stats.endTime = new Date().getTime();
+
+	var stats = this._getStats(compilation);
+	if(err) {
+		this.compiler.applyPlugins("failed", err);
+		this.handler(err, stats);
+		return;
 	}
-	if(this.stats)
-		this.compiler.applyPlugins("done", this.stats);
-	else
-		this.compiler.applyPlugins("failed", this.error);
-	this.handler(this.error, this.stats);
-	if(!this.error && !this.closed)
+
+	this.compiler.applyPlugins("done", stats);
+	this.handler(null, stats);
+	if(!this.closed) {
 		this.watch(compilation.fileDependencies, compilation.contextDependencies, compilation.missingDependencies);
+	}
 };
 
 Watching.prototype.watch = function(files, dirs, missing) {
@@ -232,7 +237,7 @@ Compiler.prototype.run = function(callback) {
 					if(err) return callback(err);
 
 					if(self.applyPluginsBailResult("should-emit", compilation) === false) {
-						var stats = compilation.getStats();
+						var stats = new Stats(compilation);
 						stats.startTime = startTime;
 						stats.endTime = new Date().getTime();
 						self.applyPlugins("done", stats);
@@ -245,7 +250,7 @@ Compiler.prototype.run = function(callback) {
 						if(compilation.applyPluginsBailResult("need-additional-pass")) {
 							compilation.needAdditionalPass = true;
 
-							var stats = compilation.getStats();
+							var stats = new Stats(compilation);
 							stats.startTime = startTime;
 							stats.endTime = new Date().getTime();
 							self.applyPlugins("done", stats);
@@ -260,7 +265,7 @@ Compiler.prototype.run = function(callback) {
 						self.emitRecords(function(err) {
 							if(err) return callback(err);
 
-							var stats = compilation.getStats();
+							var stats = new Stats(compilation);
 							stats.startTime = startTime;
 							stats.endTime = new Date().getTime();
 							self.applyPlugins("done", stats);
