root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/webpack/webpack

This commit is contained in:
Tobias Koppers 2015-01-21 20:27:03 +01:00
parent bdabadf34f 4099f66141
commit 9063c05dd5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/webpack.js
View File

@ -14,7 +14,7 @@ function webpack(options, callback) {
compiler = new MultiCompiler(options.map(function(options) {
return webpack(options);
}));
} else {
} else if(typeof options === "object") {
new WebpackOptionsDefaulter().process(options);
compiler = new Compiler();
@ -23,10 +23,14 @@ function webpack(options, callback) {
new NodeEnvironmentPlugin().apply(compiler);
compiler.applyPlugins("environment");
compiler.applyPlugins("after-environment");
} else {
throw new Error("Invalid argument: options");
}
if(callback) {
if(options.watch) {
return compiler.watch(options.watchDelay, callback);
if(typeof callback !== "function") throw new Error("Invalid argument: callback");
var watchOptions = options.watch || !Array.isArray(options) ? options : options[0];
if(watchOptions.watch) {
return compiler.watch(watchOptions.watchDelay, callback);
} else {
compiler.run(callback);
}