1 files changed, 129 insertions, 115 deletions
diff --git a/node_modules/webpack/lib/WebpackOptionsDefaulter.js b/node_modules/webpack/lib/WebpackOptionsDefaulter.js
index 24bb42321..ff0cc8072 100644
--- a/node_modules/webpack/lib/WebpackOptionsDefaulter.js
+++ b/node_modules/webpack/lib/WebpackOptionsDefaulter.js
@@ -1,115 +1,129 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const OptionsDefaulter = require("./OptionsDefaulter");
-const Template = require("./Template");
-
-class WebpackOptionsDefaulter extends OptionsDefaulter {
-	constructor() {
-		super();
-		this.set("devtool", false);
-		this.set("cache", true);
-
-		this.set("context", process.cwd());
-		this.set("target", "web");
-
-		this.set("module.unknownContextRequest", ".");
-		this.set("module.unknownContextRegExp", false);
-		this.set("module.unknownContextRecursive", true);
-		this.set("module.unknownContextCritical", true);
-		this.set("module.exprContextRequest", ".");
-		this.set("module.exprContextRegExp", false);
-		this.set("module.exprContextRecursive", true);
-		this.set("module.exprContextCritical", true);
-		this.set("module.wrappedContextRegExp", /.*/);
-		this.set("module.wrappedContextRecursive", true);
-		this.set("module.wrappedContextCritical", false);
-		this.set("module.strictExportPresence", false);
-		this.set("module.strictThisContextOnImports", false);
-
-		this.set("module.unsafeCache", true);
-
-		this.set("output", "call", (value, options) => {
-			if(typeof value === "string") {
-				return {
-					filename: value
-				};
-			} else if(typeof value !== "object") {
-				return {};
-			} else {
-				return value;
-			}
-		});
-		this.set("output.filename", "[name].js");
-		this.set("output.chunkFilename", "make", (options) => {
-			const filename = options.output.filename;
-			return filename.indexOf("[name]") >= 0 ? filename.replace("[name]", "[id]") : "[id]." + filename;
-		});
-		this.set("output.library", "");
-		this.set("output.hotUpdateFunction", "make", (options) => {
-			return Template.toIdentifier("webpackHotUpdate" + options.output.library);
-		});
-		this.set("output.jsonpFunction", "make", (options) => {
-			return Template.toIdentifier("webpackJsonp" + options.output.library);
-		});
-		this.set("output.libraryTarget", "var");
-		this.set("output.path", process.cwd());
-		this.set("output.sourceMapFilename", "[file].map[query]");
-		this.set("output.hotUpdateChunkFilename", "[id].[hash].hot-update.js");
-		this.set("output.hotUpdateMainFilename", "[hash].hot-update.json");
-		this.set("output.crossOriginLoading", false);
-		this.set("output.chunkLoadTimeout", 120000);
-		this.set("output.hashFunction", "md5");
-		this.set("output.hashDigest", "hex");
-		this.set("output.hashDigestLength", 20);
-		this.set("output.devtoolLineToLine", false);
-		this.set("output.strictModuleExceptionHandling", false);
-
-		this.set("node", {});
-		this.set("node.console", false);
-		this.set("node.process", true);
-		this.set("node.global", true);
-		this.set("node.Buffer", true);
-		this.set("node.setImmediate", true);
-		this.set("node.__filename", "mock");
-		this.set("node.__dirname", "mock");
-
-		this.set("performance.maxAssetSize", 250000);
-		this.set("performance.maxEntrypointSize", 250000);
-		this.set("performance.hints", false);
-
-		this.set("resolve", {});
-		this.set("resolve.unsafeCache", true);
-		this.set("resolve.modules", ["node_modules"]);
-		this.set("resolve.extensions", [".js", ".json"]);
-		this.set("resolve.mainFiles", ["index"]);
-		this.set("resolve.aliasFields", "make", (options) => {
-			if(options.target === "web" || options.target === "webworker")
-				return ["browser"];
-			else
-				return [];
-		});
-		this.set("resolve.mainFields", "make", (options) => {
-			if(options.target === "web" || options.target === "webworker")
-				return ["browser", "module", "main"];
-			else
-				return ["module", "main"];
-		});
-		this.set("resolve.cacheWithContext", "make", (options) => {
-			return Array.isArray(options.resolve.plugins) && options.resolve.plugins.length > 0;
-		});
-		this.set("resolveLoader", {});
-		this.set("resolveLoader.unsafeCache", true);
-		this.set("resolveLoader.mainFields", ["loader", "main"]);
-		this.set("resolveLoader.extensions", [".js", ".json"]);
-		this.set("resolveLoader.mainFiles", ["index"]);
-		this.set("resolveLoader.cacheWithContext", "make", (options) => {
-			return Array.isArray(options.resolveLoader.plugins) && options.resolveLoader.plugins.length > 0;
-		});
-	}
-}
-
-module.exports = WebpackOptionsDefaulter;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const OptionsDefaulter = require("./OptionsDefaulter");
+const Template = require("./Template");
+
+class WebpackOptionsDefaulter extends OptionsDefaulter {
+	constructor() {
+		super();
+		this.set("devtool", false);
+		this.set("cache", true);
+
+		this.set("context", process.cwd());
+		this.set("target", "web");
+
+		this.set("module", "call", value => Object.assign({}, value));
+		this.set("module.unknownContextRequest", ".");
+		this.set("module.unknownContextRegExp", false);
+		this.set("module.unknownContextRecursive", true);
+		this.set("module.unknownContextCritical", true);
+		this.set("module.exprContextRequest", ".");
+		this.set("module.exprContextRegExp", false);
+		this.set("module.exprContextRecursive", true);
+		this.set("module.exprContextCritical", true);
+		this.set("module.wrappedContextRegExp", /.*/);
+		this.set("module.wrappedContextRecursive", true);
+		this.set("module.wrappedContextCritical", false);
+		this.set("module.strictExportPresence", false);
+		this.set("module.strictThisContextOnImports", false);
+		this.set("module.unsafeCache", true);
+
+		this.set("output", "call", (value, options) => {
+			if(typeof value === "string") {
+				return {
+					filename: value
+				};
+			} else if(typeof value !== "object") {
+				return {};
+			} else {
+				return Object.assign({}, value);
+			}
+		});
+		this.set("output.filename", "[name].js");
+		this.set("output.chunkFilename", "make", (options) => {
+			const filename = options.output.filename;
+			return filename.indexOf("[name]") >= 0 ? filename.replace("[name]", "[id]") : "[id]." + filename;
+		});
+		this.set("output.library", "");
+		this.set("output.hotUpdateFunction", "make", (options) => {
+			return Template.toIdentifier("webpackHotUpdate" + options.output.library);
+		});
+		this.set("output.jsonpFunction", "make", (options) => {
+			return Template.toIdentifier("webpackJsonp" + options.output.library);
+		});
+		this.set("output.libraryTarget", "var");
+		this.set("output.path", process.cwd());
+		this.set("output.sourceMapFilename", "[file].map[query]");
+		this.set("output.hotUpdateChunkFilename", "[id].[hash].hot-update.js");
+		this.set("output.hotUpdateMainFilename", "[hash].hot-update.json");
+		this.set("output.crossOriginLoading", false);
+		this.set("output.chunkLoadTimeout", 120000);
+		this.set("output.hashFunction", "md5");
+		this.set("output.hashDigest", "hex");
+		this.set("output.hashDigestLength", 20);
+		this.set("output.devtoolLineToLine", false);
+		this.set("output.strictModuleExceptionHandling", false);
+
+		this.set("node", "call", value => {
+			if(typeof value === "boolean") {
+				return value;
+			} else {
+				return Object.assign({}, value);
+			}
+		});
+		this.set("node.console", false);
+		this.set("node.process", true);
+		this.set("node.global", true);
+		this.set("node.Buffer", true);
+		this.set("node.setImmediate", true);
+		this.set("node.__filename", "mock");
+		this.set("node.__dirname", "mock");
+
+		this.set("performance", "call", value => {
+			if(typeof value === "boolean") {
+				return value;
+			} else {
+				return Object.assign({}, value);
+			}
+		});
+		this.set("performance.maxAssetSize", 250000);
+		this.set("performance.maxEntrypointSize", 250000);
+		this.set("performance.hints", false);
+
+		this.set("resolve", "call", value => Object.assign({}, value));
+		this.set("resolve.unsafeCache", true);
+		this.set("resolve.modules", ["node_modules"]);
+		this.set("resolve.extensions", [".js", ".json"]);
+		this.set("resolve.mainFiles", ["index"]);
+		this.set("resolve.aliasFields", "make", (options) => {
+			if(options.target === "web" || options.target === "webworker")
+				return ["browser"];
+			else
+				return [];
+		});
+		this.set("resolve.mainFields", "make", (options) => {
+			if(options.target === "web" || options.target === "webworker")
+				return ["browser", "module", "main"];
+			else
+				return ["module", "main"];
+		});
+		this.set("resolve.cacheWithContext", "make", (options) => {
+			return Array.isArray(options.resolve.plugins) && options.resolve.plugins.length > 0;
+		});
+
+		this.set("resolveLoader", "call", value => Object.assign({}, value));
+		this.set("resolveLoader.unsafeCache", true);
+		this.set("resolveLoader.mainFields", ["loader", "main"]);
+		this.set("resolveLoader.extensions", [".js", ".json"]);
+		this.set("resolveLoader.mainFiles", ["index"]);
+		this.set("resolveLoader.cacheWithContext", "make", (options) => {
+			return Array.isArray(options.resolveLoader.plugins) && options.resolveLoader.plugins.length > 0;
+		});
+	}
+}
+
+module.exports = WebpackOptionsDefaulter;