webpack 4.15.0 → 4.16.2

package/lib/dependencies/AMDRequireDependency.js

@@ -1,135 +1,135 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-
-class AMDRequireDependency extends NullDependency {
-	constructor(block) {
-		super();
-		this.block = block;
-	}
-}
-
-AMDRequireDependency.Template = class AMDRequireDependencyTemplate {
-	apply(dep, source, runtime) {
-		const depBlock = dep.block;
-		const promise = runtime.blockPromise({
-			block: depBlock,
-			message: "AMD require"
-		});
-
-		// has array range but no function range
-		if (depBlock.arrayRange && !depBlock.functionRange) {
-			const startBlock = `${promise}.then(function() {`;
-			const endBlock = `;}).catch(${runtime.onError()})`;
-			source.replace(
-				depBlock.outerRange[0],
-				depBlock.arrayRange[0] - 1,
-				startBlock
-			);
-			source.replace(
-				depBlock.arrayRange[1],
-				depBlock.outerRange[1] - 1,
-				endBlock
-			);
-			return;
-		}
-
-		// has function range but no array range
-		if (depBlock.functionRange && !depBlock.arrayRange) {
-			const startBlock = `${promise}.then((`;
-			const endBlock = `).bind(exports, __webpack_require__, exports, module)).catch(${runtime.onError()})`;
-			source.replace(
-				depBlock.outerRange[0],
-				depBlock.functionRange[0] - 1,
-				startBlock
-			);
-			source.replace(
-				depBlock.functionRange[1],
-				depBlock.outerRange[1] - 1,
-				endBlock
-			);
-			return;
-		}
-
-		// has array range, function range, and errorCallbackRange
-		if (
-			depBlock.arrayRange &&
-			depBlock.functionRange &&
-			depBlock.errorCallbackRange
-		) {
-			const startBlock = `${promise}.then(function() { `;
-			const errorRangeBlock = `}${
-				depBlock.functionBindThis ? ".bind(this)" : ""
-			}).catch(`;
-			const endBlock = `${
-				depBlock.errorCallbackBindThis ? ".bind(this)" : ""
-			})`;
-
-			source.replace(
-				depBlock.outerRange[0],
-				depBlock.arrayRange[0] - 1,
-				startBlock
-			);
-			source.insert(
-				depBlock.arrayRange[0] + 0.9,
-				"var __WEBPACK_AMD_REQUIRE_ARRAY__ = "
-			);
-			source.replace(
-				depBlock.arrayRange[1],
-				depBlock.functionRange[0] - 1,
-				"; ("
-			);
-			source.insert(
-				depBlock.functionRange[1],
-				").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);"
-			);
-			source.replace(
-				depBlock.functionRange[1],
-				depBlock.errorCallbackRange[0] - 1,
-				errorRangeBlock
-			);
-			source.replace(
-				depBlock.errorCallbackRange[1],
-				depBlock.outerRange[1] - 1,
-				endBlock
-			);
-			return;
-		}
-
-		// has array range, function range, but no errorCallbackRange
-		if (depBlock.arrayRange && depBlock.functionRange) {
-			const startBlock = `${promise}.then(function() { `;
-			const endBlock = `}${
-				depBlock.functionBindThis ? ".bind(this)" : ""
-			}).catch(${runtime.onError()})`;
-			source.replace(
-				depBlock.outerRange[0],
-				depBlock.arrayRange[0] - 1,
-				startBlock
-			);
-			source.insert(
-				depBlock.arrayRange[0] + 0.9,
-				"var __WEBPACK_AMD_REQUIRE_ARRAY__ = "
-			);
-			source.replace(
-				depBlock.arrayRange[1],
-				depBlock.functionRange[0] - 1,
-				"; ("
-			);
-			source.insert(
-				depBlock.functionRange[1],
-				").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);"
-			);
-			source.replace(
-				depBlock.functionRange[1],
-				depBlock.outerRange[1] - 1,
-				endBlock
-			);
-		}
-	}
-};
-
-module.exports = AMDRequireDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+
+class AMDRequireDependency extends NullDependency {
+	constructor(block) {
+		super();
+		this.block = block;
+	}
+}
+
+AMDRequireDependency.Template = class AMDRequireDependencyTemplate {
+	apply(dep, source, runtime) {
+		const depBlock = dep.block;
+		const promise = runtime.blockPromise({
+			block: depBlock,
+			message: "AMD require"
+		});
+
+		// has array range but no function range
+		if (depBlock.arrayRange && !depBlock.functionRange) {
+			const startBlock = `${promise}.then(function() {`;
+			const endBlock = `;}).catch(${runtime.onError()})`;
+			source.replace(
+				depBlock.outerRange[0],
+				depBlock.arrayRange[0] - 1,
+				startBlock
+			);
+			source.replace(
+				depBlock.arrayRange[1],
+				depBlock.outerRange[1] - 1,
+				endBlock
+			);
+			return;
+		}
+
+		// has function range but no array range
+		if (depBlock.functionRange && !depBlock.arrayRange) {
+			const startBlock = `${promise}.then((`;
+			const endBlock = `).bind(exports, __webpack_require__, exports, module)).catch(${runtime.onError()})`;
+			source.replace(
+				depBlock.outerRange[0],
+				depBlock.functionRange[0] - 1,
+				startBlock
+			);
+			source.replace(
+				depBlock.functionRange[1],
+				depBlock.outerRange[1] - 1,
+				endBlock
+			);
+			return;
+		}
+
+		// has array range, function range, and errorCallbackRange
+		if (
+			depBlock.arrayRange &&
+			depBlock.functionRange &&
+			depBlock.errorCallbackRange
+		) {
+			const startBlock = `${promise}.then(function() { `;
+			const errorRangeBlock = `}${
+				depBlock.functionBindThis ? ".bind(this)" : ""
+			}).catch(`;
+			const endBlock = `${
+				depBlock.errorCallbackBindThis ? ".bind(this)" : ""
+			})`;
+
+			source.replace(
+				depBlock.outerRange[0],
+				depBlock.arrayRange[0] - 1,
+				startBlock
+			);
+			source.insert(
+				depBlock.arrayRange[0] + 0.9,
+				"var __WEBPACK_AMD_REQUIRE_ARRAY__ = "
+			);
+			source.replace(
+				depBlock.arrayRange[1],
+				depBlock.functionRange[0] - 1,
+				"; ("
+			);
+			source.insert(
+				depBlock.functionRange[1],
+				").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);"
+			);
+			source.replace(
+				depBlock.functionRange[1],
+				depBlock.errorCallbackRange[0] - 1,
+				errorRangeBlock
+			);
+			source.replace(
+				depBlock.errorCallbackRange[1],
+				depBlock.outerRange[1] - 1,
+				endBlock
+			);
+			return;
+		}
+
+		// has array range, function range, but no errorCallbackRange
+		if (depBlock.arrayRange && depBlock.functionRange) {
+			const startBlock = `${promise}.then(function() { `;
+			const endBlock = `}${
+				depBlock.functionBindThis ? ".bind(this)" : ""
+			}).catch(${runtime.onError()})`;
+			source.replace(
+				depBlock.outerRange[0],
+				depBlock.arrayRange[0] - 1,
+				startBlock
+			);
+			source.insert(
+				depBlock.arrayRange[0] + 0.9,
+				"var __WEBPACK_AMD_REQUIRE_ARRAY__ = "
+			);
+			source.replace(
+				depBlock.arrayRange[1],
+				depBlock.functionRange[0] - 1,
+				"; ("
+			);
+			source.insert(
+				depBlock.functionRange[1],
+				").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);"
+			);
+			source.replace(
+				depBlock.functionRange[1],
+				depBlock.outerRange[1] - 1,
+				endBlock
+			);
+		}
+	}
+};
+
+module.exports = AMDRequireDependency;

package/lib/dependencies/AMDRequireItemDependency.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 ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
-
-class AMDRequireItemDependency extends ModuleDependency {
-	constructor(request, range) {
-		super(request);
-		this.range = range;
-	}
-
-	get type() {
-		return "amd require";
-	}
-}
-
-AMDRequireItemDependency.Template = ModuleDependencyTemplateAsRequireId;
-
-module.exports = AMDRequireItemDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
+
+class AMDRequireItemDependency extends ModuleDependency {
+	constructor(request, range) {
+		super(request);
+		this.range = range;
+	}
+
+	get type() {
+		return "amd require";
+	}
+}
+
+AMDRequireItemDependency.Template = ModuleDependencyTemplateAsRequireId;
+
+module.exports = AMDRequireItemDependency;

package/lib/dependencies/CommonJsPlugin.js

@@ -1,161 +1,161 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ConstDependency = require("./ConstDependency");
-const CommonJsRequireDependency = require("./CommonJsRequireDependency");
-const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
-const RequireResolveDependency = require("./RequireResolveDependency");
-const RequireResolveContextDependency = require("./RequireResolveContextDependency");
-const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency");
-const RequireHeaderDependency = require("./RequireHeaderDependency");
-
-const NullFactory = require("../NullFactory");
-
-const RequireResolveDependencyParserPlugin = require("./RequireResolveDependencyParserPlugin");
-const CommonJsRequireDependencyParserPlugin = require("./CommonJsRequireDependencyParserPlugin");
-
-const ParserHelpers = require("../ParserHelpers");
-
-class CommonJsPlugin {
-	constructor(options) {
-		this.options = options;
-	}
-
-	apply(compiler) {
-		const options = this.options;
-		compiler.hooks.compilation.tap(
-			"CommonJsPlugin",
-			(compilation, { contextModuleFactory, normalModuleFactory }) => {
-				compilation.dependencyFactories.set(
-					CommonJsRequireDependency,
-					normalModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					CommonJsRequireDependency,
-					new CommonJsRequireDependency.Template()
-				);
-
-				compilation.dependencyFactories.set(
-					CommonJsRequireContextDependency,
-					contextModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					CommonJsRequireContextDependency,
-					new CommonJsRequireContextDependency.Template()
-				);
-
-				compilation.dependencyFactories.set(
-					RequireResolveDependency,
-					normalModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					RequireResolveDependency,
-					new RequireResolveDependency.Template()
-				);
-
-				compilation.dependencyFactories.set(
-					RequireResolveContextDependency,
-					contextModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					RequireResolveContextDependency,
-					new RequireResolveContextDependency.Template()
-				);
-
-				compilation.dependencyFactories.set(
-					RequireResolveHeaderDependency,
-					new NullFactory()
-				);
-				compilation.dependencyTemplates.set(
-					RequireResolveHeaderDependency,
-					new RequireResolveHeaderDependency.Template()
-				);
-
-				compilation.dependencyFactories.set(
-					RequireHeaderDependency,
-					new NullFactory()
-				);
-				compilation.dependencyTemplates.set(
-					RequireHeaderDependency,
-					new RequireHeaderDependency.Template()
-				);
-
-				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.commonjs !== "undefined" &&
-						!parserOptions.commonjs
-					)
-						return;
-
-					const requireExpressions = [
-						"require",
-						"require.resolve",
-						"require.resolveWeak"
-					];
-					for (let expression of requireExpressions) {
-						parser.hooks.typeof
-							.for(expression)
-							.tap(
-								"CommonJsPlugin",
-								ParserHelpers.toConstantDependency(
-									parser,
-									JSON.stringify("function")
-								)
-							);
-						parser.hooks.evaluateTypeof
-							.for(expression)
-							.tap(
-								"CommonJsPlugin",
-								ParserHelpers.evaluateToString("function")
-							);
-						parser.hooks.evaluateIdentifier
-							.for(expression)
-							.tap(
-								"CommonJsPlugin",
-								ParserHelpers.evaluateToIdentifier(expression, true)
-							);
-					}
-
-					parser.hooks.evaluateTypeof
-						.for("module")
-						.tap("CommonJsPlugin", ParserHelpers.evaluateToString("object"));
-					parser.hooks.assign.for("require").tap("CommonJsPlugin", expr => {
-						// to not leak to global "require", we need to define a local require here.
-						const dep = new ConstDependency("var require;", 0);
-						dep.loc = expr.loc;
-						parser.state.current.addDependency(dep);
-						parser.scope.definitions.add("require");
-						return true;
-					});
-					parser.hooks.canRename
-						.for("require")
-						.tap("CommonJsPlugin", () => true);
-					parser.hooks.rename.for("require").tap("CommonJsPlugin", expr => {
-						// define the require variable. It's still undefined, but not "not defined".
-						const dep = new ConstDependency("var require;", 0);
-						dep.loc = expr.loc;
-						parser.state.current.addDependency(dep);
-						return false;
-					});
-					parser.hooks.typeof.for("module").tap("CommonJsPlugin", () => true);
-					parser.hooks.evaluateTypeof
-						.for("exports")
-						.tap("CommonJsPlugin", ParserHelpers.evaluateToString("object"));
-
-					new CommonJsRequireDependencyParserPlugin(options).apply(parser);
-					new RequireResolveDependencyParserPlugin(options).apply(parser);
-				};
-
-				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("CommonJsPlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("CommonJsPlugin", handler);
-			}
-		);
-	}
-}
-module.exports = CommonJsPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ConstDependency = require("./ConstDependency");
+const CommonJsRequireDependency = require("./CommonJsRequireDependency");
+const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
+const RequireResolveDependency = require("./RequireResolveDependency");
+const RequireResolveContextDependency = require("./RequireResolveContextDependency");
+const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency");
+const RequireHeaderDependency = require("./RequireHeaderDependency");
+
+const NullFactory = require("../NullFactory");
+
+const RequireResolveDependencyParserPlugin = require("./RequireResolveDependencyParserPlugin");
+const CommonJsRequireDependencyParserPlugin = require("./CommonJsRequireDependencyParserPlugin");
+
+const ParserHelpers = require("../ParserHelpers");
+
+class CommonJsPlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		compiler.hooks.compilation.tap(
+			"CommonJsPlugin",
+			(compilation, { contextModuleFactory, normalModuleFactory }) => {
+				compilation.dependencyFactories.set(
+					CommonJsRequireDependency,
+					normalModuleFactory
+				);
+				compilation.dependencyTemplates.set(
+					CommonJsRequireDependency,
+					new CommonJsRequireDependency.Template()
+				);
+
+				compilation.dependencyFactories.set(
+					CommonJsRequireContextDependency,
+					contextModuleFactory
+				);
+				compilation.dependencyTemplates.set(
+					CommonJsRequireContextDependency,
+					new CommonJsRequireContextDependency.Template()
+				);
+
+				compilation.dependencyFactories.set(
+					RequireResolveDependency,
+					normalModuleFactory
+				);
+				compilation.dependencyTemplates.set(
+					RequireResolveDependency,
+					new RequireResolveDependency.Template()
+				);
+
+				compilation.dependencyFactories.set(
+					RequireResolveContextDependency,
+					contextModuleFactory
+				);
+				compilation.dependencyTemplates.set(
+					RequireResolveContextDependency,
+					new RequireResolveContextDependency.Template()
+				);
+
+				compilation.dependencyFactories.set(
+					RequireResolveHeaderDependency,
+					new NullFactory()
+				);
+				compilation.dependencyTemplates.set(
+					RequireResolveHeaderDependency,
+					new RequireResolveHeaderDependency.Template()
+				);
+
+				compilation.dependencyFactories.set(
+					RequireHeaderDependency,
+					new NullFactory()
+				);
+				compilation.dependencyTemplates.set(
+					RequireHeaderDependency,
+					new RequireHeaderDependency.Template()
+				);
+
+				const handler = (parser, parserOptions) => {
+					if (
+						typeof parserOptions.commonjs !== "undefined" &&
+						!parserOptions.commonjs
+					)
+						return;
+
+					const requireExpressions = [
+						"require",
+						"require.resolve",
+						"require.resolveWeak"
+					];
+					for (let expression of requireExpressions) {
+						parser.hooks.typeof
+							.for(expression)
+							.tap(
+								"CommonJsPlugin",
+								ParserHelpers.toConstantDependency(
+									parser,
+									JSON.stringify("function")
+								)
+							);
+						parser.hooks.evaluateTypeof
+							.for(expression)
+							.tap(
+								"CommonJsPlugin",
+								ParserHelpers.evaluateToString("function")
+							);
+						parser.hooks.evaluateIdentifier
+							.for(expression)
+							.tap(
+								"CommonJsPlugin",
+								ParserHelpers.evaluateToIdentifier(expression, true)
+							);
+					}
+
+					parser.hooks.evaluateTypeof
+						.for("module")
+						.tap("CommonJsPlugin", ParserHelpers.evaluateToString("object"));
+					parser.hooks.assign.for("require").tap("CommonJsPlugin", expr => {
+						// to not leak to global "require", we need to define a local require here.
+						const dep = new ConstDependency("var require;", 0);
+						dep.loc = expr.loc;
+						parser.state.current.addDependency(dep);
+						parser.scope.definitions.add("require");
+						return true;
+					});
+					parser.hooks.canRename
+						.for("require")
+						.tap("CommonJsPlugin", () => true);
+					parser.hooks.rename.for("require").tap("CommonJsPlugin", expr => {
+						// define the require variable. It's still undefined, but not "not defined".
+						const dep = new ConstDependency("var require;", 0);
+						dep.loc = expr.loc;
+						parser.state.current.addDependency(dep);
+						return false;
+					});
+					parser.hooks.typeof.for("module").tap("CommonJsPlugin", () => true);
+					parser.hooks.evaluateTypeof
+						.for("exports")
+						.tap("CommonJsPlugin", ParserHelpers.evaluateToString("object"));
+
+					new CommonJsRequireDependencyParserPlugin(options).apply(parser);
+					new RequireResolveDependencyParserPlugin(options).apply(parser);
+				};
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("CommonJsPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("CommonJsPlugin", handler);
+			}
+		);
+	}
+}
+module.exports = CommonJsPlugin;