Skip to content

Commit b31a811

Browse files
committed
Throw error when output.filename is missing
webpack#719
1 parent aa7885b commit b31a811

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

bin/convert-argv.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@ module.exports = function(optimist, argv, convertOptions) {
2525
argv["optimize-minimize"] = true;
2626
}
2727

28+
var configFileLoaded = false;
2829
if(argv.config) {
2930
options = require(path.resolve(argv.config));
31+
configFileLoaded = true;
3032
} else {
3133
var configPath = path.resolve("webpack.config.js");
3234
if(fs.existsSync(configPath)) {
3335
options = require(configPath);
36+
configFileLoaded = true;
3437
}
3538
}
3639
if(typeof options !== "object" || options === null) {
@@ -405,6 +408,8 @@ module.exports = function(optimist, argv, convertOptions) {
405408
options.output.filename = argv._.pop();
406409
options.output.path = path.dirname(options.output.filename);
407410
options.output.filename = path.basename(options.output.filename);
411+
} else if(configFileLoaded) {
412+
throw new Error("'output.filename' is required, either in config file or as --output-file");
408413
} else {
409414
optimist.showHelp();
410415
process.exit(-1);

0 commit comments

Comments
 (0)