webpack 4.16.3 → 4.17.1

package/README.md

@@ -58,8 +58,6 @@ yarn add webpack --dev
 
 <h2 align="center">Introduction</h2>
 
-> This README reflects webpack v2.x and v3.x. The webpack v1.x documentation has been deprecated and deleted.
-
 webpack is a bundler for modules. The main purpose is to bundle JavaScript
 files for usage in a browser, yet it is also capable of transforming, bundling,
 or packaging just about any resource or asset.

package/hot/log.js

@@ -30,9 +30,11 @@ module.exports = function(level, msg) {
 	}
 };
 
+/* eslint-disable node/no-unsupported-features/node-builtins */
 var group = console.group || dummy;
 var groupCollapsed = console.groupCollapsed || dummy;
 var groupEnd = console.groupEnd || dummy;
+/* eslint-enable node/no-unsupported-features/node-builtins */
 
 module.exports.group = logGroup(group);
 

package/lib/Chunk.js

@@ -313,17 +313,17 @@ class Chunk {
 	 * @returns {-1|0|1} this is a comparitor function like sort and returns -1, 0, or 1 based on sort order
 	 */
 	compareTo(otherChunk) {
-		this._modules.sort();
-		otherChunk._modules.sort();
 		if (this._modules.size > otherChunk._modules.size) return -1;
 		if (this._modules.size < otherChunk._modules.size) return 1;
+		this._modules.sort();
+		otherChunk._modules.sort();
 		const a = this._modules[Symbol.iterator]();
 		const b = otherChunk._modules[Symbol.iterator]();
 		// eslint-disable-next-line no-constant-condition
 		while (true) {
 			const aItem = a.next();
-			const bItem = b.next();
 			if (aItem.done) return 0;
+			const bItem = b.next();
 			const aModuleIdentifier = aItem.value.identifier();
 			const bModuleIdentifier = bItem.value.identifier();
 			if (aModuleIdentifier < bModuleIdentifier) return -1;

package/lib/CompatibilityPlugin.js

@@ -30,7 +30,7 @@ class CompatibilityPlugin {
 					.for("javascript/auto")
 					.tap("CompatibilityPlugin", (parser, parserOptions) => {
 						if (
-							typeof parserOptions.browserify !== "undefined" &&
+							parserOptions.browserify !== undefined &&
 							!parserOptions.browserify
 						)
 							return;

package/lib/Compilation.js

@@ -1025,6 +1025,7 @@ class Compilation extends Tapable {
 	addEntry(context, entry, name, callback) {
 		const slot = {
 			name: name,
+			// TODO webpack 5 remove `request`
 			request: null,
 			module: null
 		};
@@ -1033,7 +1034,14 @@ class Compilation extends Tapable {
 			slot.request = entry.request;
 		}
 
-		this._preparedEntrypoints.push(slot);
+		// TODO webpack 5: merge modules instead when multiple entry modules are supported
+		const idx = this._preparedEntrypoints.findIndex(slot => slot.name === name);
+		if (idx >= 0) {
+			// Overwrite existing entrypoint
+			this._preparedEntrypoints[idx] = slot;
+		} else {
+			this._preparedEntrypoints.push(slot);
+		}
 		this._addModuleChain(
 			context,
 			entry,
@@ -1049,7 +1057,9 @@ class Compilation extends Tapable {
 					slot.module = module;
 				} else {
 					const idx = this._preparedEntrypoints.indexOf(slot);
-					this._preparedEntrypoints.splice(idx, 1);
+					if (idx >= 0) {
+						this._preparedEntrypoints.splice(idx, 1);
+					}
 				}
 				return callback(null, module);
 			}

package/lib/ContextReplacementPlugin.js

@@ -60,13 +60,13 @@ class ContextReplacementPlugin {
 			cmf.hooks.beforeResolve.tap("ContextReplacementPlugin", result => {
 				if (!result) return;
 				if (resourceRegExp.test(result.request)) {
-					if (typeof newContentResource !== "undefined") {
+					if (newContentResource !== undefined) {
 						result.request = newContentResource;
 					}
-					if (typeof newContentRecursive !== "undefined") {
+					if (newContentRecursive !== undefined) {
 						result.recursive = newContentRecursive;
 					}
-					if (typeof newContentRegExp !== "undefined") {
+					if (newContentRegExp !== undefined) {
 						result.regExp = newContentRegExp;
 					}
 					if (typeof newContentCallback === "function") {
@@ -82,13 +82,13 @@ class ContextReplacementPlugin {
 			cmf.hooks.afterResolve.tap("ContextReplacementPlugin", result => {
 				if (!result) return;
 				if (resourceRegExp.test(result.resource)) {
-					if (typeof newContentResource !== "undefined") {
+					if (newContentResource !== undefined) {
 						result.resource = path.resolve(result.resource, newContentResource);
 					}
-					if (typeof newContentRecursive !== "undefined") {
+					if (newContentRecursive !== undefined) {
 						result.recursive = newContentRecursive;
 					}
-					if (typeof newContentRegExp !== "undefined") {
+					if (newContentRegExp !== undefined) {
 						result.regExp = newContentRegExp;
 					}
 					if (typeof newContentCreateContextMap === "function") {

package/lib/EnvironmentPlugin.js

@@ -60,7 +60,7 @@ class EnvironmentPlugin {
 			}
 
 			defs[`process.env.${key}`] =
-				typeof value === "undefined" ? "undefined" : JSON.stringify(value);
+				value === undefined ? "undefined" : JSON.stringify(value);
 
 			return defs;
 		}, {});

package/lib/ExternalModuleFactoryPlugin.js

@@ -27,7 +27,7 @@ class ExternalModuleFactoryPlugin {
 					}
 					if (value === false) return factory(data, callback);
 					if (value === true) value = dependency.request;
-					if (typeof type === "undefined" && /^[a-z0-9]+ /.test(value)) {
+					if (type === undefined && /^[a-z0-9]+ /.test(value)) {
 						const idx = value.indexOf(" ");
 						type = value.substr(0, idx);
 						value = value.substr(idx + 1);
@@ -81,7 +81,7 @@ class ExternalModuleFactoryPlugin {
 							dependency.request,
 							(err, value, type) => {
 								if (err) return callback(err);
-								if (typeof value !== "undefined") {
+								if (value !== undefined) {
 									handleExternal(value, type, callback);
 								} else {
 									callback();

package/lib/HotModuleReplacement.runtime.js

@@ -105,7 +105,7 @@ module.exports = function() {
 			// Module API
 			active: true,
 			accept: function(dep, callback) {
-				if (typeof dep === "undefined") hot._selfAccepted = true;
+				if (dep === undefined) hot._selfAccepted = true;
 				else if (typeof dep === "function") hot._selfAccepted = dep;
 				else if (typeof dep === "object")
 					for (var i = 0; i < dep.length; i++)
@@ -113,7 +113,7 @@ module.exports = function() {
 				else hot._acceptedDependencies[dep] = callback || function() {};
 			},
 			decline: function(dep) {
-				if (typeof dep === "undefined") hot._selfDeclined = true;
+				if (dep === undefined) hot._selfDeclined = true;
 				else if (typeof dep === "object")
 					for (var i = 0; i < dep.length; i++)
 						hot._declinedDependencies[dep[i]] = true;

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/IgnorePlugin.js

@@ -4,18 +4,30 @@
 */
 "use strict";
 
+const validateOptions = require("schema-utils");
+const schema = require("../schemas/plugins/IgnorePlugin.json");
+
 /** @typedef {import("./Compiler")} Compiler */
 
 class IgnorePlugin {
 	/**
-	 * @param {RegExp} resourceRegExp A RegExp to test the request against
-	 * @param {RegExp=} contextRegExp A RegExp to test the context (directory) against
+	 * @param {object} options IgnorePlugin options
+	 * @param {RegExp} options.resourceRegExp - A RegExp to test the request against
+	 * @param {RegExp} options.contextRegExp - A RegExp to test the context (directory) against
+	 * @param {function(string): boolean=} options.checkResource - A filter function for resource
+	 * @param {function(string): boolean=} options.checkContext - A filter function for context
 	 */
-	constructor(resourceRegExp, contextRegExp) {
-		/** @private @type {RegExp} */
-		this.resourceRegExp = resourceRegExp;
-		/** @private @type {RegExp} */
-		this.contextRegExp = contextRegExp;
+	constructor(options) {
+		// TODO webpack 5 remove this compat-layer
+		if (arguments.length > 1 || options instanceof RegExp) {
+			options = {
+				resourceRegExp: arguments[0],
+				contextRegExp: arguments[1]
+			};
+		}
+
+		validateOptions(schema, options, "IgnorePlugin");
+		this.options = options;
 
 		/** @private @type {Function} */
 		this.checkIgnore = this.checkIgnore.bind(this);
@@ -27,10 +39,13 @@ class IgnorePlugin {
 	 * and the resource given matches the regexp.
 	 */
 	checkResource(resource) {
-		if (!this.resourceRegExp) {
+		if (this.options.checkResource) {
+			return this.options.checkResource(resource);
+		}
+		if (!this.options.resourceRegExp) {
 			return false;
 		}
-		return this.resourceRegExp.test(resource);
+		return this.options.resourceRegExp.test(resource);
 	}
 
 	/**
@@ -39,10 +54,14 @@ class IgnorePlugin {
 	 * or if context matches the given regexp.
 	 */
 	checkContext(context) {
-		if (!this.contextRegExp) {
+		if (this.options.checkContext) {
+			return this.options.checkContext(context);
+		}
+
+		if (!this.options.contextRegExp) {
 			return true;
 		}
-		return this.contextRegExp.test(context);
+		return this.options.contextRegExp.test(context);
 	}
 
 	/**

package/lib/JavascriptModulesPlugin.js

@@ -135,6 +135,8 @@ class JavascriptModulesPlugin {
 					const template = chunk.hasRuntime()
 						? compilation.mainTemplate
 						: compilation.chunkTemplate;
+					hash.update(`${chunk.id} `);
+					hash.update(chunk.ids ? chunk.ids.join(",") : "");
 					template.updateHashForChunk(hash, chunk);
 					for (const m of chunk.modulesIterable) {
 						if (typeof m.source === "function") {

package/lib/LibraryTemplatePlugin.js

@@ -30,7 +30,7 @@ const accessorAccess = (base, accessor, joinWith = "; ") => {
 				? base + accessorToObjectAccess(accessors.slice(0, idx + 1))
 				: accessors[0] + accessorToObjectAccess(accessors.slice(1, idx + 1));
 			if (idx === accessors.length - 1) return a;
-			if (idx === 0 && typeof base === "undefined") {
+			if (idx === 0 && base === undefined) {
 				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
 			}
 			return `${a} = ${a} || {}`;

package/lib/MultiStats.js

@@ -40,11 +40,11 @@ class MultiStats {
 			return obj;
 		});
 		const showVersion =
-			typeof options.version === "undefined"
+			options.version === undefined
 				? jsons.every(j => j.version)
 				: options.version !== false;
 		const showHash =
-			typeof options.hash === "undefined"
+			options.hash === undefined
 				? jsons.every(j => j.hash)
 				: options.hash !== false;
 		if (showVersion) {

package/lib/OptionsDefaulter.js

@@ -16,8 +16,7 @@ const getProperty = (obj, name) => {
 const 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 (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]];

package/lib/RequireJsStuffPlugin.js

@@ -19,10 +19,7 @@ module.exports = class RequireJsStuffPlugin {
 					new ConstDependency.Template()
 				);
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.requireJs !== "undefined" &&
-						!parserOptions.requireJs
-					)
+					if (parserOptions.requireJs !== undefined && !parserOptions.requireJs)
 						return;
 
 					parser.hooks.call

package/lib/Stats.js

@@ -13,7 +13,7 @@ const compareLocations = require("./compareLocations");
 const optionsOrFallback = (...args) => {
 	let optionValues = [];
 	optionValues.push(...args);
-	return optionValues.find(optionValue => typeof optionValue !== "undefined");
+	return optionValues.find(optionValue => optionValue !== undefined);
 };
 
 const compareId = (a, b) => {
@@ -105,11 +105,7 @@ class Stats {
 		}
 
 		const optionOrLocalFallback = (v, def) =>
-			typeof v !== "undefined"
-				? v
-				: typeof options.all !== "undefined"
-					? options.all
-					: def;
+			v !== undefined ? v : options.all !== undefined ? options.all : def;
 
 		const testAgainstGivenOption = item => {
 			if (typeof item === "string") {

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/UmdMainTemplatePlugin.js

@@ -31,7 +31,7 @@ const accessorAccess = (base, accessor, joinWith = ", ") => {
 				? base + accessorToObjectAccess(accessors.slice(0, idx + 1))
 				: accessors[0] + accessorToObjectAccess(accessors.slice(1, idx + 1));
 			if (idx === accessors.length - 1) return a;
-			if (idx === 0 && typeof base === "undefined")
+			if (idx === 0 && base === undefined)
 				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
 			return `${a} = ${a} || {}`;
 		})
@@ -147,7 +147,7 @@ class UmdMainTemplatePlugin {
 							if (typeof request === "object") {
 								request = request[type];
 							}
-							if (typeof request === "undefined") {
+							if (request === undefined) {
 								throw new Error(
 									"Missing external configuration for type:" + type
 								);

package/lib/UnsupportedFeatureWarning.js

@@ -6,7 +6,15 @@
 
 const WebpackError = require("./WebpackError");
 
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+
 class UnsupportedFeatureWarning extends WebpackError {
+	/**
+	 * @param {Module} module module relevant to warning
+	 * @param {string} message description of warning
+	 * @param {DependencyLocation} loc location start and end positions of the module
+	 */
 	constructor(module, message, loc) {
 		super(message);
 

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/dependencies/AMDPlugin.js

@@ -98,8 +98,7 @@ class AMDPlugin {
 				);
 
 				const handler = (parser, parserOptions) => {
-					if (typeof parserOptions.amd !== "undefined" && !parserOptions.amd)
-						return;
+					if (parserOptions.amd !== undefined && !parserOptions.amd) return;
 
 					const setExpressionToModule = (outerExpr, module) => {
 						parser.hooks.expression.for(outerExpr).tap("AMDPlugin", expr => {

package/lib/dependencies/CommonJsPlugin.js

@@ -83,10 +83,7 @@ class CommonJsPlugin {
 				);
 
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.commonjs !== "undefined" &&
-						!parserOptions.commonjs
-					)
+					if (parserOptions.commonjs !== undefined && !parserOptions.commonjs)
 						return;
 
 					const requireExpressions = [

package/lib/dependencies/ContextDependencyHelpers.js

@@ -15,6 +15,32 @@ const quotemeta = str => {
 	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
 };
 
+const splitContextFromPrefix = prefix => {
+	const idx = prefix.lastIndexOf("/");
+	let context = ".";
+	if (idx >= 0) {
+		context = prefix.substr(0, idx);
+		prefix = `.${prefix.substr(idx)}`;
+	}
+	return {
+		context,
+		prefix
+	};
+};
+
+const splitQueryFromPostfix = postfix => {
+	const idx = postfix.indexOf("?");
+	let query = "";
+	if (idx >= 0) {
+		query = postfix.substr(idx);
+		postfix = postfix.substr(0, idx);
+	}
+	return {
+		postfix,
+		query
+	};
+};
+
 ContextDependencyHelpers.create = (
 	Dep,
 	range,
@@ -23,38 +49,30 @@ ContextDependencyHelpers.create = (
 	options,
 	contextOptions
 ) => {
-	let dep;
-	let prefix;
-	let postfix;
-	let prefixRange;
-	let valueRange;
-	let idx;
-	let context;
-	let regExp;
 	if (param.isTemplateString()) {
-		prefix = param.quasis[0].string;
-		postfix =
+		let prefixRaw = param.quasis[0].string;
+		let postfixRaw =
 			param.quasis.length > 1
 				? param.quasis[param.quasis.length - 1].string
 				: "";
-		prefixRange = [param.quasis[0].range[0], param.quasis[0].range[1]];
-		valueRange = param.range;
-		idx = prefix.lastIndexOf("/");
-		context = ".";
-		if (idx >= 0) {
-			context = prefix.substr(0, idx);
-			prefix = `.${prefix.substr(idx)}`;
-		}
+		const prefixRange = [param.quasis[0].range[0], param.quasis[0].range[1]];
+		const postfixRange =
+			param.quasis.length > 1
+				? param.quasis[param.quasis.length - 1].range
+				: "";
+		const valueRange = param.range;
+		const { context, prefix } = splitContextFromPrefix(prefixRaw);
+		const { postfix, query } = splitQueryFromPostfix(postfixRaw);
 		// If there are more than two quasis, maybe the generated RegExp can be more precise?
-		regExp = new RegExp(
+		const regExp = new RegExp(
 			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
 				postfix
 			)}$`
 		);
-		dep = new Dep(
+		const dep = new Dep(
 			Object.assign(
 				{
-					request: context,
+					request: context + query,
 					recursive: options.wrappedContextRecursive,
 					regExp,
 					mode: "sync"
@@ -65,12 +83,20 @@ ContextDependencyHelpers.create = (
 			valueRange
 		);
 		dep.loc = expr.loc;
-		dep.replaces = [
-			{
+		const replaces = [];
+		if (prefixRange && prefix !== prefixRaw) {
+			replaces.push({
 				range: prefixRange,
 				value: prefix
-			}
-		];
+			});
+		}
+		if (postfixRange && postfix !== postfixRaw) {
+			replaces.push({
+				range: postfixRange,
+				value: postfix
+			});
+		}
+		dep.replaces = replaces;
 		dep.critical =
 			options.wrappedContextCritical &&
 			"a part of the request of a dependency is an expression";
@@ -80,30 +106,26 @@ ContextDependencyHelpers.create = (
 		((param.prefix && param.prefix.isString()) ||
 			(param.postfix && param.postfix.isString()))
 	) {
-		prefix = param.prefix && param.prefix.isString() ? param.prefix.string : "";
-		postfix =
+		let prefixRaw =
+			param.prefix && param.prefix.isString() ? param.prefix.string : "";
+		let postfixRaw =
 			param.postfix && param.postfix.isString() ? param.postfix.string : "";
-		prefixRange =
+		const prefixRange =
 			param.prefix && param.prefix.isString() ? param.prefix.range : null;
-		valueRange = [
-			prefixRange ? prefixRange[1] : param.range[0],
-			param.range[1]
-		];
-		idx = prefix.lastIndexOf("/");
-		context = ".";
-		if (idx >= 0) {
-			context = prefix.substr(0, idx);
-			prefix = `.${prefix.substr(idx)}`;
-		}
-		regExp = new RegExp(
+		const postfixRange =
+			param.postfix && param.postfix.isString() ? param.postfix.range : null;
+		const valueRange = param.range;
+		const { context, prefix } = splitContextFromPrefix(prefixRaw);
+		const { postfix, query } = splitQueryFromPostfix(postfixRaw);
+		const regExp = new RegExp(
 			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
 				postfix
 			)}$`
 		);
-		dep = new Dep(
+		const dep = new Dep(
 			Object.assign(
 				{
-					request: context,
+					request: context + query,
 					recursive: options.wrappedContextRecursive,
 					regExp,
 					mode: "sync"
@@ -114,13 +136,26 @@ ContextDependencyHelpers.create = (
 			valueRange
 		);
 		dep.loc = expr.loc;
-		dep.prepend = param.prefix && param.prefix.isString() ? prefix : null;
+		const replaces = [];
+		if (prefixRange && prefix !== prefixRaw) {
+			replaces.push({
+				range: prefixRange,
+				value: JSON.stringify(prefix)
+			});
+		}
+		if (postfixRange && postfix !== postfixRaw) {
+			replaces.push({
+				range: postfixRange,
+				value: JSON.stringify(postfix)
+			});
+		}
+		dep.replaces = replaces;
 		dep.critical =
 			options.wrappedContextCritical &&
 			"a part of the request of a dependency is an expression";
 		return dep;
 	} else {
-		dep = new Dep(
+		const dep = new Dep(
 			Object.assign(
 				{
 					request: options.exprContextRequest,

package/lib/dependencies/ContextDependencyTemplateAsId.js

@@ -20,6 +20,7 @@ class ContextDependencyTemplateAsId {
 					}
 				}
 				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+				// TODO webpack 5 remove `prepend` it's no longer used
 				source.replace(
 					dep.range[0],
 					dep.valueRange[0] - 1,

package/lib/dependencies/ContextDependencyTemplateAsRequireCall.js

@@ -20,6 +20,7 @@ class ContextDependencyTemplateAsRequireCall {
 					}
 				}
 				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+				// TODO webpack 5 remove `prepend` it's no longer used
 				source.replace(
 					dep.range[0],
 					dep.valueRange[0] - 1,

package/lib/dependencies/HarmonyModulesPlugin.js

@@ -121,10 +121,7 @@ class HarmonyModulesPlugin {
 				);
 
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.harmony !== "undefined" &&
-						!parserOptions.harmony
-					)
+					if (parserOptions.harmony !== undefined && !parserOptions.harmony)
 						return;
 
 					new HarmonyDetectionParserPlugin().apply(parser);

package/lib/dependencies/ImportParserPlugin.js

@@ -54,7 +54,7 @@ class ImportParserPlugin {
 			}
 
 			if (importOptions) {
-				if (typeof importOptions.webpackIgnore !== "undefined") {
+				if (importOptions.webpackIgnore !== undefined) {
 					if (typeof importOptions.webpackIgnore !== "boolean") {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
@@ -72,7 +72,7 @@ class ImportParserPlugin {
 						}
 					}
 				}
-				if (typeof importOptions.webpackChunkName !== "undefined") {
+				if (importOptions.webpackChunkName !== undefined) {
 					if (typeof importOptions.webpackChunkName !== "string") {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
@@ -87,7 +87,7 @@ class ImportParserPlugin {
 						chunkName = importOptions.webpackChunkName;
 					}
 				}
-				if (typeof importOptions.webpackMode !== "undefined") {
+				if (importOptions.webpackMode !== undefined) {
 					if (typeof importOptions.webpackMode !== "string") {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
@@ -102,7 +102,7 @@ class ImportParserPlugin {
 						mode = importOptions.webpackMode;
 					}
 				}
-				if (typeof importOptions.webpackPrefetch !== "undefined") {
+				if (importOptions.webpackPrefetch !== undefined) {
 					if (importOptions.webpackPrefetch === true) {
 						groupOptions.prefetchOrder = 0;
 					} else if (typeof importOptions.webpackPrefetch === "number") {
@@ -119,7 +119,7 @@ class ImportParserPlugin {
 						);
 					}
 				}
-				if (typeof importOptions.webpackPreload !== "undefined") {
+				if (importOptions.webpackPreload !== undefined) {
 					if (importOptions.webpackPreload === true) {
 						groupOptions.preloadOrder = 0;
 					} else if (typeof importOptions.webpackPreload === "number") {
@@ -136,7 +136,7 @@ class ImportParserPlugin {
 						);
 					}
 				}
-				if (typeof importOptions.webpackInclude !== "undefined") {
+				if (importOptions.webpackInclude !== undefined) {
 					if (
 						!importOptions.webpackInclude ||
 						importOptions.webpackInclude.constructor.name !== "RegExp"
@@ -154,7 +154,7 @@ class ImportParserPlugin {
 						include = new RegExp(importOptions.webpackInclude);
 					}
 				}
-				if (typeof importOptions.webpackExclude !== "undefined") {
+				if (importOptions.webpackExclude !== undefined) {
 					if (
 						!importOptions.webpackExclude ||
 						importOptions.webpackExclude.constructor.name !== "RegExp"

package/lib/dependencies/ImportPlugin.js

@@ -57,10 +57,7 @@ class ImportPlugin {
 				);
 
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.import !== "undefined" &&
-						!parserOptions.import
-					)
+					if (parserOptions.import !== undefined && !parserOptions.import)
 						return;
 
 					new ImportParserPlugin(options).apply(parser);

package/lib/dependencies/RequireContextPlugin.js

@@ -42,7 +42,7 @@ class RequireContextPlugin {
 
 				const handler = (parser, parserOptions) => {
 					if (
-						typeof parserOptions.requireContext !== "undefined" &&
+						parserOptions.requireContext !== undefined &&
 						!parserOptions.requireContext
 					)
 						return;

package/lib/dependencies/RequireEnsurePlugin.js

@@ -38,7 +38,7 @@ class RequireEnsurePlugin {
 
 				const handler = (parser, parserOptions) => {
 					if (
-						typeof parserOptions.requireEnsure !== "undefined" &&
+						parserOptions.requireEnsure !== undefined &&
 						!parserOptions.requireEnsure
 					)
 						return;

package/lib/dependencies/RequireIncludePlugin.js

@@ -25,7 +25,7 @@ class RequireIncludePlugin {
 
 				const handler = (parser, parserOptions) => {
 					if (
-						typeof parserOptions.requireInclude !== "undefined" &&
+						parserOptions.requireInclude !== undefined &&
 						!parserOptions.requireInclude
 					)
 						return;

package/lib/dependencies/SystemPlugin.js

@@ -17,13 +17,10 @@ class SystemPlugin {
 			"SystemPlugin",
 			(compilation, { normalModuleFactory }) => {
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.system !== "undefined" &&
-						!parserOptions.system
-					)
+					if (parserOptions.system !== undefined && !parserOptions.system)
 						return;
 
-					const shouldWarn = typeof parserOptions.system === "undefined";
+					const shouldWarn = parserOptions.system === undefined;
 
 					const setNotSupported = name => {
 						parser.hooks.evaluateTypeof

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 {

package/lib/optimize/ConcatenatedModule.js

@@ -136,6 +136,9 @@ const getFinalName = (
 				} else if (!info.module.isUsed(exportName)) {
 					return "/* unused export */ undefined";
 				}
+				if (info.globalExports.has(directExport)) {
+					return directExport;
+				}
 				const name = info.internalNames.get(directExport);
 				if (!name) {
 					throw new Error(
@@ -267,7 +270,7 @@ const getPathInAst = (ast, node) => {
 	if (Array.isArray(ast)) {
 		for (i = 0; i < ast.length; i++) {
 			const enterResult = enterNode(ast[i]);
-			if (typeof enterResult !== "undefined") return enterResult;
+			if (enterResult !== undefined) return enterResult;
 		}
 	} else if (ast && typeof ast === "object") {
 		const keys = Object.keys(ast);
@@ -275,10 +278,10 @@ const getPathInAst = (ast, node) => {
 			const value = ast[keys[i]];
 			if (Array.isArray(value)) {
 				const pathResult = getPathInAst(value, node);
-				if (typeof pathResult !== "undefined") return pathResult;
+				if (pathResult !== undefined) return pathResult;
 			} else if (value && typeof value === "object") {
 				const enterResult = enterNode(value);
-				if (typeof enterResult !== "undefined") return enterResult;
+				if (enterResult !== undefined) return enterResult;
 			}
 		}
 	}
@@ -562,6 +565,7 @@ class ConcatenatedModule extends Module {
 						globalScope: undefined,
 						moduleScope: undefined,
 						internalNames: new Map(),
+						globalExports: new Set(),
 						exportMap: exportMap,
 						reexportMap: reexportMap,
 						hasNamespaceObject: false,
@@ -941,6 +945,19 @@ class ConcatenatedModule extends Module {
 					}
 				}
 			}
+
+			// add exported globals
+			if (info.type === "concatenated") {
+				const variables = new Set();
+				for (const variable of info.moduleScope.variables) {
+					variables.add(variable.name);
+				}
+				for (const [, variable] of info.exportMap) {
+					if (!variables.has(variable)) {
+						info.globalExports.add(variable);
+					}
+				}
+			}
 		}
 
 		// generate names for symbols
@@ -1430,8 +1447,9 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 					if (!used) {
 						source.insert(
 							-1,
-							`/* unused concated harmony import ${dep.name} */\n`
+							`/* unused concated harmony import ${def.name} */\n`
 						);
+						continue;
 					}
 					let finalName;
 					const strictFlag = dep.originModule.buildMeta.strictHarmonyModule
@@ -1448,9 +1466,11 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 						}_${exportData}${strictFlag}__`;
 					}
 					const exportsName = this.rootModule.exportsArgument;
-					const content = `/* concated harmony reexport */__webpack_require__.d(${exportsName}, ${JSON.stringify(
-						used
-					)}, function() { return ${finalName}; });\n`;
+					const content =
+						`/* concated harmony reexport ${def.name} */` +
+						`__webpack_require__.d(${exportsName}, ` +
+						`${JSON.stringify(used)}, ` +
+						`function() { return ${finalName}; });\n`;
 					source.insert(-1, content);
 				}
 			} else {

package/lib/util/identifier.js

@@ -60,13 +60,13 @@ exports.makePathsRelative = (context, identifier, cache) => {
 
 	let cachedResult;
 	let contextCache = relativePaths.get(context);
-	if (typeof contextCache === "undefined") {
+	if (contextCache === undefined) {
 		relativePaths.set(context, (contextCache = new Map()));
 	} else {
 		cachedResult = contextCache.get(identifier);
 	}
 
-	if (typeof cachedResult !== "undefined") {
+	if (cachedResult !== undefined) {
 		return cachedResult;
 	} else {
 		const relativePath = _makePathsRelative(context, identifier);

package/lib/wasm/WebAssemblyGenerator.js

@@ -47,9 +47,12 @@ const preprocess = ab => {
  * @returns {Function} composed transform
  */
 const compose = (...fns) => {
-	return fns.reduce((prevFn, nextFn) => {
-		return value => nextFn(prevFn(value));
-	}, value => value);
+	return fns.reduce(
+		(prevFn, nextFn) => {
+			return value => nextFn(prevFn(value));
+		},
+		value => value
+	);
 };
 
 // TODO replace with @callback
@@ -111,7 +114,7 @@ const getCountImportedFunc = ast => {
 const getNextTypeIndex = ast => {
 	const typeSectionMetadata = t.getSectionMetadata(ast, "type");
 
-	if (typeof typeSectionMetadata === "undefined") {
+	if (typeSectionMetadata === undefined) {
 		return t.indexLiteral(0);
 	}
 
@@ -132,7 +135,7 @@ const getNextTypeIndex = ast => {
 const getNextFuncIndex = (ast, countImportedFunc) => {
 	const funcSectionMetadata = t.getSectionMetadata(ast, "func");
 
-	if (typeof funcSectionMetadata === "undefined") {
+	if (funcSectionMetadata === undefined) {
 		return t.indexLiteral(0 + countImportedFunc);
 	}
 
@@ -268,7 +271,7 @@ const rewriteImports = ({ ast, usedDependencyMap }) => bin => {
 				path.node.module + ":" + path.node.name
 			);
 
-			if (typeof result !== "undefined") {
+			if (result !== undefined) {
 				path.node.module = result.module;
 				path.node.name = result.name;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.16.3",
+  "version": "4.17.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -43,10 +43,10 @@
     "coveralls": "^2.11.2",
     "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
-    "eslint": "^5.1.0",
+    "eslint": "^5.2.0",
     "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-jest": "^21.17.0",
-    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-jest": "^21.18.0",
+    "eslint-plugin-node": "^7.0.1",
     "eslint-plugin-prettier": "^2.6.2",
     "express": "~4.13.1",
     "file-loader": "^1.1.6",
@@ -63,7 +63,7 @@
     "less-loader": "^4.0.3",
     "lint-staged": "^7.2.0",
     "lodash": "^4.17.4",
-    "prettier": "^1.13.7",
+    "prettier": "^1.14.0",
     "pug": "^2.0.3",
     "pug-loader": "^2.4.0",
     "raw-loader": "~0.5.0",

package/schemas/plugins/IgnorePlugin.json

@@ -0,0 +1,31 @@
+{
+  "type": "object",
+  "oneOf": [
+    {
+      "additionalProperties": false,
+      "properties": {
+        "resourceRegExp": {
+          "description": "A RegExp to test the request against",
+          "instanceof": "RegExp"
+        },
+        "contextRegExp": {
+          "description": "A RegExp to test the context (directory) against",
+          "instanceof": "RegExp"
+        }
+      }
+    },
+    {
+      "additionalProperties": false,
+      "properties": {
+        "checkResource": {
+          "description": "A filter function for resource",
+          "instanceof": "Function"
+        },
+        "checkContext": {
+          "description": "A filter function for context",
+          "instanceof": "Function"
+        }
+      }
+    }
+  ]
+}