fixes incorrect CLI stats output

add "detailed" preset clean up presets to do more useful stuff fixes #4141 fixes #4118
webpack · Feb 1, 2017 · 834ec5d · 834ec5d
1 parent 9e644ac
commit 834ec5d
Show file tree

Hide file tree

Showing 51 changed files with 382 additions and 382 deletions.
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -129,6 +129,11 @@ yargs.options({
 		group: DISPLAY_GROUP,
 		describe: "Display details about errors"
 	},
+	"display": {
+		type: "string",
+		group: DISPLAY_GROUP,
+		describe: "Select display preset (verbose, detailed, normal, minimal, errors-only, none)"
+	},
 	"verbose": {
 		type: "boolean",
 		group: DISPLAY_GROUP,
@@ -139,15 +144,7 @@ yargs.options({
 var argv = yargs.argv;
 
 if(argv.verbose) {
-	argv["display-reasons"] = true;
-	argv["display-depth"] = true;
-	argv["display-entrypoints"] = true;
-	argv["display-used-exports"] = true;
-	argv["display-provided-exports"] = true;
-	argv["display-error-details"] = true;
-	argv["display-modules"] = true;
-	argv["display-cached"] = true;
-	argv["display-cached-assets"] = true;
+	argv["display"] = "verbose";
 }
 
 var options = require("./convert-argv")(yargs, argv);
@@ -181,6 +178,11 @@ function processOptions(options) {
 	} else if(!outputOptions) {
 		outputOptions = {};
 	}
+
+	ifArg("display", function(preset) {
+		outputOptions = statsPresetToOptions(preset);
+	});
+
 	outputOptions = Object.create(outputOptions);
 	if(Array.isArray(options) && !outputOptions.children) {
 		outputOptions.children = options.map(o => o.stats);
@@ -219,36 +221,46 @@ function processOptions(options) {
 			outputOptions.cachedAssets = false;
 
 		ifArg("display-chunks", function(bool) {
-			outputOptions.modules = !bool;
-			outputOptions.chunks = bool;
+			if(bool) {
+				outputOptions.modules = false;
+				outputOptions.chunks = true;
+				outputOptions.chunkModules = true;
+			}
 		});
 
 		ifArg("display-entrypoints", function(bool) {
-			outputOptions.entrypoints = bool;
+			if(bool)
+				outputOptions.entrypoints = true;
 		});
 
 		ifArg("display-reasons", function(bool) {
-			outputOptions.reasons = bool;
+			if(bool)
+				outputOptions.reasons = true;
 		});
 
 		ifArg("display-depth", function(bool) {
-			outputOptions.depth = bool;
+			if(bool)
+				outputOptions.depth = true;
 		});
 
 		ifArg("display-used-exports", function(bool) {
-			outputOptions.usedExports = bool;
+			if(bool)
+				outputOptions.usedExports = true;
 		});
 
 		ifArg("display-provided-exports", function(bool) {
-			outputOptions.providedExports = bool;
+			if(bool)
+				outputOptions.providedExports = true;
 		});
 
 		ifArg("display-error-details", function(bool) {
-			outputOptions.errorDetails = bool;
+			if(bool)
+				outputOptions.errorDetails = true;
 		});
 
 		ifArg("display-origins", function(bool) {
-			outputOptions.chunkOrigins = bool;
+			if(bool)
+				outputOptions.chunkOrigins = true;
 		});
 
 		ifArg("display-max-modules", function(value) {
@@ -264,31 +276,17 @@ function processOptions(options) {
 			if(bool)
 				outputOptions.cachedAssets = true;
 		});
+	}
 
-		if(!outputOptions.exclude)
-			outputOptions.exclude = ["node_modules", "bower_components", "jam", "components"];
+	if(!outputOptions.exclude)
+		outputOptions.exclude = ["node_modules", "bower_components", "jam", "components"];
 
-		if(argv["display-modules"]) {
-			outputOptions.maxModules = Infinity;
-			outputOptions.exclude = undefined;
-		}
-	} else {
-		if(typeof outputOptions.chunks === "undefined")
-			outputOptions.chunks = true;
-		if(typeof outputOptions.entrypoints === "undefined")
-			outputOptions.entrypoints = true;
-		if(typeof outputOptions.modules === "undefined")
-			outputOptions.modules = true;
-		if(typeof outputOptions.chunkModules === "undefined")
-			outputOptions.chunkModules = true;
-		if(typeof outputOptions.reasons === "undefined")
-			outputOptions.reasons = true;
-		if(typeof outputOptions.cached === "undefined")
-			outputOptions.cached = true;
-		if(typeof outputOptions.cachedAssets === "undefined")
-			outputOptions.cachedAssets = true;
+	if(argv["display-modules"]) {
+		outputOptions.maxModules = Infinity;
+		outputOptions.exclude = undefined;
 	}
 
+
 	ifArg("hide-modules", function(bool) {
 		if(bool) {
 			outputOptions.modules = false;
@@ -337,7 +335,9 @@ function processOptions(options) {
 			process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + "\n");
 		} else if(stats.hash !== lastHash) {
 			lastHash = stats.hash;
-			process.stdout.write(stats.toString(outputOptions) + "\n");
+			var statsString = stats.toString(outputOptions);
+			if(statsString)
+				process.stdout.write(statsString + "\n");
 		}
 		if(!options.watch && stats.hasErrors()) {
 			process.on("exit", function() {