webpack 4.9.1 → 4.10.2

package/lib/dependencies/RequireContextDependency.js

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

package/lib/dependencies/RequireContextDependencyParserPlugin.js

@@ -1,56 +1,56 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const RequireContextDependency = require("./RequireContextDependency");
-
-module.exports = class RequireContextDependencyParserPlugin {
-	apply(parser) {
-		parser.hooks.call
-			.for("require.context")
-			.tap("RequireContextDependencyParserPlugin", expr => {
-				let regExp = /^\.\/.*$/;
-				let recursive = true;
-				let mode = "sync";
-				switch (expr.arguments.length) {
-					case 4: {
-						const modeExpr = parser.evaluateExpression(expr.arguments[3]);
-						if (!modeExpr.isString()) return;
-						mode = modeExpr.string;
-					}
-					// falls through
-					case 3: {
-						const regExpExpr = parser.evaluateExpression(expr.arguments[2]);
-						if (!regExpExpr.isRegExp()) return;
-						regExp = regExpExpr.regExp;
-					}
-					// falls through
-					case 2: {
-						const recursiveExpr = parser.evaluateExpression(expr.arguments[1]);
-						if (!recursiveExpr.isBoolean()) return;
-						recursive = recursiveExpr.bool;
-					}
-					// falls through
-					case 1: {
-						const requestExpr = parser.evaluateExpression(expr.arguments[0]);
-						if (!requestExpr.isString()) return;
-						const dep = new RequireContextDependency(
-							{
-								request: requestExpr.string,
-								recursive,
-								regExp,
-								mode
-							},
-							expr.range
-						);
-						dep.loc = expr.loc;
-						dep.optional = parser.scope.inTry;
-						parser.state.current.addDependency(dep);
-						return true;
-					}
-				}
-			});
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const RequireContextDependency = require("./RequireContextDependency");
+
+module.exports = class RequireContextDependencyParserPlugin {
+	apply(parser) {
+		parser.hooks.call
+			.for("require.context")
+			.tap("RequireContextDependencyParserPlugin", expr => {
+				let regExp = /^\.\/.*$/;
+				let recursive = true;
+				let mode = "sync";
+				switch (expr.arguments.length) {
+					case 4: {
+						const modeExpr = parser.evaluateExpression(expr.arguments[3]);
+						if (!modeExpr.isString()) return;
+						mode = modeExpr.string;
+					}
+					// falls through
+					case 3: {
+						const regExpExpr = parser.evaluateExpression(expr.arguments[2]);
+						if (!regExpExpr.isRegExp()) return;
+						regExp = regExpExpr.regExp;
+					}
+					// falls through
+					case 2: {
+						const recursiveExpr = parser.evaluateExpression(expr.arguments[1]);
+						if (!recursiveExpr.isBoolean()) return;
+						recursive = recursiveExpr.bool;
+					}
+					// falls through
+					case 1: {
+						const requestExpr = parser.evaluateExpression(expr.arguments[0]);
+						if (!requestExpr.isString()) return;
+						const dep = new RequireContextDependency(
+							{
+								request: requestExpr.string,
+								recursive,
+								regExp,
+								mode
+							},
+							expr.range
+						);
+						dep.loc = expr.loc;
+						dep.optional = parser.scope.inTry;
+						parser.state.current.addDependency(dep);
+						return true;
+					}
+				}
+			});
+	}
+};

package/lib/dependencies/RequireContextPlugin.js

@@ -1,141 +1,143 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const RequireContextDependency = require("./RequireContextDependency");
-const ContextElementDependency = require("./ContextElementDependency");
-
-const RequireContextDependencyParserPlugin = require("./RequireContextDependencyParserPlugin");
-
-class RequireContextPlugin {
-	constructor(modulesDirectories, extensions, mainFiles) {
-		if (!Array.isArray(modulesDirectories))
-			throw new Error("modulesDirectories must be an array");
-		if (!Array.isArray(extensions))
-			throw new Error("extensions must be an array");
-		this.modulesDirectories = modulesDirectories;
-		this.extensions = extensions;
-		this.mainFiles = mainFiles;
-	}
-
-	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"RequireContextPlugin",
-			(compilation, { contextModuleFactory, normalModuleFactory }) => {
-				compilation.dependencyFactories.set(
-					RequireContextDependency,
-					contextModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					RequireContextDependency,
-					new RequireContextDependency.Template()
-				);
-
-				compilation.dependencyFactories.set(
-					ContextElementDependency,
-					normalModuleFactory
-				);
-
-				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.requireContext !== "undefined" &&
-						!parserOptions.requireContext
-					)
-						return;
-
-					new RequireContextDependencyParserPlugin().apply(parser);
-				};
-
-				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("RequireContextPlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("RequireContextPlugin", handler);
-
-				contextModuleFactory.hooks.alternatives.tap(
-					"RequireContextPlugin",
-					items => {
-						if (items.length === 0) return items;
-						return items
-							.map(obj => {
-								return this.extensions
-									.filter(ext => {
-										const l = obj.request.length;
-										return (
-											l > ext.length &&
-											obj.request.substr(l - ext.length, l) === ext
-										);
-									})
-									.map(ext => {
-										const l = obj.request.length;
-										return {
-											context: obj.context,
-											request: obj.request.substr(0, l - ext.length)
-										};
-									})
-									.concat(obj);
-							})
-							.reduce((a, b) => a.concat(b), []);
-					}
-				);
-
-				contextModuleFactory.hooks.alternatives.tap(
-					"RequireContextPlugin",
-					items => {
-						if (items.length === 0) return items;
-						return items
-							.map(obj => {
-								return this.mainFiles
-									.filter(mainFile => {
-										const l = obj.request.length;
-										return (
-											l > mainFile.length + 1 &&
-											obj.request.substr(l - mainFile.length - 1, l) ===
-												"/" + mainFile
-										);
-									})
-									.map(mainFile => {
-										const l = obj.request.length;
-										return [
-											{
-												context: obj.context,
-												request: obj.request.substr(0, l - mainFile.length)
-											},
-											{
-												context: obj.context,
-												request: obj.request.substr(0, l - mainFile.length - 1)
-											}
-										];
-									})
-									.reduce((a, b) => a.concat(b), [])
-									.concat(obj);
-							})
-							.reduce((a, b) => a.concat(b), []);
-					}
-				);
-
-				contextModuleFactory.hooks.alternatives.tap(
-					"RequireContextPlugin",
-					items => {
-						if (items.length === 0) return items;
-						return items.map(obj => {
-							for (let i = 0; i < this.modulesDirectories.length; i++) {
-								const dir = this.modulesDirectories[i];
-								const idx = obj.request.indexOf("./" + dir + "/");
-								if (idx === 0) {
-									obj.request = obj.request.slice(dir.length + 3);
-									break;
-								}
-							}
-							return obj;
-						});
-					}
-				);
-			}
-		);
-	}
-}
-module.exports = RequireContextPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const RequireContextDependency = require("./RequireContextDependency");
+const ContextElementDependency = require("./ContextElementDependency");
+
+const RequireContextDependencyParserPlugin = require("./RequireContextDependencyParserPlugin");
+
+class RequireContextPlugin {
+	constructor(modulesDirectories, extensions, mainFiles) {
+		if (!Array.isArray(modulesDirectories)) {
+			throw new Error("modulesDirectories must be an array");
+		}
+		if (!Array.isArray(extensions)) {
+			throw new Error("extensions must be an array");
+		}
+		this.modulesDirectories = modulesDirectories;
+		this.extensions = extensions;
+		this.mainFiles = mainFiles;
+	}
+
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"RequireContextPlugin",
+			(compilation, { contextModuleFactory, normalModuleFactory }) => {
+				compilation.dependencyFactories.set(
+					RequireContextDependency,
+					contextModuleFactory
+				);
+				compilation.dependencyTemplates.set(
+					RequireContextDependency,
+					new RequireContextDependency.Template()
+				);
+
+				compilation.dependencyFactories.set(
+					ContextElementDependency,
+					normalModuleFactory
+				);
+
+				const handler = (parser, parserOptions) => {
+					if (
+						typeof parserOptions.requireContext !== "undefined" &&
+						!parserOptions.requireContext
+					)
+						return;
+
+					new RequireContextDependencyParserPlugin().apply(parser);
+				};
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("RequireContextPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("RequireContextPlugin", handler);
+
+				contextModuleFactory.hooks.alternatives.tap(
+					"RequireContextPlugin",
+					items => {
+						if (items.length === 0) return items;
+						return items
+							.map(obj => {
+								return this.extensions
+									.filter(ext => {
+										const l = obj.request.length;
+										return (
+											l > ext.length &&
+											obj.request.substr(l - ext.length, l) === ext
+										);
+									})
+									.map(ext => {
+										const l = obj.request.length;
+										return {
+											context: obj.context,
+											request: obj.request.substr(0, l - ext.length)
+										};
+									})
+									.concat(obj);
+							})
+							.reduce((a, b) => a.concat(b), []);
+					}
+				);
+
+				contextModuleFactory.hooks.alternatives.tap(
+					"RequireContextPlugin",
+					items => {
+						if (items.length === 0) return items;
+						return items
+							.map(obj => {
+								return this.mainFiles
+									.filter(mainFile => {
+										const l = obj.request.length;
+										return (
+											l > mainFile.length + 1 &&
+											obj.request.substr(l - mainFile.length - 1, l) ===
+												"/" + mainFile
+										);
+									})
+									.map(mainFile => {
+										const l = obj.request.length;
+										return [
+											{
+												context: obj.context,
+												request: obj.request.substr(0, l - mainFile.length)
+											},
+											{
+												context: obj.context,
+												request: obj.request.substr(0, l - mainFile.length - 1)
+											}
+										];
+									})
+									.reduce((a, b) => a.concat(b), [])
+									.concat(obj);
+							})
+							.reduce((a, b) => a.concat(b), []);
+					}
+				);
+
+				contextModuleFactory.hooks.alternatives.tap(
+					"RequireContextPlugin",
+					items => {
+						if (items.length === 0) return items;
+						return items.map(obj => {
+							for (let i = 0; i < this.modulesDirectories.length; i++) {
+								const dir = this.modulesDirectories[i];
+								const idx = obj.request.indexOf("./" + dir + "/");
+								if (idx === 0) {
+									obj.request = obj.request.slice(dir.length + 3);
+									break;
+								}
+							}
+							return obj;
+						});
+					}
+				);
+			}
+		);
+	}
+}
+module.exports = RequireContextPlugin;

package/lib/dependencies/RequireEnsureDependenciesBlock.js

@@ -1,33 +1,33 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const RequireEnsureDependency = require("./RequireEnsureDependency");
-
-module.exports = class RequireEnsureDependenciesBlock extends AsyncDependenciesBlock {
-	constructor(
-		expr,
-		successExpression,
-		errorExpression,
-		chunkName,
-		chunkNameRange,
-		module,
-		loc
-	) {
-		super(chunkName, module, loc, null);
-		this.expr = expr;
-		const successBodyRange =
-			successExpression &&
-			successExpression.body &&
-			successExpression.body.range;
-		if (successBodyRange) {
-			this.range = [successBodyRange[0] + 1, successBodyRange[1] - 1];
-		}
-		this.chunkNameRange = chunkNameRange;
-		const dep = new RequireEnsureDependency(this);
-		dep.loc = loc;
-		this.addDependency(dep);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
+const RequireEnsureDependency = require("./RequireEnsureDependency");
+
+module.exports = class RequireEnsureDependenciesBlock extends AsyncDependenciesBlock {
+	constructor(
+		expr,
+		successExpression,
+		errorExpression,
+		chunkName,
+		chunkNameRange,
+		module,
+		loc
+	) {
+		super(chunkName, module, loc, null);
+		this.expr = expr;
+		const successBodyRange =
+			successExpression &&
+			successExpression.body &&
+			successExpression.body.range;
+		if (successBodyRange) {
+			this.range = [successBodyRange[0] + 1, successBodyRange[1] - 1];
+		}
+		this.chunkNameRange = chunkNameRange;
+		const dep = new RequireEnsureDependency(this);
+		dep.loc = loc;
+		this.addDependency(dep);
+	}
+};