webpack 5.77.0 → 5.78.0

package/lib/DelegatedModule.js

@@ -7,6 +7,7 @@
 
 const { OriginalSource, RawSource } = require("webpack-sources");
 const Module = require("./Module");
+const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
 const StaticExportsDependency = require("./dependencies/StaticExportsDependency");
@@ -40,7 +41,7 @@ const RUNTIME_REQUIREMENTS = new Set([
 
 class DelegatedModule extends Module {
 	constructor(sourceRequest, data, type, userRequest, originalRequest) {
-		super("javascript/dynamic", null);
+		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, null);
 
 		// Info from Factory
 		this.sourceRequest = sourceRequest;

package/lib/DllModule.js

@@ -7,6 +7,7 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("./Module");
+const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const makeSerializable = require("./util/makeSerializable");
 
@@ -35,7 +36,7 @@ const RUNTIME_REQUIREMENTS = new Set([
 
 class DllModule extends Module {
 	constructor(context, dependencies, name) {
-		super("javascript/dynamic", context);
+		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, context);
 
 		// Info from Factory
 		this.dependencies = dependencies;

package/lib/ErrorHelpers.js

@@ -9,36 +9,57 @@ const loaderFlag = "LOADER_EXECUTION";
 
 const webpackOptionsFlag = "WEBPACK_OPTIONS";
 
-exports.cutOffByFlag = (stack, flag) => {
-	stack = stack.split("\n");
-	for (let i = 0; i < stack.length; i++) {
-		if (stack[i].includes(flag)) {
-			stack.length = i;
+/**
+ * @param {string} stack stack trace
+ * @param {string} flag flag to cut off
+ * @returns {string} stack trace without the specified flag included
+ */
+const cutOffByFlag = (stack, flag) => {
+	const errorStack = stack.split("\n");
+	for (let i = 0; i < errorStack.length; i++) {
+		if (errorStack[i].includes(flag)) {
+			errorStack.length = i;
 		}
 	}
-	return stack.join("\n");
+	return errorStack.join("\n");
 };
 
-exports.cutOffLoaderExecution = stack =>
-	exports.cutOffByFlag(stack, loaderFlag);
+/**
+ * @param {string} stack stack trace
+ * @returns {string} stack trace without the loader execution flag included
+ */
+const cutOffLoaderExecution = stack => cutOffByFlag(stack, loaderFlag);
 
-exports.cutOffWebpackOptions = stack =>
-	exports.cutOffByFlag(stack, webpackOptionsFlag);
+/**
+ * @param {string} stack stack trace
+ * @returns {string} stack trace without the webpack options flag included
+ */
+const cutOffWebpackOptions = stack => cutOffByFlag(stack, webpackOptionsFlag);
 
-exports.cutOffMultilineMessage = (stack, message) => {
-	stack = stack.split("\n");
-	message = message.split("\n");
+/**
+ * @param {string} stack stack trace
+ * @param {string} message error message
+ * @returns {string} stack trace without the message included
+ */
+const cutOffMultilineMessage = (stack, message) => {
+	const stackSplitByLines = stack.split("\n");
+	const messageSplitByLines = message.split("\n");
 
 	const result = [];
 
-	stack.forEach((line, idx) => {
-		if (!line.includes(message[idx])) result.push(line);
+	stackSplitByLines.forEach((line, idx) => {
+		if (!line.includes(messageSplitByLines[idx])) result.push(line);
 	});
 
 	return result.join("\n");
 };
 
-exports.cutOffMessage = (stack, message) => {
+/**
+ * @param {string} stack stack trace
+ * @param {string} message error message
+ * @returns {string} stack trace without the message included
+ */
+const cutOffMessage = (stack, message) => {
 	const nextLine = stack.indexOf("\n");
 	if (nextLine === -1) {
 		return stack === message ? "" : stack;
@@ -48,14 +69,32 @@ exports.cutOffMessage = (stack, message) => {
 	}
 };
 
-exports.cleanUp = (stack, message) => {
-	stack = exports.cutOffLoaderExecution(stack);
-	stack = exports.cutOffMessage(stack, message);
+/**
+ * @param {string} stack stack trace
+ * @param {string} message error message
+ * @returns {string} stack trace without the loader execution flag and message included
+ */
+const cleanUp = (stack, message) => {
+	stack = cutOffLoaderExecution(stack);
+	stack = cutOffMessage(stack, message);
 	return stack;
 };
 
-exports.cleanUpWebpackOptions = (stack, message) => {
-	stack = exports.cutOffWebpackOptions(stack);
-	stack = exports.cutOffMultilineMessage(stack, message);
+/**
+ * @param {string} stack stack trace
+ * @param {string} message error message
+ * @returns {string} stack trace without the webpack options flag and message included
+ */
+const cleanUpWebpackOptions = (stack, message) => {
+	stack = cutOffWebpackOptions(stack);
+	stack = cutOffMultilineMessage(stack, message);
 	return stack;
 };
+
+exports.cutOffByFlag = cutOffByFlag;
+exports.cutOffLoaderExecution = cutOffLoaderExecution;
+exports.cutOffWebpackOptions = cutOffWebpackOptions;
+exports.cutOffMultilineMessage = cutOffMultilineMessage;
+exports.cutOffMessage = cutOffMessage;
+exports.cleanUp = cleanUp;
+exports.cleanUpWebpackOptions = cleanUpWebpackOptions;

package/lib/ExportsInfoApiPlugin.js

@@ -5,12 +5,19 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("./ModuleTypeConstants");
 const ConstDependency = require("./dependencies/ConstDependency");
 const ExportsInfoDependency = require("./dependencies/ExportsInfoDependency");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 
+const PLUGIN_NAME = "ExportsInfoApiPlugin";
+
 class ExportsInfoApiPlugin {
 	/**
 	 * Apply the plugin
@@ -19,7 +26,7 @@ class ExportsInfoApiPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"ExportsInfoApiPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ExportsInfoDependency,
@@ -32,7 +39,7 @@ class ExportsInfoApiPlugin {
 				const handler = parser => {
 					parser.hooks.expressionMemberChain
 						.for("__webpack_exports_info__")
-						.tap("ExportsInfoApiPlugin", (expr, members) => {
+						.tap(PLUGIN_NAME, (expr, members) => {
 							const dep =
 								members.length >= 2
 									? new ExportsInfoDependency(
@@ -47,7 +54,7 @@ class ExportsInfoApiPlugin {
 						});
 					parser.hooks.expression
 						.for("__webpack_exports_info__")
-						.tap("ExportsInfoApiPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							const dep = new ConstDependency("true", expr.range);
 							dep.loc = expr.loc;
 							parser.state.module.addPresentationalDependency(dep);
@@ -55,14 +62,14 @@ class ExportsInfoApiPlugin {
 						});
 				};
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("ExportsInfoApiPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("ExportsInfoApiPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("ExportsInfoApiPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/ExternalModule.js

@@ -10,6 +10,7 @@ const ConcatenationScope = require("./ConcatenationScope");
 const { UsageState } = require("./ExportsInfo");
 const InitFragment = require("./InitFragment");
 const Module = require("./Module");
+const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const Template = require("./Template");
 const StaticExportsDependency = require("./dependencies/StaticExportsDependency");
@@ -378,7 +379,7 @@ const getSourceForDefaultCase = (optional, request, runtimeTemplate) => {
 
 class ExternalModule extends Module {
 	constructor(request, type, userRequest) {
-		super("javascript/dynamic", null);
+		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, null);
 
 		// Info from Factory
 		/** @type {string | string[] | Record<string, string | string[]>} */

package/lib/FlagAllModulesAsUsedPlugin.js

@@ -10,6 +10,7 @@ const { getEntryRuntime, mergeRuntimeOwned } = require("./util/runtime");
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
+const PLUGIN_NAME = "FlagAllModulesAsUsedPlugin";
 class FlagAllModulesAsUsedPlugin {
 	constructor(explanation) {
 		this.explanation = explanation;
@@ -21,34 +22,28 @@ class FlagAllModulesAsUsedPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"FlagAllModulesAsUsedPlugin",
-			compilation => {
-				const moduleGraph = compilation.moduleGraph;
-				compilation.hooks.optimizeDependencies.tap(
-					"FlagAllModulesAsUsedPlugin",
-					modules => {
-						/** @type {RuntimeSpec} */
-						let runtime = undefined;
-						for (const [name, { options }] of compilation.entries) {
-							runtime = mergeRuntimeOwned(
-								runtime,
-								getEntryRuntime(compilation, name, options)
-							);
-						}
-						for (const module of modules) {
-							const exportsInfo = moduleGraph.getExportsInfo(module);
-							exportsInfo.setUsedInUnknownWay(runtime);
-							moduleGraph.addExtraReason(module, this.explanation);
-							if (module.factoryMeta === undefined) {
-								module.factoryMeta = {};
-							}
-							module.factoryMeta.sideEffectFree = false;
-						}
+		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+			const moduleGraph = compilation.moduleGraph;
+			compilation.hooks.optimizeDependencies.tap(PLUGIN_NAME, modules => {
+				/** @type {RuntimeSpec} */
+				let runtime = undefined;
+				for (const [name, { options }] of compilation.entries) {
+					runtime = mergeRuntimeOwned(
+						runtime,
+						getEntryRuntime(compilation, name, options)
+					);
+				}
+				for (const module of modules) {
+					const exportsInfo = moduleGraph.getExportsInfo(module);
+					exportsInfo.setUsedInUnknownWay(runtime);
+					moduleGraph.addExtraReason(module, this.explanation);
+					if (module.factoryMeta === undefined) {
+						module.factoryMeta = {};
 					}
-				);
-			}
-		);
+					module.factoryMeta.sideEffectFree = false;
+				}
+			});
+		});
 	}
 }