webpack 4.15.0 → 4.16.2

package/lib/dependencies/CommonJsRequireContextDependency.js

@@ -1,23 +1,23 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ContextDependency = require("./ContextDependency");
-const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
-
-class CommonJsRequireContextDependency extends ContextDependency {
-	constructor(options, range, valueRange) {
-		super(options);
-		this.range = range;
-		this.valueRange = valueRange;
-	}
-
-	get type() {
-		return "cjs require context";
-	}
-}
-
-CommonJsRequireContextDependency.Template = ContextDependencyTemplateAsRequireCall;
-
-module.exports = CommonJsRequireContextDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ContextDependency = require("./ContextDependency");
+const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
+
+class CommonJsRequireContextDependency extends ContextDependency {
+	constructor(options, range, valueRange) {
+		super(options);
+		this.range = range;
+		this.valueRange = valueRange;
+	}
+
+	get type() {
+		return "cjs require context";
+	}
+}
+
+CommonJsRequireContextDependency.Template = ContextDependencyTemplateAsRequireCall;
+
+module.exports = CommonJsRequireContextDependency;

package/lib/dependencies/CommonJsRequireDependency.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
-
-class CommonJsRequireDependency extends ModuleDependency {
-	constructor(request, range) {
-		super(request);
-		this.range = range;
-	}
-
-	get type() {
-		return "cjs require";
-	}
-}
-
-CommonJsRequireDependency.Template = ModuleDependencyTemplateAsId;
-
-module.exports = CommonJsRequireDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
+
+class CommonJsRequireDependency extends ModuleDependency {
+	constructor(request, range) {
+		super(request);
+		this.range = range;
+	}
+
+	get type() {
+		return "cjs require";
+	}
+}
+
+CommonJsRequireDependency.Template = ModuleDependencyTemplateAsId;
+
+module.exports = CommonJsRequireDependency;

package/lib/dependencies/CommonJsRequireDependencyParserPlugin.js

@@ -125,6 +125,12 @@ class CommonJsRequireDependencyParserPlugin {
 		parser.hooks.new
 			.for("require")
 			.tap("CommonJsRequireDependencyParserPlugin", createHandler(true));
+		parser.hooks.call
+			.for("module.require")
+			.tap("CommonJsRequireDependencyParserPlugin", createHandler(false));
+		parser.hooks.new
+			.for("module.require")
+			.tap("CommonJsRequireDependencyParserPlugin", createHandler(true));
 	}
 }
 module.exports = CommonJsRequireDependencyParserPlugin;

package/lib/dependencies/ConstDependency.js

@@ -1,33 +1,33 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-
-class ConstDependency extends NullDependency {
-	constructor(expression, range, requireWebpackRequire) {
-		super();
-		this.expression = expression;
-		this.range = range;
-		this.requireWebpackRequire = requireWebpackRequire;
-	}
-
-	updateHash(hash) {
-		hash.update(this.range + "");
-		hash.update(this.expression + "");
-	}
-}
-
-ConstDependency.Template = class ConstDependencyTemplate {
-	apply(dep, source) {
-		if (typeof dep.range === "number") {
-			source.insert(dep.range, dep.expression);
-			return;
-		}
-
-		source.replace(dep.range[0], dep.range[1] - 1, dep.expression);
-	}
-};
-
-module.exports = ConstDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+
+class ConstDependency extends NullDependency {
+	constructor(expression, range, requireWebpackRequire) {
+		super();
+		this.expression = expression;
+		this.range = range;
+		this.requireWebpackRequire = requireWebpackRequire;
+	}
+
+	updateHash(hash) {
+		hash.update(this.range + "");
+		hash.update(this.expression + "");
+	}
+}
+
+ConstDependency.Template = class ConstDependencyTemplate {
+	apply(dep, source) {
+		if (typeof dep.range === "number") {
+			source.insert(dep.range, dep.expression);
+			return;
+		}
+
+		source.replace(dep.range[0], dep.range[1] - 1, dep.expression);
+	}
+};
+
+module.exports = ConstDependency;

package/lib/dependencies/ContextDependency.js

@@ -1,68 +1,68 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const Dependency = require("../Dependency");
-const CriticalDependencyWarning = require("./CriticalDependencyWarning");
-
-const regExpToString = r => (r ? r + "" : "");
-
-class ContextDependency extends Dependency {
-	// options: { request, recursive, regExp, include, exclude, mode, chunkName, groupOptions }
-	constructor(options) {
-		super();
-		this.options = options;
-		this.userRequest = this.options.request;
-		/** @type {false | string} */
-		this.critical = false;
-		this.hadGlobalOrStickyRegExp = false;
-		if (this.options.regExp.global || this.options.regExp.sticky) {
-			this.options.regExp = null;
-			this.hadGlobalOrStickyRegExp = true;
-		}
-	}
-
-	getResourceIdentifier() {
-		return (
-			`context${this.options.request} ${this.options.recursive} ` +
-			`${regExpToString(this.options.regExp)} ${regExpToString(
-				this.options.include
-			)} ${regExpToString(this.options.exclude)} ` +
-			`${this.options.mode} ${this.options.chunkName} ` +
-			`${JSON.stringify(this.options.groupOptions)}`
-		);
-	}
-
-	getWarnings() {
-		let warnings = super.getWarnings() || [];
-		if (this.critical) {
-			warnings.push(new CriticalDependencyWarning(this.critical));
-		}
-		if (this.hadGlobalOrStickyRegExp) {
-			warnings.push(
-				new CriticalDependencyWarning(
-					"Contexts can't use RegExps with the 'g' or 'y' flags."
-				)
-			);
-		}
-		return warnings;
-	}
-}
-
-// TODO remove in webpack 5
-Object.defineProperty(ContextDependency.prototype, "async", {
-	configurable: false,
-	get() {
-		throw new Error(
-			"ContextDependency.async was removed. Use ContextDependency.options.mode instead."
-		);
-	},
-	set() {
-		throw new Error(
-			"ContextDependency.async was removed. Pass options.mode to constructor instead"
-		);
-	}
-});
-
-module.exports = ContextDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const Dependency = require("../Dependency");
+const CriticalDependencyWarning = require("./CriticalDependencyWarning");
+
+const regExpToString = r => (r ? r + "" : "");
+
+class ContextDependency extends Dependency {
+	// options: { request, recursive, regExp, include, exclude, mode, chunkName, groupOptions }
+	constructor(options) {
+		super();
+		this.options = options;
+		this.userRequest = this.options.request;
+		/** @type {false | string} */
+		this.critical = false;
+		this.hadGlobalOrStickyRegExp = false;
+		if (this.options.regExp.global || this.options.regExp.sticky) {
+			this.options.regExp = null;
+			this.hadGlobalOrStickyRegExp = true;
+		}
+	}
+
+	getResourceIdentifier() {
+		return (
+			`context${this.options.request} ${this.options.recursive} ` +
+			`${regExpToString(this.options.regExp)} ${regExpToString(
+				this.options.include
+			)} ${regExpToString(this.options.exclude)} ` +
+			`${this.options.mode} ${this.options.chunkName} ` +
+			`${JSON.stringify(this.options.groupOptions)}`
+		);
+	}
+
+	getWarnings() {
+		let warnings = super.getWarnings() || [];
+		if (this.critical) {
+			warnings.push(new CriticalDependencyWarning(this.critical));
+		}
+		if (this.hadGlobalOrStickyRegExp) {
+			warnings.push(
+				new CriticalDependencyWarning(
+					"Contexts can't use RegExps with the 'g' or 'y' flags."
+				)
+			);
+		}
+		return warnings;
+	}
+}
+
+// TODO remove in webpack 5
+Object.defineProperty(ContextDependency.prototype, "async", {
+	configurable: false,
+	get() {
+		throw new Error(
+			"ContextDependency.async was removed. Use ContextDependency.options.mode instead."
+		);
+	},
+	set() {
+		throw new Error(
+			"ContextDependency.async was removed. Pass options.mode to constructor instead"
+		);
+	}
+});
+
+module.exports = ContextDependency;

package/lib/dependencies/ContextDependencyHelpers.js

@@ -1,142 +1,142 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ContextDependencyHelpers = exports;
-
-/**
- * Escapes regular expression metacharacters
- * @param {string} str String to quote
- * @returns {string} Escaped string
- */
-const quotemeta = str => {
-	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
-};
-
-ContextDependencyHelpers.create = (
-	Dep,
-	range,
-	param,
-	expr,
-	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 =
-			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)}`;
-		}
-		// If there are more than two quasis, maybe the generated RegExp can be more precise?
-		regExp = new RegExp(
-			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
-				postfix
-			)}$`
-		);
-		dep = new Dep(
-			Object.assign(
-				{
-					request: context,
-					recursive: options.wrappedContextRecursive,
-					regExp,
-					mode: "sync"
-				},
-				contextOptions
-			),
-			range,
-			valueRange
-		);
-		dep.loc = expr.loc;
-		dep.replaces = [
-			{
-				range: prefixRange,
-				value: prefix
-			}
-		];
-		dep.critical =
-			options.wrappedContextCritical &&
-			"a part of the request of a dependency is an expression";
-		return dep;
-	} else if (
-		param.isWrapped() &&
-		((param.prefix && param.prefix.isString()) ||
-			(param.postfix && param.postfix.isString()))
-	) {
-		prefix = param.prefix && param.prefix.isString() ? param.prefix.string : "";
-		postfix =
-			param.postfix && param.postfix.isString() ? param.postfix.string : "";
-		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(
-			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
-				postfix
-			)}$`
-		);
-		dep = new Dep(
-			Object.assign(
-				{
-					request: context,
-					recursive: options.wrappedContextRecursive,
-					regExp,
-					mode: "sync"
-				},
-				contextOptions
-			),
-			range,
-			valueRange
-		);
-		dep.loc = expr.loc;
-		dep.prepend = param.prefix && param.prefix.isString() ? prefix : null;
-		dep.critical =
-			options.wrappedContextCritical &&
-			"a part of the request of a dependency is an expression";
-		return dep;
-	} else {
-		dep = new Dep(
-			Object.assign(
-				{
-					request: options.exprContextRequest,
-					recursive: options.exprContextRecursive,
-					regExp: options.exprContextRegExp,
-					mode: "sync"
-				},
-				contextOptions
-			),
-			range,
-			param.range
-		);
-		dep.loc = expr.loc;
-		dep.critical =
-			options.exprContextCritical &&
-			"the request of a dependency is an expression";
-		return dep;
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ContextDependencyHelpers = exports;
+
+/**
+ * Escapes regular expression metacharacters
+ * @param {string} str String to quote
+ * @returns {string} Escaped string
+ */
+const quotemeta = str => {
+	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
+};
+
+ContextDependencyHelpers.create = (
+	Dep,
+	range,
+	param,
+	expr,
+	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 =
+			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)}`;
+		}
+		// If there are more than two quasis, maybe the generated RegExp can be more precise?
+		regExp = new RegExp(
+			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
+				postfix
+			)}$`
+		);
+		dep = new Dep(
+			Object.assign(
+				{
+					request: context,
+					recursive: options.wrappedContextRecursive,
+					regExp,
+					mode: "sync"
+				},
+				contextOptions
+			),
+			range,
+			valueRange
+		);
+		dep.loc = expr.loc;
+		dep.replaces = [
+			{
+				range: prefixRange,
+				value: prefix
+			}
+		];
+		dep.critical =
+			options.wrappedContextCritical &&
+			"a part of the request of a dependency is an expression";
+		return dep;
+	} else if (
+		param.isWrapped() &&
+		((param.prefix && param.prefix.isString()) ||
+			(param.postfix && param.postfix.isString()))
+	) {
+		prefix = param.prefix && param.prefix.isString() ? param.prefix.string : "";
+		postfix =
+			param.postfix && param.postfix.isString() ? param.postfix.string : "";
+		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(
+			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
+				postfix
+			)}$`
+		);
+		dep = new Dep(
+			Object.assign(
+				{
+					request: context,
+					recursive: options.wrappedContextRecursive,
+					regExp,
+					mode: "sync"
+				},
+				contextOptions
+			),
+			range,
+			valueRange
+		);
+		dep.loc = expr.loc;
+		dep.prepend = param.prefix && param.prefix.isString() ? prefix : null;
+		dep.critical =
+			options.wrappedContextCritical &&
+			"a part of the request of a dependency is an expression";
+		return dep;
+	} else {
+		dep = new Dep(
+			Object.assign(
+				{
+					request: options.exprContextRequest,
+					recursive: options.exprContextRecursive,
+					regExp: options.exprContextRegExp,
+					mode: "sync"
+				},
+				contextOptions
+			),
+			range,
+			param.range
+		);
+		dep.loc = expr.loc;
+		dep.critical =
+			options.exprContextCritical &&
+			"the request of a dependency is an expression";
+		return dep;
+	}
+};

package/lib/dependencies/ContextDependencyTemplateAsId.js

@@ -1,42 +1,42 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class ContextDependencyTemplateAsId {
-	apply(dep, source, runtime) {
-		const moduleExports = runtime.moduleExports({
-			module: dep.module,
-			request: dep.request
-		});
-
-		if (dep.module) {
-			if (dep.valueRange) {
-				if (Array.isArray(dep.replaces)) {
-					for (let i = 0; i < dep.replaces.length; i++) {
-						const rep = dep.replaces[i];
-						source.replace(rep.range[0], rep.range[1] - 1, rep.value);
-					}
-				}
-				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
-				source.replace(
-					dep.range[0],
-					dep.valueRange[0] - 1,
-					`${moduleExports}.resolve(${
-						typeof dep.prepend === "string" ? JSON.stringify(dep.prepend) : ""
-					}`
-				);
-			} else {
-				source.replace(
-					dep.range[0],
-					dep.range[1] - 1,
-					`${moduleExports}.resolve`
-				);
-			}
-		} else {
-			source.replace(dep.range[0], dep.range[1] - 1, moduleExports);
-		}
-	}
-}
-module.exports = ContextDependencyTemplateAsId;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class ContextDependencyTemplateAsId {
+	apply(dep, source, runtime) {
+		const moduleExports = runtime.moduleExports({
+			module: dep.module,
+			request: dep.request
+		});
+
+		if (dep.module) {
+			if (dep.valueRange) {
+				if (Array.isArray(dep.replaces)) {
+					for (let i = 0; i < dep.replaces.length; i++) {
+						const rep = dep.replaces[i];
+						source.replace(rep.range[0], rep.range[1] - 1, rep.value);
+					}
+				}
+				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+				source.replace(
+					dep.range[0],
+					dep.valueRange[0] - 1,
+					`${moduleExports}.resolve(${
+						typeof dep.prepend === "string" ? JSON.stringify(dep.prepend) : ""
+					}`
+				);
+			} else {
+				source.replace(
+					dep.range[0],
+					dep.range[1] - 1,
+					`${moduleExports}.resolve`
+				);
+			}
+		} else {
+			source.replace(dep.range[0], dep.range[1] - 1, moduleExports);
+		}
+	}
+}
+module.exports = ContextDependencyTemplateAsId;