simplified defaults

lib/WebpackOptionsDefaulter.js

@@ -49,11 +49,11 @@ function WebpackOptionsDefaulter() {
  this.set("node.__filename", "mock");
  this.set("node.__dirname", "mock");
 
- this.set("resolve.fastUnsafe", []);
- this.set("resolveLoader.fastUnsafe", []);
-
- this.set("resolve.alias", {});
- this.set("resolveLoader.alias", {});
+ this.set("resolve.modules", ["node_modules"])
+ this.set("resolve.mainFields", ["loader", "main"])
+ this.set("resolve.extensions", [".js", ".json"])
+ this.set("resolveLoader.extensions", [".js", ".json"])
+ this.set("resolveLoader.moduleExtensions", ["-loader"])
 }
 module.exports = WebpackOptionsDefaulter;
 
@@ -64,46 +64,15 @@ WebpackOptionsDefaulter.prototype.constructor = WebpackOptionsDefaulter;
 WebpackOptionsDefaulter.prototype.process = function(options) {
  OptionsDefaulter.prototype.process.call(this, options);
 
- if(options.resolve.packageAlias === undefined) {
+ if(options.resolve.aliasFields === undefined) {
  if(options.target === "web" || options.target === "webworker")
- options.resolve.packageAlias = "browser";
+ options.resolve.aliasFields = ["browser"];
  }
 
- function defaultByTarget(value, web, webworker, node, nodeWebkit, def) {
- if(value !== undefined) return value;
- switch(options.target) {
- case "web":
- return web;
- case "webworker":
- return webworker;
- case "node":
- case "async-node":
- return node;
- case "node-webkit":
- return nodeWebkit;
- default:
- return def;
- }
+ if(options.resolve.mainFields === undefined) {
+ if(options.target === "web" || options.target === "webworker")
+ options.resolve.mainFields = ["browser", "web", "browserify", "main"];
+ else
+ options.resolve.mainFields = ["main"];
  }
-
- options.resolve.modulesDirectories = defaultByTarget(options.resolve.modulesDirectories, ["web_modules", "node_modules"], ["webworker_modules", "web_modules", "node_modules"], ["node_modules"], ["node_modules", "web_modules"], ["node_modules"]);
-
- options.resolveLoader.modulesDirectories = defaultByTarget(options.resolveLoader.modulesDirectories, ["web_loaders", "web_modules", "node_loaders", "node_modules"], ["webworker_loaders", "web_loaders", "web_modules", "node_loaders", "node_modules"], ["node_loaders", "node_modules"], ["node_loaders", "web_loaders", "node_modules", "web_modules"], ["node_modules"]);
-
- options.resolve.packageMains = defaultByTarget(options.resolve.packageMains, ["webpack", "browser", "web", "browserify", ["jam", "main"], "main"], ["webpackWorker", "webworker", "webpack", "browser", "web", "browserify", ["jam", "main"], "main"], ["webpackNode", "node", "main"], ["webpackNodeWebkit", "webpackNode", "node", "main", "web"], ["main"]);
-
- options.resolve.packageAlias = defaultByTarget(options.resolve.packageAlias,
- "browser",
- "browser",
- false,
- "node-webkit",
- false);
-
- options.resolveLoader.packageMains = defaultByTarget(options.resolveLoader.packageMains, ["webpackLoader", "webLoader", "loader", "main"], ["webpackWorkerLoader", "webworkerLoader", "webLoader", "loader", "main"], ["webpackNodeLoader", "nodeLoader", "loader", "main"], ["webpackNodeWebkitLoader", "webpackNodeLoader", "nodeLoader", "loader", "webLoader", "main"], ["loader", "main"]);
-
- options.resolve.extensions = defaultByTarget(options.resolve.extensions, ["", ".webpack.js", ".web.js", ".js", ".json"], ["", ".webpack-worker.js", ".webworker.js", ".web.js", ".js", ".json"], ["", ".webpack-node.js", ".js", ".json", ".node"], ["", ".webpack-node-webkit.js", ".webpack-node.js", ".js", ".json", ".node", ".web.js"], ["", ".js", ".json"]);
-
- options.resolveLoader.extensions = defaultByTarget(options.resolveLoader.extensions, ["", ".webpack-loader.js", ".web-loader.js", ".loader.js", ".js"], ["", ".webpack-worker-loader.js", ".webpack-loader.js", ".webworker-loader.js", ".web-loader.js", ".loader.js", ".js"], ["", ".webpack-node-loader.js", ".loader.js", ".js"], ["", ".webpack-node-webkit-loader.js", ".webpack-node-loader.js", ".loader.js", ".web-loader.js", ".js"], ["", ".js"]);
-
- options.resolveLoader.moduleTemplates = defaultByTarget(options.resolveLoader.moduleTemplates, ["*-webpack-loader", "*-web-loader", "*-loader", "*"], ["*-webpack-worker-loader", "*-webworker-loader", "*-web-loader", "*-loader", "*"], ["*-webpack-node-loader", "*-node-loader", "*-loader", "*"], ["*-webpack-node-webkit-loader", "*-webpack-node-loader", "*-node-loader", "*-loader", "*-web-loader", "*"], ["*-loader", "*"]);
 };