update packages

1 files changed, 83 insertions, 73 deletions

diff --git a/node_modules/webpack/lib/OptionsDefaulter.js b/node_modules/webpack/lib/OptionsDefaulter.js
index 42120689d..cad07ea06 100644
--- a/node_modules/webpack/lib/OptionsDefaulter.js
+++ b/node_modules/webpack/lib/OptionsDefaulter.js
@@ -1,73 +1,83 @@
-/*

-	MIT License http://www.opensource.org/licenses/mit-license.php

-	Author Tobias Koppers @sokra

-*/

-"use strict";

-

-function getProperty(obj, name) {

-	name = name.split(".");

-	for(let i = 0; i < name.length - 1; i++) {

-		obj = obj[name[i]];

-		if(typeof obj !== "object" || !obj) return;

-	}

-	return obj[name.pop()];

-}

-

-function setProperty(obj, name, value) {

-	name = name.split(".");

-	for(let i = 0; i < name.length - 1; i++) {

-		if(typeof obj[name[i]] !== "object" && typeof obj[name[i]] !== "undefined") return;

-		if(!obj[name[i]]) obj[name[i]] = {};

-		obj = obj[name[i]];

-	}

-	obj[name.pop()] = value;

-}

-

-class OptionsDefaulter {

-	constructor() {

-		this.defaults = {};

-		this.config = {};

-	}

-

-	process(options) {

-		// TODO: change this for webpack 4: options = Object.assign({}, options);

-		for(let name in this.defaults) {

-			switch(this.config[name]) {

-				case undefined:

-					if(getProperty(options, name) === undefined)

-						setProperty(options, name, this.defaults[name]);

-					break;

-				case "call":

-					setProperty(options, name, this.defaults[name].call(this, getProperty(options, name), options), options);

-					break;

-				case "make":

-					if(getProperty(options, name) === undefined)

-						setProperty(options, name, this.defaults[name].call(this, options), options);

-					break;

-				case "append":

-					{

-						let oldValue = getProperty(options, name);

-						if(!Array.isArray(oldValue)) oldValue = [];

-						oldValue.push.apply(oldValue, this.defaults[name]);

-						setProperty(options, name, oldValue);

-						break;

-					}

-				default:

-					throw new Error("OptionsDefaulter cannot process " + this.config[name]);

-			}

-		}

-		// TODO: change this for webpack 4: return options;

-	}

-

-	set(name, config, def) {

-		if(arguments.length === 3) {

-			this.defaults[name] = def;

-			this.config[name] = config;

-		} else {

-			this.defaults[name] = config;

-			delete this.config[name];

-		}

-	}

-}

-

-module.exports = OptionsDefaulter;

+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const getProperty = (obj, name) => {
+	name = name.split(".");
+	for (let i = 0; i < name.length - 1; i++) {
+		obj = obj[name[i]];
+		if (typeof obj !== "object" || !obj || Array.isArray(obj)) return;
+	}
+	return obj[name.pop()];
+};
+
+const setProperty = (obj, name, value) => {
+	name = name.split(".");
+	for (let i = 0; i < name.length - 1; i++) {
+		if (typeof obj[name[i]] !== "object" && obj[name[i]] !== undefined) return;
+		if (Array.isArray(obj[name[i]])) return;
+		if (!obj[name[i]]) obj[name[i]] = {};
+		obj = obj[name[i]];
+	}
+	obj[name.pop()] = value;
+};
+
+class OptionsDefaulter {
+	constructor() {
+		this.defaults = {};
+		this.config = {};
+	}
+
+	process(options) {
+		options = Object.assign({}, options);
+		for (let name in this.defaults) {
+			switch (this.config[name]) {
+				case undefined:
+					if (getProperty(options, name) === undefined) {
+						setProperty(options, name, this.defaults[name]);
+					}
+					break;
+				case "call":
+					setProperty(
+						options,
+						name,
+						this.defaults[name].call(this, getProperty(options, name), options)
+					);
+					break;
+				case "make":
+					if (getProperty(options, name) === undefined) {
+						setProperty(options, name, this.defaults[name].call(this, options));
+					}
+					break;
+				case "append": {
+					let oldValue = getProperty(options, name);
+					if (!Array.isArray(oldValue)) {
+						oldValue = [];
+					}
+					oldValue.push(...this.defaults[name]);
+					setProperty(options, name, oldValue);
+					break;
+				}
+				default:
+					throw new Error(
+						"OptionsDefaulter cannot process " + this.config[name]
+					);
+			}
+		}
+		return options;
+	}
+
+	set(name, config, def) {
+		if (def !== undefined) {
+			this.defaults[name] = def;
+			this.config[name] = config;
+		} else {
+			this.defaults[name] = config;
+			delete this.config[name];
+		}
+	}
+}
+
+module.exports = OptionsDefaulter;