webpack 4.16.3 → 4.16.4

package/lib/BasicEvaluatedExpression.js

@@ -1,211 +1,211 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-
-"use strict";
-
-const TypeUnknown = 0;
-const TypeNull = 1;
-const TypeString = 2;
-const TypeNumber = 3;
-const TypeBoolean = 4;
-const TypeRegExp = 5;
-const TypeConditional = 6;
-const TypeArray = 7;
-const TypeConstArray = 8;
-const TypeIdentifier = 9;
-const TypeWrapped = 10;
-const TypeTemplateString = 11;
-
-class BasicEvaluatedExpression {
-	constructor() {
-		this.type = TypeUnknown;
-		this.range = null;
-		this.falsy = false;
-		this.truthy = false;
-		this.bool = null;
-		this.number = null;
-		this.regExp = null;
-		this.string = null;
-		this.quasis = null;
-		this.array = null;
-		this.items = null;
-		this.options = null;
-		this.prefix = null;
-		this.postfix = null;
-	}
-
-	isNull() {
-		return this.type === TypeNull;
-	}
-
-	isString() {
-		return this.type === TypeString;
-	}
-
-	isNumber() {
-		return this.type === TypeNumber;
-	}
-
-	isBoolean() {
-		return this.type === TypeBoolean;
-	}
-
-	isRegExp() {
-		return this.type === TypeRegExp;
-	}
-
-	isConditional() {
-		return this.type === TypeConditional;
-	}
-
-	isArray() {
-		return this.type === TypeArray;
-	}
-
-	isConstArray() {
-		return this.type === TypeConstArray;
-	}
-
-	isIdentifier() {
-		return this.type === TypeIdentifier;
-	}
-
-	isWrapped() {
-		return this.type === TypeWrapped;
-	}
-
-	isTemplateString() {
-		return this.type === TypeTemplateString;
-	}
-
-	isTruthy() {
-		return this.truthy;
-	}
-
-	isFalsy() {
-		return this.falsy;
-	}
-
-	asBool() {
-		if (this.truthy) return true;
-		if (this.falsy) return false;
-		if (this.isBoolean()) return this.bool;
-		if (this.isNull()) return false;
-		if (this.isString()) return this.string !== "";
-		if (this.isNumber()) return this.number !== 0;
-		if (this.isRegExp()) return true;
-		if (this.isArray()) return true;
-		if (this.isConstArray()) return true;
-		if (this.isWrapped()) {
-			return (this.prefix && this.prefix.asBool()) ||
-				(this.postfix && this.postfix.asBool())
-				? true
-				: undefined;
-		}
-		if (this.isTemplateString()) {
-			for (const quasi of this.quasis) {
-				if (quasi.asBool()) return true;
-			}
-			// can't tell if string will be empty without executing
-		}
-		return undefined;
-	}
-
-	setString(string) {
-		this.type = TypeString;
-		this.string = string;
-		return this;
-	}
-
-	setNull() {
-		this.type = TypeNull;
-		return this;
-	}
-
-	setNumber(number) {
-		this.type = TypeNumber;
-		this.number = number;
-		return this;
-	}
-
-	setBoolean(bool) {
-		this.type = TypeBoolean;
-		this.bool = bool;
-		return this;
-	}
-
-	setRegExp(regExp) {
-		this.type = TypeRegExp;
-		this.regExp = regExp;
-		return this;
-	}
-
-	setIdentifier(identifier) {
-		this.type = TypeIdentifier;
-		this.identifier = identifier;
-		return this;
-	}
-
-	setWrapped(prefix, postfix) {
-		this.type = TypeWrapped;
-		this.prefix = prefix;
-		this.postfix = postfix;
-		return this;
-	}
-
-	setOptions(options) {
-		this.type = TypeConditional;
-		this.options = options;
-		return this;
-	}
-
-	addOptions(options) {
-		if (!this.options) {
-			this.type = TypeConditional;
-			this.options = [];
-		}
-		for (const item of options) {
-			this.options.push(item);
-		}
-		return this;
-	}
-
-	setItems(items) {
-		this.type = TypeArray;
-		this.items = items;
-		return this;
-	}
-
-	setArray(array) {
-		this.type = TypeConstArray;
-		this.array = array;
-		return this;
-	}
-
-	setTemplateString(quasis) {
-		this.type = TypeTemplateString;
-		this.quasis = quasis;
-		return this;
-	}
-
-	setTruthy() {
-		this.falsy = false;
-		this.truthy = true;
-		return this;
-	}
-
-	setFalsy() {
-		this.falsy = true;
-		this.truthy = false;
-		return this;
-	}
-
-	setRange(range) {
-		this.range = range;
-		return this;
-	}
-}
-
-module.exports = BasicEvaluatedExpression;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const TypeUnknown = 0;
+const TypeNull = 1;
+const TypeString = 2;
+const TypeNumber = 3;
+const TypeBoolean = 4;
+const TypeRegExp = 5;
+const TypeConditional = 6;
+const TypeArray = 7;
+const TypeConstArray = 8;
+const TypeIdentifier = 9;
+const TypeWrapped = 10;
+const TypeTemplateString = 11;
+
+class BasicEvaluatedExpression {
+	constructor() {
+		this.type = TypeUnknown;
+		this.range = null;
+		this.falsy = false;
+		this.truthy = false;
+		this.bool = null;
+		this.number = null;
+		this.regExp = null;
+		this.string = null;
+		this.quasis = null;
+		this.array = null;
+		this.items = null;
+		this.options = null;
+		this.prefix = null;
+		this.postfix = null;
+	}
+
+	isNull() {
+		return this.type === TypeNull;
+	}
+
+	isString() {
+		return this.type === TypeString;
+	}
+
+	isNumber() {
+		return this.type === TypeNumber;
+	}
+
+	isBoolean() {
+		return this.type === TypeBoolean;
+	}
+
+	isRegExp() {
+		return this.type === TypeRegExp;
+	}
+
+	isConditional() {
+		return this.type === TypeConditional;
+	}
+
+	isArray() {
+		return this.type === TypeArray;
+	}
+
+	isConstArray() {
+		return this.type === TypeConstArray;
+	}
+
+	isIdentifier() {
+		return this.type === TypeIdentifier;
+	}
+
+	isWrapped() {
+		return this.type === TypeWrapped;
+	}
+
+	isTemplateString() {
+		return this.type === TypeTemplateString;
+	}
+
+	isTruthy() {
+		return this.truthy;
+	}
+
+	isFalsy() {
+		return this.falsy;
+	}
+
+	asBool() {
+		if (this.truthy) return true;
+		if (this.falsy) return false;
+		if (this.isBoolean()) return this.bool;
+		if (this.isNull()) return false;
+		if (this.isString()) return this.string !== "";
+		if (this.isNumber()) return this.number !== 0;
+		if (this.isRegExp()) return true;
+		if (this.isArray()) return true;
+		if (this.isConstArray()) return true;
+		if (this.isWrapped()) {
+			return (this.prefix && this.prefix.asBool()) ||
+				(this.postfix && this.postfix.asBool())
+				? true
+				: undefined;
+		}
+		if (this.isTemplateString()) {
+			for (const quasi of this.quasis) {
+				if (quasi.asBool()) return true;
+			}
+			// can't tell if string will be empty without executing
+		}
+		return undefined;
+	}
+
+	setString(string) {
+		this.type = TypeString;
+		this.string = string;
+		return this;
+	}
+
+	setNull() {
+		this.type = TypeNull;
+		return this;
+	}
+
+	setNumber(number) {
+		this.type = TypeNumber;
+		this.number = number;
+		return this;
+	}
+
+	setBoolean(bool) {
+		this.type = TypeBoolean;
+		this.bool = bool;
+		return this;
+	}
+
+	setRegExp(regExp) {
+		this.type = TypeRegExp;
+		this.regExp = regExp;
+		return this;
+	}
+
+	setIdentifier(identifier) {
+		this.type = TypeIdentifier;
+		this.identifier = identifier;
+		return this;
+	}
+
+	setWrapped(prefix, postfix) {
+		this.type = TypeWrapped;
+		this.prefix = prefix;
+		this.postfix = postfix;
+		return this;
+	}
+
+	setOptions(options) {
+		this.type = TypeConditional;
+		this.options = options;
+		return this;
+	}
+
+	addOptions(options) {
+		if (!this.options) {
+			this.type = TypeConditional;
+			this.options = [];
+		}
+		for (const item of options) {
+			this.options.push(item);
+		}
+		return this;
+	}
+
+	setItems(items) {
+		this.type = TypeArray;
+		this.items = items;
+		return this;
+	}
+
+	setArray(array) {
+		this.type = TypeConstArray;
+		this.array = array;
+		return this;
+	}
+
+	setTemplateString(quasis) {
+		this.type = TypeTemplateString;
+		this.quasis = quasis;
+		return this;
+	}
+
+	setTruthy() {
+		this.falsy = false;
+		this.truthy = true;
+		return this;
+	}
+
+	setFalsy() {
+		this.falsy = true;
+		this.truthy = false;
+		return this;
+	}
+
+	setRange(range) {
+		this.range = range;
+		return this;
+	}
+}
+
+module.exports = BasicEvaluatedExpression;

package/lib/HotModuleReplacementPlugin.js

@@ -285,11 +285,7 @@ module.exports = class HotModuleReplacementPlugin {
 									compilation.assets[filename] = source;
 									hotUpdateMainContent.c[chunkId] = true;
 									currentChunk.files.push(filename);
-									compilation.hooks.chunkAsset.call(
-										"HotModuleReplacementPlugin",
-										currentChunk,
-										filename
-									);
+									compilation.hooks.chunkAsset.call(currentChunk, filename);
 								}
 							} else {
 								hotUpdateMainContent.c[chunkId] = false;

package/lib/Template.js

@@ -27,7 +27,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 /**
  * @typedef {Object} HasId
  * @property {number | string} id
- * */
+ */
 
 /**
  * @typedef {function(Module, number): boolean} ModuleFilterPredicate
@@ -39,8 +39,8 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  * @returns {-1|0|1} the sort value
  */
 const stringifyIdSortPredicate = (a, b) => {
-	var aId = a.id + "";
-	var bId = b.id + "";
+	const aId = a.id + "";
+	const bId = b.id + "";
 	if (aId < bId) return -1;
 	if (aId > bId) return 1;
 	return 0;
@@ -59,6 +59,7 @@ class Template {
 			.replace(INDENT_MULTILINE_REGEX, "")
 			.replace(LINE_SEPARATOR_REGEX, "\n");
 	}
+
 	/**
 	 * @param {string} str the string converted to identifier
 	 * @returns {string} created identifier
@@ -128,31 +129,28 @@ class Template {
 
 	/**
 	 *
-	 * @param {string | string[]} str string to convert to identity
+	 * @param {string | string[]} s string to convert to identity
 	 * @returns {string} converted identity
 	 */
-	static indent(str) {
-		if (Array.isArray(str)) {
-			return str.map(Template.indent).join("\n");
+	static indent(s) {
+		if (Array.isArray(s)) {
+			return s.map(Template.indent).join("\n");
 		} else {
-			str = str.trimRight();
+			const str = s.trimRight();
 			if (!str) return "";
-			var ind = str[0] === "\n" ? "" : "\t";
+			const ind = str[0] === "\n" ? "" : "\t";
 			return ind + str.replace(/\n([^\n])/g, "\n\t$1");
 		}
 	}
 
 	/**
 	 *
-	 * @param {string|string[]} str string to create prefix for
+	 * @param {string|string[]} s string to create prefix for
 	 * @param {string} prefix prefix to compose
 	 * @returns {string} returns new prefix string
 	 */
-	static prefix(str, prefix) {
-		if (Array.isArray(str)) {
-			str = str.join("\n");
-		}
-		str = str.trim();
+	static prefix(s, prefix) {
+		const str = Template.asString(s).trim();
 		if (!str) return "";
 		const ind = str[0] === "\n" ? "" : prefix;
 		return ind + str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
@@ -181,8 +179,8 @@ class Template {
 	 * or false if not every module has a number based id
 	 */
 	static getModulesArrayBounds(modules) {
-		var maxId = -Infinity;
-		var minId = Infinity;
+		let maxId = -Infinity;
+		let minId = Infinity;
 		for (const module of modules) {
 			if (typeof module.id !== "number") return false;
 			if (maxId < module.id) maxId = /** @type {number} */ (module.id);
@@ -192,15 +190,11 @@ class Template {
 			// add minId x ',' instead of 'Array(minId).concat(…)'
 			minId = 0;
 		}
-		var objectOverhead = modules
-			.map(module => {
-				var idLength = (module.id + "").length;
-				return idLength + 2;
-			})
-			.reduce((a, b) => {
-				return a + b;
-			}, -1);
-		var arrayOverhead = minId === 0 ? maxId : 16 + ("" + minId).length + maxId;
+		const objectOverhead = modules
+			.map(module => (module.id + "").length + 2)
+			.reduce((a, b) => a + b, -1);
+		const arrayOverhead =
+			minId === 0 ? maxId : 16 + ("" + minId).length + maxId;
 		return arrayOverhead < objectOverhead ? [minId, maxId] : false;
 	}
 
@@ -217,13 +211,13 @@ class Template {
 		filterFn,
 		moduleTemplate,
 		dependencyTemplates,
-		prefix
+		prefix = ""
 	) {
-		if (!prefix) prefix = "";
-		var source = new ConcatSource();
+		const source = new ConcatSource();
 		const modules = chunk.getModules().filter(filterFn);
+		let removedModules;
 		if (chunk instanceof HotUpdateChunk) {
-			var removedModules = chunk.removedModules;
+			removedModules = chunk.removedModules;
 		}
 		if (
 			modules.length === 0 &&
@@ -233,7 +227,7 @@ class Template {
 			return source;
 		}
 		/** @type {{id: string|number, source: Source|string}[]} */
-		var allModules = modules.map(module => {
+		const allModules = modules.map(module => {
 			return {
 				id: module.id,
 				source: moduleTemplate.render(module, dependencyTemplates, {
@@ -249,38 +243,45 @@ class Template {
 				});
 			}
 		}
-		var bounds = Template.getModulesArrayBounds(allModules);
-
+		const bounds = Template.getModulesArrayBounds(allModules);
 		if (bounds) {
 			// Render a spare array
-			var minId = bounds[0];
-			var maxId = bounds[1];
-			if (minId !== 0) source.add("Array(" + minId + ").concat(");
+			const minId = bounds[0];
+			const maxId = bounds[1];
+			if (minId !== 0) {
+				source.add(`Array(${minId}).concat(`);
+			}
 			source.add("[\n");
 			const modules = new Map();
 			for (const module of allModules) {
 				modules.set(module.id, module);
 			}
-			for (var idx = minId; idx <= maxId; idx++) {
-				var module = modules.get(idx);
-				if (idx !== minId) source.add(",\n");
-				source.add("/* " + idx + " */");
+			for (let idx = minId; idx <= maxId; idx++) {
+				const module = modules.get(idx);
+				if (idx !== minId) {
+					source.add(",\n");
+				}
+				source.add(`/* ${idx} */`);
 				if (module) {
 					source.add("\n");
 					source.add(module.source);
 				}
 			}
 			source.add("\n" + prefix + "]");
-			if (minId !== 0) source.add(")");
+			if (minId !== 0) {
+				source.add(")");
+			}
 		} else {
 			// Render an object
 			source.add("{\n");
 			allModules.sort(stringifyIdSortPredicate).forEach((module, idx) => {
-				if (idx !== 0) source.add(",\n");
+				if (idx !== 0) {
+					source.add(",\n");
+				}
 				source.add(`\n/***/ ${JSON.stringify(module.id)}:\n`);
 				source.add(module.source);
 			});
-			source.add("\n\n" + prefix + "}");
+			source.add(`\n\n${prefix}}`);
 		}
 		return source;
 	}

package/lib/WatchIgnorePlugin.js

@@ -7,24 +7,6 @@
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/WatchIgnorePlugin.json");
 
-class WatchIgnorePlugin {
-	constructor(paths) {
-		validateOptions(schema, paths, "Watch Ignore Plugin");
-		this.paths = paths;
-	}
-
-	apply(compiler) {
-		compiler.hooks.afterEnvironment.tap("WatchIgnorePlugin", () => {
-			compiler.watchFileSystem = new IgnoringWatchFileSystem(
-				compiler.watchFileSystem,
-				this.paths
-			);
-		});
-	}
-}
-
-module.exports = WatchIgnorePlugin;
-
 class IgnoringWatchFileSystem {
 	constructor(wfs, paths) {
 		this.wfs = wfs;
@@ -98,3 +80,21 @@ class IgnoringWatchFileSystem {
 		};
 	}
 }
+
+class WatchIgnorePlugin {
+	constructor(paths) {
+		validateOptions(schema, paths, "Watch Ignore Plugin");
+		this.paths = paths;
+	}
+
+	apply(compiler) {
+		compiler.hooks.afterEnvironment.tap("WatchIgnorePlugin", () => {
+			compiler.watchFileSystem = new IgnoringWatchFileSystem(
+				compiler.watchFileSystem,
+				this.paths
+			);
+		});
+	}
+}
+
+module.exports = WatchIgnorePlugin;

package/lib/debug/ProfilingPlugin.js

@@ -5,7 +5,7 @@ const schema = require("../../schemas/plugins/debug/ProfilingPlugin.json");
 let inspector = undefined;
 
 try {
-	// eslint-disable-next-line node/no-missing-require
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
 	inspector = require("inspector");
 } catch (e) {
 	console.log("Unable to CPU profile in < node 8.0");

package/lib/node/NodeTargetPlugin.js

@@ -7,6 +7,7 @@
 const ExternalsPlugin = require("../ExternalsPlugin");
 
 const builtins =
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
 	require("module").builtinModules || Object.keys(process.binding("natives"));
 
 class NodeTargetPlugin {