Skip to content

Commit

Permalink
fixes incorrect CLI stats output
Browse files Browse the repository at this point in the history
add "detailed" preset
clean up presets to do more useful stuff

fixes #4141
fixes #4118
  • Loading branch information
sokra committed Apr 11, 2017
1 parent 813053e commit 43e55be
Show file tree
Hide file tree
Showing 64 changed files with 438 additions and 456 deletions.
67 changes: 33 additions & 34 deletions bin/webpack.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand All @@ -272,21 +284,6 @@ function processOptions(options) {
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;
}

ifArg("hide-modules", function(bool) {
Expand Down Expand Up @@ -337,7 +334,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() {
Expand Down

0 comments on commit 43e55be

Please sign in to comment.