Skip to content

Commit 4c7c929

Browse files
sokrasokra
committed
simplified defaults
1 parent 1c961af commit 4c7c929

1 file changed

Lines changed: 12 additions & 43 deletions

File tree

‎lib/WebpackOptionsDefaulter.js‎

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ function WebpackOptionsDefaulter() {
4949
this.set("node.__filename", "mock");
5050
this.set("node.__dirname", "mock");
5151

52-
this.set("resolve.fastUnsafe", []);
53-
this.set("resolveLoader.fastUnsafe", []);
54-
55-
this.set("resolve.alias", {});
56-
this.set("resolveLoader.alias", {});
52+
this.set("resolve.modules", ["node_modules"])
53+
this.set("resolve.mainFields", ["loader", "main"])
54+
this.set("resolve.extensions", [".js", ".json"])
55+
this.set("resolveLoader.extensions", [".js", ".json"])
56+
this.set("resolveLoader.moduleExtensions", ["-loader"])
5757
}
5858
module.exports = WebpackOptionsDefaulter;
5959

@@ -64,46 +64,15 @@ WebpackOptionsDefaulter.prototype.constructor = WebpackOptionsDefaulter;
6464
WebpackOptionsDefaulter.prototype.process = function(options) {
6565
OptionsDefaulter.prototype.process.call(this, options);
6666

67-
if(options.resolve.packageAlias === undefined) {
67+
if(options.resolve.aliasFields === undefined) {
6868
if(options.target === "web" || options.target === "webworker")
69-
options.resolve.packageAlias = "browser";
69+
options.resolve.aliasFields = ["browser"];
7070
}
7171

72-
function defaultByTarget(value, web, webworker, node, nodeWebkit, def) {
73-
if(value !== undefined) return value;
74-
switch(options.target) {
75-
case "web":
76-
return web;
77-
case "webworker":
78-
return webworker;
79-
case "node":
80-
case "async-node":
81-
return node;
82-
case "node-webkit":
83-
return nodeWebkit;
84-
default:
85-
return def;
86-
}
72+
if(options.resolve.mainFields === undefined) {
73+
if(options.target === "web" || options.target === "webworker")
74+
options.resolve.mainFields = ["browser", "web", "browserify", "main"];
75+
else
76+
options.resolve.mainFields = ["main"];
8777
}
88-
89-
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"]);
90-
91-
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"]);
92-
93-
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"]);
94-
95-
options.resolve.packageAlias = defaultByTarget(options.resolve.packageAlias,
96-
"browser",
97-
"browser",
98-
false,
99-
"node-webkit",
100-
false);
101-
102-
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"]);
103-
104-
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"]);
105-
106-
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"]);
107-
108-
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", "*"]);
10978
};

0 commit comments

Comments
 (0)