webpack 4.9.1 → 4.10.2

package/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js

@@ -1,112 +1,116 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const RequireEnsureDependenciesBlock = require("./RequireEnsureDependenciesBlock");
-const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
-const getFunctionExpression = require("./getFunctionExpression");
-
-module.exports = class RequireEnsureDependenciesBlockParserPlugin {
-	apply(parser) {
-		parser.hooks.call
-			.for("require.ensure")
-			.tap("RequireEnsureDependenciesBlockParserPlugin", expr => {
-				let chunkName = null;
-				let chunkNameRange = null;
-				let errorExpressionArg = null;
-				let errorExpression = null;
-				switch (expr.arguments.length) {
-					case 4: {
-						const chunkNameExpr = parser.evaluateExpression(expr.arguments[3]);
-						if (!chunkNameExpr.isString()) return;
-						chunkNameRange = chunkNameExpr.range;
-						chunkName = chunkNameExpr.string;
-					}
-					// falls through
-					case 3: {
-						errorExpressionArg = expr.arguments[2];
-						errorExpression = getFunctionExpression(errorExpressionArg);
-
-						if (!errorExpression && !chunkName) {
-							const chunkNameExpr = parser.evaluateExpression(
-								expr.arguments[2]
-							);
-							if (!chunkNameExpr.isString()) return;
-							chunkNameRange = chunkNameExpr.range;
-							chunkName = chunkNameExpr.string;
-						}
-					}
-					// falls through
-					case 2: {
-						const dependenciesExpr = parser.evaluateExpression(
-							expr.arguments[0]
-						);
-						const dependenciesItems = dependenciesExpr.isArray()
-							? dependenciesExpr.items
-							: [dependenciesExpr];
-						const successExpressionArg = expr.arguments[1];
-						const successExpression = getFunctionExpression(
-							successExpressionArg
-						);
-
-						if (successExpression) {
-							parser.walkExpressions(successExpression.expressions);
-						}
-						if (errorExpression) {
-							parser.walkExpressions(errorExpression.expressions);
-						}
-
-						const dep = new RequireEnsureDependenciesBlock(
-							expr,
-							successExpression ? successExpression.fn : successExpressionArg,
-							errorExpression ? errorExpression.fn : errorExpressionArg,
-							chunkName,
-							chunkNameRange,
-							parser.state.module,
-							expr.loc
-						);
-						const old = parser.state.current;
-						parser.state.current = dep;
-						try {
-							let failed = false;
-							parser.inScope([], () => {
-								for (const ee of dependenciesItems) {
-									if (ee.isString()) {
-										const edep = new RequireEnsureItemDependency(ee.string);
-										edep.loc = dep.loc;
-										dep.addDependency(edep);
-									} else {
-										failed = true;
-									}
-								}
-							});
-							if (failed) {
-								return;
-							}
-							if (successExpression) {
-								if (successExpression.fn.body.type === "BlockStatement")
-									parser.walkStatement(successExpression.fn.body);
-								else parser.walkExpression(successExpression.fn.body);
-							}
-							old.addBlock(dep);
-						} finally {
-							parser.state.current = old;
-						}
-						if (!successExpression) {
-							parser.walkExpression(successExpressionArg);
-						}
-						if (errorExpression) {
-							if (errorExpression.fn.body.type === "BlockStatement")
-								parser.walkStatement(errorExpression.fn.body);
-							else parser.walkExpression(errorExpression.fn.body);
-						} else if (errorExpressionArg) {
-							parser.walkExpression(errorExpressionArg);
-						}
-						return true;
-					}
-				}
-			});
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const RequireEnsureDependenciesBlock = require("./RequireEnsureDependenciesBlock");
+const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
+const getFunctionExpression = require("./getFunctionExpression");
+
+module.exports = class RequireEnsureDependenciesBlockParserPlugin {
+	apply(parser) {
+		parser.hooks.call
+			.for("require.ensure")
+			.tap("RequireEnsureDependenciesBlockParserPlugin", expr => {
+				let chunkName = null;
+				let chunkNameRange = null;
+				let errorExpressionArg = null;
+				let errorExpression = null;
+				switch (expr.arguments.length) {
+					case 4: {
+						const chunkNameExpr = parser.evaluateExpression(expr.arguments[3]);
+						if (!chunkNameExpr.isString()) return;
+						chunkNameRange = chunkNameExpr.range;
+						chunkName = chunkNameExpr.string;
+					}
+					// falls through
+					case 3: {
+						errorExpressionArg = expr.arguments[2];
+						errorExpression = getFunctionExpression(errorExpressionArg);
+
+						if (!errorExpression && !chunkName) {
+							const chunkNameExpr = parser.evaluateExpression(
+								expr.arguments[2]
+							);
+							if (!chunkNameExpr.isString()) return;
+							chunkNameRange = chunkNameExpr.range;
+							chunkName = chunkNameExpr.string;
+						}
+					}
+					// falls through
+					case 2: {
+						const dependenciesExpr = parser.evaluateExpression(
+							expr.arguments[0]
+						);
+						const dependenciesItems = dependenciesExpr.isArray()
+							? dependenciesExpr.items
+							: [dependenciesExpr];
+						const successExpressionArg = expr.arguments[1];
+						const successExpression = getFunctionExpression(
+							successExpressionArg
+						);
+
+						if (successExpression) {
+							parser.walkExpressions(successExpression.expressions);
+						}
+						if (errorExpression) {
+							parser.walkExpressions(errorExpression.expressions);
+						}
+
+						const dep = new RequireEnsureDependenciesBlock(
+							expr,
+							successExpression ? successExpression.fn : successExpressionArg,
+							errorExpression ? errorExpression.fn : errorExpressionArg,
+							chunkName,
+							chunkNameRange,
+							parser.state.module,
+							expr.loc
+						);
+						const old = parser.state.current;
+						parser.state.current = dep;
+						try {
+							let failed = false;
+							parser.inScope([], () => {
+								for (const ee of dependenciesItems) {
+									if (ee.isString()) {
+										const edep = new RequireEnsureItemDependency(ee.string);
+										edep.loc = dep.loc;
+										dep.addDependency(edep);
+									} else {
+										failed = true;
+									}
+								}
+							});
+							if (failed) {
+								return;
+							}
+							if (successExpression) {
+								if (successExpression.fn.body.type === "BlockStatement") {
+									parser.walkStatement(successExpression.fn.body);
+								} else {
+									parser.walkExpression(successExpression.fn.body);
+								}
+							}
+							old.addBlock(dep);
+						} finally {
+							parser.state.current = old;
+						}
+						if (!successExpression) {
+							parser.walkExpression(successExpressionArg);
+						}
+						if (errorExpression) {
+							if (errorExpression.fn.body.type === "BlockStatement") {
+								parser.walkStatement(errorExpression.fn.body);
+							} else {
+								parser.walkExpression(errorExpression.fn.body);
+							}
+						} else if (errorExpressionArg) {
+							parser.walkExpression(errorExpressionArg);
+						}
+						return true;
+					}
+				}
+			});
+	}
+};

package/lib/dependencies/RequireEnsureDependency.js

@@ -1,58 +1,58 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-
-class RequireEnsureDependency extends NullDependency {
-	constructor(block) {
-		super();
-		this.block = block;
-	}
-
-	get type() {
-		return "require.ensure";
-	}
-}
-
-RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate {
-	apply(dep, source, runtime) {
-		const depBlock = dep.block;
-		const promise = runtime.blockPromise({
-			block: depBlock,
-			message: "require.ensure"
-		});
-		const errorCallbackExists =
-			depBlock.expr.arguments.length === 4 ||
-			(!depBlock.chunkName && depBlock.expr.arguments.length === 3);
-		const startBlock = `${promise}.then((`;
-		const middleBlock = ").bind(null, __webpack_require__)).catch(";
-		const endBlock = `).bind(null, __webpack_require__)).catch(${runtime.onError()})`;
-		source.replace(
-			depBlock.expr.range[0],
-			depBlock.expr.arguments[1].range[0] - 1,
-			startBlock
-		);
-		if (errorCallbackExists) {
-			source.replace(
-				depBlock.expr.arguments[1].range[1],
-				depBlock.expr.arguments[2].range[0] - 1,
-				middleBlock
-			);
-			source.replace(
-				depBlock.expr.arguments[2].range[1],
-				depBlock.expr.range[1] - 1,
-				")"
-			);
-		} else {
-			source.replace(
-				depBlock.expr.arguments[1].range[1],
-				depBlock.expr.range[1] - 1,
-				endBlock
-			);
-		}
-	}
-};
-
-module.exports = RequireEnsureDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+
+class RequireEnsureDependency extends NullDependency {
+	constructor(block) {
+		super();
+		this.block = block;
+	}
+
+	get type() {
+		return "require.ensure";
+	}
+}
+
+RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate {
+	apply(dep, source, runtime) {
+		const depBlock = dep.block;
+		const promise = runtime.blockPromise({
+			block: depBlock,
+			message: "require.ensure"
+		});
+		const errorCallbackExists =
+			depBlock.expr.arguments.length === 4 ||
+			(!depBlock.chunkName && depBlock.expr.arguments.length === 3);
+		const startBlock = `${promise}.then((`;
+		const middleBlock = ").bind(null, __webpack_require__)).catch(";
+		const endBlock = `).bind(null, __webpack_require__)).catch(${runtime.onError()})`;
+		source.replace(
+			depBlock.expr.range[0],
+			depBlock.expr.arguments[1].range[0] - 1,
+			startBlock
+		);
+		if (errorCallbackExists) {
+			source.replace(
+				depBlock.expr.arguments[1].range[1],
+				depBlock.expr.arguments[2].range[0] - 1,
+				middleBlock
+			);
+			source.replace(
+				depBlock.expr.arguments[2].range[1],
+				depBlock.expr.range[1] - 1,
+				")"
+			);
+		} else {
+			source.replace(
+				depBlock.expr.arguments[1].range[1],
+				depBlock.expr.range[1] - 1,
+				endBlock
+			);
+		}
+	}
+};
+
+module.exports = RequireEnsureDependency;

package/lib/dependencies/RequireEnsurePlugin.js

@@ -1,74 +1,74 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
-const RequireEnsureDependency = require("./RequireEnsureDependency");
-
-const NullFactory = require("../NullFactory");
-
-const RequireEnsureDependenciesBlockParserPlugin = require("./RequireEnsureDependenciesBlockParserPlugin");
-
-const ParserHelpers = require("../ParserHelpers");
-
-class RequireEnsurePlugin {
-	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"RequireEnsurePlugin",
-			(compilation, { normalModuleFactory }) => {
-				compilation.dependencyFactories.set(
-					RequireEnsureItemDependency,
-					normalModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					RequireEnsureItemDependency,
-					new RequireEnsureItemDependency.Template()
-				);
-
-				compilation.dependencyFactories.set(
-					RequireEnsureDependency,
-					new NullFactory()
-				);
-				compilation.dependencyTemplates.set(
-					RequireEnsureDependency,
-					new RequireEnsureDependency.Template()
-				);
-
-				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.requireEnsure !== "undefined" &&
-						!parserOptions.requireEnsure
-					)
-						return;
-
-					new RequireEnsureDependenciesBlockParserPlugin().apply(parser);
-					parser.hooks.evaluateTypeof
-						.for("require.ensure")
-						.tap(
-							"RequireEnsurePlugin",
-							ParserHelpers.evaluateToString("function")
-						);
-					parser.hooks.typeof
-						.for("require.ensure")
-						.tap(
-							"RequireEnsurePlugin",
-							ParserHelpers.toConstantDependency(
-								parser,
-								JSON.stringify("function")
-							)
-						);
-				};
-
-				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("RequireEnsurePlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("RequireEnsurePlugin", handler);
-			}
-		);
-	}
-}
-module.exports = RequireEnsurePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
+const RequireEnsureDependency = require("./RequireEnsureDependency");
+
+const NullFactory = require("../NullFactory");
+
+const RequireEnsureDependenciesBlockParserPlugin = require("./RequireEnsureDependenciesBlockParserPlugin");
+
+const ParserHelpers = require("../ParserHelpers");
+
+class RequireEnsurePlugin {
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"RequireEnsurePlugin",
+			(compilation, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(
+					RequireEnsureItemDependency,
+					normalModuleFactory
+				);
+				compilation.dependencyTemplates.set(
+					RequireEnsureItemDependency,
+					new RequireEnsureItemDependency.Template()
+				);
+
+				compilation.dependencyFactories.set(
+					RequireEnsureDependency,
+					new NullFactory()
+				);
+				compilation.dependencyTemplates.set(
+					RequireEnsureDependency,
+					new RequireEnsureDependency.Template()
+				);
+
+				const handler = (parser, parserOptions) => {
+					if (
+						typeof parserOptions.requireEnsure !== "undefined" &&
+						!parserOptions.requireEnsure
+					)
+						return;
+
+					new RequireEnsureDependenciesBlockParserPlugin().apply(parser);
+					parser.hooks.evaluateTypeof
+						.for("require.ensure")
+						.tap(
+							"RequireEnsurePlugin",
+							ParserHelpers.evaluateToString("function")
+						);
+					parser.hooks.typeof
+						.for("require.ensure")
+						.tap(
+							"RequireEnsurePlugin",
+							ParserHelpers.toConstantDependency(
+								parser,
+								JSON.stringify("function")
+							)
+						);
+				};
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("RequireEnsurePlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("RequireEnsurePlugin", handler);
+			}
+		);
+	}
+}
+module.exports = RequireEnsurePlugin;

package/lib/dependencies/RequireHeaderDependency.js

@@ -1,26 +1,26 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-
-class RequireHeaderDependency extends NullDependency {
-	constructor(range) {
-		super();
-		if (!Array.isArray(range)) throw new Error("range must be valid");
-		this.range = range;
-	}
-}
-
-RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate {
-	apply(dep, source) {
-		source.replace(dep.range[0], dep.range[1] - 1, "__webpack_require__");
-	}
-
-	applyAsTemplateArgument(name, dep, source) {
-		source.replace(dep.range[0], dep.range[1] - 1, "require");
-	}
-};
-
-module.exports = RequireHeaderDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+
+class RequireHeaderDependency extends NullDependency {
+	constructor(range) {
+		super();
+		if (!Array.isArray(range)) throw new Error("range must be valid");
+		this.range = range;
+	}
+}
+
+RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate {
+	apply(dep, source) {
+		source.replace(dep.range[0], dep.range[1] - 1, "__webpack_require__");
+	}
+
+	applyAsTemplateArgument(name, dep, source) {
+		source.replace(dep.range[0], dep.range[1] - 1, "require");
+	}
+};
+
+module.exports = RequireHeaderDependency;

package/lib/dependencies/RequireIncludeDependency.js

@@ -1,39 +1,39 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const DependencyReference = require("./DependencyReference");
-const ModuleDependency = require("./ModuleDependency");
-const Template = require("../Template");
-
-class RequireIncludeDependency extends ModuleDependency {
-	constructor(request, range) {
-		super(request);
-		this.range = range;
-	}
-
-	getReference() {
-		if (!this.module) return null;
-		// This doesn't use any export
-		return new DependencyReference(this.module, [], false);
-	}
-
-	get type() {
-		return "require.include";
-	}
-}
-
-RequireIncludeDependency.Template = class RequireIncludeDependencyTemplate {
-	apply(dep, source, runtime) {
-		const comment = runtime.outputOptions.pathinfo
-			? Template.toComment(
-					`require.include ${runtime.requestShortener.shorten(dep.request)}`
-			  )
-			: "";
-		source.replace(dep.range[0], dep.range[1] - 1, `undefined${comment}`);
-	}
-};
-
-module.exports = RequireIncludeDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const DependencyReference = require("./DependencyReference");
+const ModuleDependency = require("./ModuleDependency");
+const Template = require("../Template");
+
+class RequireIncludeDependency extends ModuleDependency {
+	constructor(request, range) {
+		super(request);
+		this.range = range;
+	}
+
+	getReference() {
+		if (!this.module) return null;
+		// This doesn't use any export
+		return new DependencyReference(this.module, [], false);
+	}
+
+	get type() {
+		return "require.include";
+	}
+}
+
+RequireIncludeDependency.Template = class RequireIncludeDependencyTemplate {
+	apply(dep, source, runtime) {
+		const comment = runtime.outputOptions.pathinfo
+			? Template.toComment(
+					`require.include ${runtime.requestShortener.shorten(dep.request)}`
+			  )
+			: "";
+		source.replace(dep.range[0], dep.range[1] - 1, `undefined${comment}`);
+	}
+};
+
+module.exports = RequireIncludeDependency;

package/lib/dependencies/RequireIncludeDependencyParserPlugin.js

@@ -1,23 +1,23 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const RequireIncludeDependency = require("./RequireIncludeDependency");
-
-module.exports = class RequireIncludeDependencyParserPlugin {
-	apply(parser) {
-		parser.hooks.call
-			.for("require.include")
-			.tap("RequireIncludeDependencyParserPlugin", expr => {
-				if (expr.arguments.length !== 1) return;
-				const param = parser.evaluateExpression(expr.arguments[0]);
-				if (!param.isString()) return;
-				const dep = new RequireIncludeDependency(param.string, expr.range);
-				dep.loc = expr.loc;
-				parser.state.current.addDependency(dep);
-				return true;
-			});
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const RequireIncludeDependency = require("./RequireIncludeDependency");
+
+module.exports = class RequireIncludeDependencyParserPlugin {
+	apply(parser) {
+		parser.hooks.call
+			.for("require.include")
+			.tap("RequireIncludeDependencyParserPlugin", expr => {
+				if (expr.arguments.length !== 1) return;
+				const param = parser.evaluateExpression(expr.arguments[0]);
+				if (!param.isString()) return;
+				const dep = new RequireIncludeDependency(param.string, expr.range);
+				dep.loc = expr.loc;
+				parser.state.current.addDependency(dep);
+				return true;
+			});
+	}
+};