Merge pull request webpack#3956 from jbruni/patch-1

Fixes webpack#3946 (stats options being ignored)

Author: sokra

bin/webpack.js

@@ -175,10 +175,11 @@ function processOptions(options) {
 	var statsPresetToOptions = require("../lib/Stats.js").presetToOptions;
 
 	var outputOptions = options.stats;
-	if(typeof outputOptions === "boolean" || typeof outputOptions === "string")
+	if(typeof outputOptions === "boolean" || typeof outputOptions === "string") {
 		outputOptions = statsPresetToOptions(outputOptions);
-	else
+	} else if(!outputOptions) {
 		outputOptions = {};
+	}
 	outputOptions = Object.create(outputOptions);
 	if(Array.isArray(options) && !outputOptions.children) {
 		outputOptions.children = options.map(o => o.stats);

test/binCases/stats/single-config/test.js

@@ -7,9 +7,10 @@ module.exports = function testAssertions(code, stdout, stderr) {
 	stdout[0].should.containEql("Hash: ");
 	stdout[1].should.containEql("Version: ");
 	stdout[2].should.containEql("Time: ");
-	stdout[4].should.containEql("null.js");
-	stdout[5].should.containEql("./index.js");
-	stdout[5].should.containEql("[built]");
+	stdout[4].should.containEql("\u001b[1m\u001b[32mnull.js\u001b[39m\u001b[22m");
+	stdout[5].should.not.containEql("./index.js");
+	stdout[5].should.not.containEql("[built]");
+	stdout[5].should.containEql("1 hidden module");
 
 	stderr.should.be.empty();
 };

test/binCases/stats/single-config/webpack.config.js

@@ -5,6 +5,7 @@ module.exports = {
 	stats: {
 		assets: true,
 		colors: true,
-		chunks: true
+		chunks: true,
+		maxModules: 0
 	}
 };