Skip to content

Commit 463eeb5

Browse files
sokrasokra
authored
Merge pull request webpack#5007 from webpack/next
webpack 3
2 parents 269b3ff + a8e204e commit 463eeb5

File tree

183 files changed

+2960
-1118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+2960
-1118
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ language: node_js
44
branches:
55
only:
66
- master
7+
- next
78

89
cache:
910
directories:

‎appveyor.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
branches:
55
only:
66
- master
7+
- next
78

89
init:
910
- git config --global core.autocrlf input

‎bin/webpack.js‎

100755100644
Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,21 @@ yargs.options({
124124
group: DISPLAY_GROUP,
125125
describe: "Display information about exports provided from modules"
126126
},
127+
"display-optimization-bailout": {
128+
type: "boolean",
129+
group: DISPLAY_GROUP,
130+
describe: "Display information about why optimization bailed out for modules"
131+
},
127132
"display-error-details": {
128133
type: "boolean",
129134
group: DISPLAY_GROUP,
130135
describe: "Display details about errors"
131136
},
137+
"display": {
138+
type: "string",
139+
group: DISPLAY_GROUP,
140+
describe: "Select display preset (verbose, detailed, normal, minimal, errors-only, none)"
141+
},
132142
"verbose": {
133143
type: "boolean",
134144
group: DISPLAY_GROUP,
@@ -139,15 +149,7 @@ yargs.options({
139149
var argv = yargs.argv;
140150

141151
if(argv.verbose) {
142-
argv["display-reasons"] = true;
143-
argv["display-depth"] = true;
144-
argv["display-entrypoints"] = true;
145-
argv["display-used-exports"] = true;
146-
argv["display-provided-exports"] = true;
147-
argv["display-error-details"] = true;
148-
argv["display-modules"] = true;
149-
argv["display-cached"] = true;
150-
argv["display-cached-assets"] = true;
152+
argv["display"] = "verbose";
151153
}
152154

153155
var options = require("./convert-argv")(yargs, argv);
@@ -181,6 +183,11 @@ function processOptions(options) {
181183
} else if(!outputOptions) {
182184
outputOptions = {};
183185
}
186+
187+
ifArg("display", function(preset) {
188+
outputOptions = statsPresetToOptions(preset);
189+
});
190+
184191
outputOptions = Object.create(outputOptions);
185192
if(Array.isArray(options) && !outputOptions.children) {
186193
outputOptions.children = options.map(o => o.stats);
@@ -219,36 +226,50 @@ function processOptions(options) {
219226
outputOptions.cachedAssets = false;
220227

221228
ifArg("display-chunks", function(bool) {
222-
outputOptions.modules = !bool;
223-
outputOptions.chunks = bool;
229+
if(bool) {
230+
outputOptions.modules = false;
231+
outputOptions.chunks = true;
232+
outputOptions.chunkModules = true;
233+
}
224234
});
225235

226236
ifArg("display-entrypoints", function(bool) {
227-
outputOptions.entrypoints = bool;
237+
if(bool)
238+
outputOptions.entrypoints = true;
228239
});
229240

230241
ifArg("display-reasons", function(bool) {
231-
outputOptions.reasons = bool;
242+
if(bool)
243+
outputOptions.reasons = true;
232244
});
233245

234246
ifArg("display-depth", function(bool) {
235-
outputOptions.depth = bool;
247+
if(bool)
248+
outputOptions.depth = true;
236249
});
237250

238251
ifArg("display-used-exports", function(bool) {
239-
outputOptions.usedExports = bool;
252+
if(bool)
253+
outputOptions.usedExports = true;
240254
});
241255

242256
ifArg("display-provided-exports", function(bool) {
243-
outputOptions.providedExports = bool;
257+
if(bool)
258+
outputOptions.providedExports = true;
259+
});
260+
261+
ifArg("display-optimization-bailout", function(bool) {
262+
outputOptions.optimizationBailout = bool;
244263
});
245264

246265
ifArg("display-error-details", function(bool) {
247-
outputOptions.errorDetails = bool;
266+
if(bool)
267+
outputOptions.errorDetails = true;
248268
});
249269

250270
ifArg("display-origins", function(bool) {
251-
outputOptions.chunkOrigins = bool;
271+
if(bool)
272+
outputOptions.chunkOrigins = true;
252273
});
253274

254275
ifArg("display-max-modules", function(value) {
@@ -272,21 +293,6 @@ function processOptions(options) {
272293
outputOptions.maxModules = Infinity;
273294
outputOptions.exclude = undefined;
274295
}
275-
} else {
276-
if(typeof outputOptions.chunks === "undefined")
277-
outputOptions.chunks = true;
278-
if(typeof outputOptions.entrypoints === "undefined")
279-
outputOptions.entrypoints = true;
280-
if(typeof outputOptions.modules === "undefined")
281-
outputOptions.modules = true;
282-
if(typeof outputOptions.chunkModules === "undefined")
283-
outputOptions.chunkModules = true;
284-
if(typeof outputOptions.reasons === "undefined")
285-
outputOptions.reasons = true;
286-
if(typeof outputOptions.cached === "undefined")
287-
outputOptions.cached = true;
288-
if(typeof outputOptions.cachedAssets === "undefined")
289-
outputOptions.cachedAssets = true;
290296
}
291297

292298
ifArg("hide-modules", function(bool) {
@@ -337,7 +343,9 @@ function processOptions(options) {
337343
process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + "\n");
338344
} else if(stats.hash !== lastHash) {
339345
lastHash = stats.hash;
340-
process.stdout.write(stats.toString(outputOptions) + "\n");
346+
var statsString = stats.toString(outputOptions);
347+
if(statsString)
348+
process.stdout.write(statsString + "\n");
341349
}
342350
if(!options.watch && stats.hasErrors()) {
343351
process.on("exit", function() {

0 commit comments

Comments
 (0)