fix(stats): allow stats to respect config for MultiCompiler, MultiStats

TheLarkInn · TheLarkInn · commit a4106ea98f42 · 2016-12-19T16:53:30.000-06:00
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -150,6 +150,15 @@ function ifArg(name, fn, init) {
 	}
 }
 
+function hasPresetPredicate(options) {
+	return typeof options.stats === "boolean" || typeof options.stats === "string";
+}
+
+function hasPreset(optionsArray) {
+	options = Array.isArray(optionsArray) ? optionsArray : [optionsArray];
+	return options.some(hasPresetPredicate);
+}
+
 function processOptions(options) {
 	// process Promise
 	if(typeof options.then === "function") {
@@ -160,11 +169,20 @@ function processOptions(options) {
 		return;
 	}
 
+	// var firstOptions = Array.isArray(options) ? (options[0] || {}) : options;
 	var firstOptions = Array.isArray(options) ? (options[0] || {}) : options;
-
-	if(typeof options.stats === "boolean" || typeof options.stats === "string") {
+	if(hasPreset(options)) {
 		var statsPresetToOptions = require("../lib/Stats.js").presetToOptions;
-		options.stats = statsPresetToOptions(options.stats);
+
+		if(Array.isArray(options)) {
+
+			options = options.map(function(singleOption) {
+				singleOption.stats = statsPresetToOptions(singleOption.stats);
+				return singleOption;
+			})
+		} else {
+			options.stats = statsPresetToOptions(options.stats);
+		}
 	}
 
 	var outputOptions = Object.create(options.stats || firstOptions.stats || {});
diff --git a/lib/Stats.js b/lib/Stats.js
@@ -793,6 +793,7 @@ Stats.presetToOptions = function(name) {
 	var pn = (typeof name === "string") && name.toLowerCase() || name;
 	if(pn === "none" || !pn) {
 		return {
+			performance: false,
 			hash: false,
 			version: false,
 			timings: false,
@@ -813,6 +814,7 @@ Stats.presetToOptions = function(name) {
 	} else {
 		return {
 			hash: pn !== "errors-only" && pn !== "minimal",
+			performance: true,
 			version: pn === "verbose",
 			timings: pn !== "errors-only" && pn !== "minimal",
 			assets: pn === "verbose",
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "dependencies": {
-    "acorn": "^4.0.3",
+    "acorn": "^4.0.4",
     "acorn-dynamic-import": "^2.0.0",
     "ajv": "^4.7.0",
     "ajv-keywords": "^1.1.1",
@@ -14,7 +14,7 @@
     "json-loader": "^0.5.4",
     "loader-runner": "^2.2.0",
     "loader-utils": "^0.2.16",
-    "memory-fs": "~0.3.0",
+    "memory-fs": "^0.4.1",
     "mkdirp": "~0.5.0",
     "node-libs-browser": "^2.0.0",
     "object-assign": "^4.0.1",
@@ -48,19 +48,19 @@
     "js-beautify": "^1.5.10",
     "less": "^2.5.1",
     "less-loader": "^2.0.0",
-    "mocha": "^3.1.0",
+    "mocha": "^3.2.0",
     "mocha-lcov-reporter": "^1.0.0",
     "nsp": "^2.6.1",
     "raw-loader": "~0.5.0",
     "react": "^15.2.1",
     "react-dom": "^15.2.1",
     "script-loader": "~0.7.0",
-    "should": "^11.1.1",
+    "should": "^11.1.2",
     "style-loader": "~0.13.0",
     "url-loader": "~0.5.0",
     "val-loader": "~0.5.0",
     "vm-browserify": "~0.0.0",
-    "webpack-dev-middleware": "^1.0.0",
+    "webpack-dev-middleware": "^1.9.0",
     "worker-loader": "~0.7.0"
   },
   "engines": {
diff --git a/test/Stats.test.js b/test/Stats.test.js
@@ -47,6 +47,7 @@ describe("Stats", function() {
 				c.apply(new webpack.optimize.OccurrenceOrderPlugin());
 			});
 			c.run(function(err, stats) {
+				options = Array.isArray(options) ? options[0] : options;
 				if(err) return done(err);
 
 				if(/error$/.test(testName)) {
@@ -59,7 +60,6 @@ describe("Stats", function() {
 					colors: false
 				};
 				var hasColorSetting = false;
-
 				if(typeof options.stats !== "undefined") {
 					toStringOptions = options.stats;
 
@@ -165,7 +165,8 @@ describe("Stats", function() {
 					reasons: false,
 					usedExports: false,
 					providedExports: false,
-					colors: true
+					colors: true,
+					performance: true
 				});
 			});
 			it("truthy values behave as 'normal'", function() {
@@ -194,7 +195,8 @@ describe("Stats", function() {
 					errors: false,
 					errorDetails: false,
 					warnings: false,
-					publicPath: false
+					publicPath: false,
+					performance: false
 				});
 			});
 			it("falsy values behave as 'none'", function() {
diff --git a/test/statsCases/define-plugin/webpack.config.js b/test/statsCases/define-plugin/webpack.config.js
@@ -2,7 +2,6 @@ var webpack = require("../../../");
 module.exports = [
 	{
 		entry: "./index",
-		stats: "errors-only",
 		plugins: [
 			new webpack.DefinePlugin({
 				VALUE: "123"
@@ -11,7 +10,6 @@ module.exports = [
 	},
 	{
 		entry: "./index",
-		stats: "errors-only",
 		plugins: [
 			new webpack.DefinePlugin({
 				VALUE: "321"
diff --git a/test/statsCases/preset-none-array/expected.txt b/test/statsCases/preset-none-array/expected.txt
diff --git a/test/statsCases/preset-none-array/index.js b/test/statsCases/preset-none-array/index.js
diff --git a/test/statsCases/preset-none-array/webpack.config.js b/test/statsCases/preset-none-array/webpack.config.js
@@ -0,0 +1,10 @@
+module.exports = [
+	{
+		entry: "./index",
+		stats: "none"
+	},
+	{
+		entry: "./index",
+		stats: "none"
+	}
+]
diff --git a/test/statsCases/preset-none/webpack.config.js b/test/statsCases/preset-none/webpack.config.js
@@ -1,4 +1,4 @@
 module.exports = {
 	entry: "./index",
 	stats: false
-};
+};
