webpack 5.99.6 → 5.99.8

package/lib/DllReferencePlugin.js

@@ -32,6 +32,8 @@ const validate = createSchemaValidation(
 
 /** @typedef {{ path: string, data: DllReferencePluginOptionsManifest | undefined, error: Error | undefined }} CompilationDataItem */
 
+const PLUGIN_NAME = "DllReferencePlugin";
+
 class DllReferencePlugin {
 	/**
 	 * @param {DllReferencePluginOptions} options options object
@@ -50,7 +52,7 @@ class DllReferencePlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"DllReferencePlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyFactories.set(
 					DelegatedSourceDependency,
@@ -59,51 +61,48 @@ class DllReferencePlugin {
 			}
 		);
 
-		compiler.hooks.beforeCompile.tapAsync(
-			"DllReferencePlugin",
-			(params, callback) => {
-				if ("manifest" in this.options) {
-					const manifest = this.options.manifest;
-					if (typeof manifest === "string") {
-						/** @type {InputFileSystem} */
-						(compiler.inputFileSystem).readFile(manifest, (err, result) => {
-							if (err) return callback(err);
-							/** @type {CompilationDataItem} */
-							const data = {
-								path: manifest,
-								data: undefined,
-								error: undefined
-							};
-							// Catch errors parsing the manifest so that blank
-							// or malformed manifest files don't kill the process.
-							try {
-								data.data = parseJson(
-									/** @type {Buffer} */ (result).toString("utf-8")
-								);
-							} catch (parseErr) {
-								// Store the error in the params so that it can
-								// be added as a compilation error later on.
-								const manifestPath = makePathsRelative(
-									/** @type {string} */ (compiler.options.context),
-									manifest,
-									compiler.root
-								);
-								data.error = new DllManifestError(
-									manifestPath,
-									/** @type {Error} */ (parseErr).message
-								);
-							}
-							this._compilationData.set(params, data);
-							return callback();
-						});
-						return;
-					}
+		compiler.hooks.beforeCompile.tapAsync(PLUGIN_NAME, (params, callback) => {
+			if ("manifest" in this.options) {
+				const manifest = this.options.manifest;
+				if (typeof manifest === "string") {
+					/** @type {InputFileSystem} */
+					(compiler.inputFileSystem).readFile(manifest, (err, result) => {
+						if (err) return callback(err);
+						/** @type {CompilationDataItem} */
+						const data = {
+							path: manifest,
+							data: undefined,
+							error: undefined
+						};
+						// Catch errors parsing the manifest so that blank
+						// or malformed manifest files don't kill the process.
+						try {
+							data.data = parseJson(
+								/** @type {Buffer} */ (result).toString("utf-8")
+							);
+						} catch (parseErr) {
+							// Store the error in the params so that it can
+							// be added as a compilation error later on.
+							const manifestPath = makePathsRelative(
+								/** @type {string} */ (compiler.options.context),
+								manifest,
+								compiler.root
+							);
+							data.error = new DllManifestError(
+								manifestPath,
+								/** @type {Error} */ (parseErr).message
+							);
+						}
+						this._compilationData.set(params, data);
+						return callback();
+					});
+					return;
 				}
-				return callback();
 			}
-		);
+			return callback();
+		});
 
-		compiler.hooks.compile.tap("DllReferencePlugin", params => {
+		compiler.hooks.compile.tap(PLUGIN_NAME, params => {
 			let name = this.options.name;
 			let sourceType = this.options.sourceType;
 			let resolvedContent =
@@ -154,27 +153,24 @@ class DllReferencePlugin {
 			}).apply(normalModuleFactory);
 		});
 
-		compiler.hooks.compilation.tap(
-			"DllReferencePlugin",
-			(compilation, params) => {
-				if ("manifest" in this.options) {
-					const manifest = this.options.manifest;
-					if (typeof manifest === "string") {
-						const data = /** @type {CompilationDataItem} */ (
-							this._compilationData.get(params)
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation, params) => {
+			if ("manifest" in this.options) {
+				const manifest = this.options.manifest;
+				if (typeof manifest === "string") {
+					const data = /** @type {CompilationDataItem} */ (
+						this._compilationData.get(params)
+					);
+					// If there was an error parsing the manifest file, add the
+					// error as a compilation error to make the compilation fail.
+					if (data.error) {
+						compilation.errors.push(
+							/** @type {DllManifestError} */ (data.error)
 						);
-						// If there was an error parsing the manifest file, add the
-						// error as a compilation error to make the compilation fail.
-						if (data.error) {
-							compilation.errors.push(
-								/** @type {DllManifestError} */ (data.error)
-							);
-						}
-						compilation.fileDependencies.add(manifest);
 					}
+					compilation.fileDependencies.add(manifest);
 				}
 			}
-		);
+		});
 	}
 }
 

package/lib/DynamicEntryPlugin.js

@@ -15,6 +15,8 @@ const EntryDependency = require("./dependencies/EntryDependency");
 /** @typedef {import("../declarations/WebpackOptions").EntryStaticNormalized} EntryStatic */
 /** @typedef {import("./Compiler")} Compiler */
 
+const PLUGIN_NAME = "DynamicEntryPlugin";
+
 class DynamicEntryPlugin {
 	/**
 	 * @param {string} context the context path
@@ -32,7 +34,7 @@ class DynamicEntryPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"DynamicEntryPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyFactories.set(
 					EntryDependency,
@@ -41,7 +43,7 @@ class DynamicEntryPlugin {
 			}
 		);
 
-		compiler.hooks.make.tapPromise("DynamicEntryPlugin", compilation =>
+		compiler.hooks.make.tapPromise(PLUGIN_NAME, compilation =>
 			Promise.resolve(this.entry())
 				.then(entry => {
 					const promises = [];

package/lib/EntryOptionPlugin.js

@@ -10,13 +10,15 @@
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Entrypoint").EntryOptions} EntryOptions */
 
+const PLUGIN_NAME = "EntryOptionPlugin";
+
 class EntryOptionPlugin {
 	/**
 	 * @param {Compiler} compiler the compiler instance one is tapping into
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.entryOption.tap("EntryOptionPlugin", (context, entry) => {
+		compiler.hooks.entryOption.tap(PLUGIN_NAME, (context, entry) => {
 			EntryOptionPlugin.applyEntryOption(compiler, context, entry);
 			return true;
 		});

package/lib/EntryPlugin.js

@@ -10,6 +10,8 @@ const EntryDependency = require("./dependencies/EntryDependency");
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Entrypoint").EntryOptions} EntryOptions */
 
+const PLUGIN_NAME = "EntryPlugin";
+
 class EntryPlugin {
 	/**
 	 * An entry plugin which will handle creation of the EntryDependency
@@ -30,7 +32,7 @@ class EntryPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"EntryPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyFactories.set(
 					EntryDependency,
@@ -42,7 +44,7 @@ class EntryPlugin {
 		const { entry, options, context } = this;
 		const dep = EntryPlugin.createDependency(entry, options);
 
-		compiler.hooks.make.tapAsync("EntryPlugin", (compilation, callback) => {
+		compiler.hooks.make.tapAsync(PLUGIN_NAME, (compilation, callback) => {
 			compilation.addEntry(context, dep, options, err => {
 				callback(err);
 			});

package/lib/EnvironmentPlugin.js

@@ -11,6 +11,8 @@ const WebpackError = require("./WebpackError");
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./DefinePlugin").CodeValue} CodeValue */
 
+const PLUGIN_NAME = "EnvironmentPlugin";
+
 class EnvironmentPlugin {
 	/**
 	 * @param {(string | string[] | Record<string, EXPECTED_ANY>)[]} keys keys
@@ -46,9 +48,9 @@ class EnvironmentPlugin {
 					: this.defaultValues[key];
 
 			if (value === undefined) {
-				compiler.hooks.thisCompilation.tap("EnvironmentPlugin", compilation => {
+				compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
 					const error = new WebpackError(
-						`EnvironmentPlugin - ${key} environment variable is undefined.\n\n` +
+						`${PLUGIN_NAME} - ${key} environment variable is undefined.\n\n` +
 							"You can pass an object with default values to suppress this warning.\n" +
 							"See https://webpack.js.org/plugins/environment-plugin for example."
 					);

package/lib/EvalDevToolModulePlugin.js

@@ -35,6 +35,8 @@ const devtoolWarning = new RawSource(`/*
  * @property {OutputOptions["devtoolModuleFilenameTemplate"]=} moduleFilenameTemplate module filename template
  */
 
+const PLUGIN_NAME = "EvalDevToolModulePlugin";
+
 class EvalDevToolModulePlugin {
 	/**
 	 * @param {EvalDevToolModulePluginOptions=} options options
@@ -53,10 +55,10 @@ class EvalDevToolModulePlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap("EvalDevToolModulePlugin", compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
 			const hooks = JavascriptModulesPlugin.getCompilationHooks(compilation);
 			hooks.renderModuleContent.tap(
-				"EvalDevToolModulePlugin",
+				PLUGIN_NAME,
 				(source, module, { chunk, runtimeTemplate, chunkGraph }) => {
 					const cacheEntry = cache.get(source);
 					if (cacheEntry !== undefined) return cacheEntry;
@@ -103,20 +105,20 @@ class EvalDevToolModulePlugin {
 				}
 			);
 			hooks.inlineInRuntimeBailout.tap(
-				"EvalDevToolModulePlugin",
+				PLUGIN_NAME,
 				() => "the eval devtool is used."
 			);
 			hooks.render.tap(
-				"EvalDevToolModulePlugin",
+				PLUGIN_NAME,
 				source => new ConcatSource(devtoolWarning, source)
 			);
-			hooks.chunkHash.tap("EvalDevToolModulePlugin", (chunk, hash) => {
-				hash.update("EvalDevToolModulePlugin");
+			hooks.chunkHash.tap(PLUGIN_NAME, (chunk, hash) => {
+				hash.update(PLUGIN_NAME);
 				hash.update("2");
 			});
 			if (compilation.outputOptions.trustedTypes) {
 				compilation.hooks.additionalModuleRuntimeRequirements.tap(
-					"EvalDevToolModulePlugin",
+					PLUGIN_NAME,
 					(module, set, context) => {
 						set.add(RuntimeGlobals.createScript);
 					}

package/lib/EvalSourceMapDevToolPlugin.js

@@ -35,9 +35,11 @@ const devtoolWarning = new RawSource(`/*
  */
 `);
 
+const PLUGIN_NAME = "EvalSourceMapDevToolPlugin";
+
 class EvalSourceMapDevToolPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions|string} inputOptions Options object
+	 * @param {SourceMapDevToolPluginOptions | string} inputOptions Options object
 	 */
 	constructor(inputOptions) {
 		/** @type {SourceMapDevToolPluginOptions} */
@@ -67,160 +69,157 @@ class EvalSourceMapDevToolPlugin {
 	 */
 	apply(compiler) {
 		const options = this.options;
-		compiler.hooks.compilation.tap(
-			"EvalSourceMapDevToolPlugin",
-			compilation => {
-				const hooks = JavascriptModulesPlugin.getCompilationHooks(compilation);
-				new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
-				const matchModule = ModuleFilenameHelpers.matchObject.bind(
-					ModuleFilenameHelpers,
-					options
-				);
-				hooks.renderModuleContent.tap(
-					"EvalSourceMapDevToolPlugin",
-					(source, m, { chunk, runtimeTemplate, chunkGraph }) => {
-						const cachedSource = cache.get(source);
-						if (cachedSource !== undefined) {
-							return cachedSource;
-						}
+		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+			const hooks = JavascriptModulesPlugin.getCompilationHooks(compilation);
+			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
+			const matchModule = ModuleFilenameHelpers.matchObject.bind(
+				ModuleFilenameHelpers,
+				options
+			);
+			hooks.renderModuleContent.tap(
+				PLUGIN_NAME,
+				(source, m, { chunk, runtimeTemplate, chunkGraph }) => {
+					const cachedSource = cache.get(source);
+					if (cachedSource !== undefined) {
+						return cachedSource;
+					}
 
-						/**
-						 * @param {Source} r result
-						 * @returns {Source} result
-						 */
-						const result = r => {
-							cache.set(source, r);
-							return r;
-						};
-
-						if (m instanceof NormalModule) {
-							const module = /** @type {NormalModule} */ (m);
+					/**
+					 * @param {Source} r result
+					 * @returns {Source} result
+					 */
+					const result = r => {
+						cache.set(source, r);
+						return r;
+					};
+
+					if (m instanceof NormalModule) {
+						const module = /** @type {NormalModule} */ (m);
+						if (!matchModule(module.resource)) {
+							return result(source);
+						}
+					} else if (m instanceof ConcatenatedModule) {
+						const concatModule = /** @type {ConcatenatedModule} */ (m);
+						if (concatModule.rootModule instanceof NormalModule) {
+							const module = /** @type {NormalModule} */ (
+								concatModule.rootModule
+							);
 							if (!matchModule(module.resource)) {
 								return result(source);
 							}
-						} else if (m instanceof ConcatenatedModule) {
-							const concatModule = /** @type {ConcatenatedModule} */ (m);
-							if (concatModule.rootModule instanceof NormalModule) {
-								const module = /** @type {NormalModule} */ (
-									concatModule.rootModule
-								);
-								if (!matchModule(module.resource)) {
-									return result(source);
-								}
-							} else {
-								return result(source);
-							}
 						} else {
 							return result(source);
 						}
+					} else {
+						return result(source);
+					}
 
-						const namespace = compilation.getPath(this.namespace, {
-							chunk
-						});
-						/** @type {SourceMap} */
-						let sourceMap;
-						let content;
-						if (source.sourceAndMap) {
-							const sourceAndMap = source.sourceAndMap(options);
-							sourceMap = /** @type {SourceMap} */ (sourceAndMap.map);
-							content = sourceAndMap.source;
-						} else {
-							sourceMap = /** @type {SourceMap} */ (source.map(options));
-							content = source.source();
-						}
-						if (!sourceMap) {
-							return result(source);
-						}
+					const namespace = compilation.getPath(this.namespace, {
+						chunk
+					});
+					/** @type {SourceMap} */
+					let sourceMap;
+					let content;
+					if (source.sourceAndMap) {
+						const sourceAndMap = source.sourceAndMap(options);
+						sourceMap = /** @type {SourceMap} */ (sourceAndMap.map);
+						content = sourceAndMap.source;
+					} else {
+						sourceMap = /** @type {SourceMap} */ (source.map(options));
+						content = source.source();
+					}
+					if (!sourceMap) {
+						return result(source);
+					}
 
-						// Clone (flat) the sourcemap to ensure that the mutations below do not persist.
-						sourceMap = { ...sourceMap };
-						const context = /** @type {string} */ (compiler.options.context);
-						const root = compiler.root;
-						const modules = sourceMap.sources.map(source => {
-							if (!source.startsWith("webpack://")) return source;
-							source = makePathsAbsolute(context, source.slice(10), root);
-							const module = compilation.findModule(source);
-							return module || source;
-						});
-						let moduleFilenames = modules.map(module =>
-							ModuleFilenameHelpers.createFilename(
-								module,
-								{
-									moduleFilenameTemplate: this.moduleFilenameTemplate,
-									namespace
-								},
-								{
-									requestShortener: runtimeTemplate.requestShortener,
-									chunkGraph,
-									hashFunction: compilation.outputOptions.hashFunction
-								}
-							)
-						);
-						moduleFilenames = ModuleFilenameHelpers.replaceDuplicates(
-							moduleFilenames,
-							(filename, i, n) => {
-								for (let j = 0; j < n; j++) filename += "*";
-								return filename;
+					// Clone (flat) the sourcemap to ensure that the mutations below do not persist.
+					sourceMap = { ...sourceMap };
+					const context = /** @type {string} */ (compiler.options.context);
+					const root = compiler.root;
+					const modules = sourceMap.sources.map(source => {
+						if (!source.startsWith("webpack://")) return source;
+						source = makePathsAbsolute(context, source.slice(10), root);
+						const module = compilation.findModule(source);
+						return module || source;
+					});
+					let moduleFilenames = modules.map(module =>
+						ModuleFilenameHelpers.createFilename(
+							module,
+							{
+								moduleFilenameTemplate: this.moduleFilenameTemplate,
+								namespace
+							},
+							{
+								requestShortener: runtimeTemplate.requestShortener,
+								chunkGraph,
+								hashFunction: compilation.outputOptions.hashFunction
 							}
-						);
-						sourceMap.sources = moduleFilenames;
-						if (options.noSources) {
-							sourceMap.sourcesContent = undefined;
-						}
-						sourceMap.sourceRoot = options.sourceRoot || "";
-						const moduleId =
-							/** @type {ModuleId} */
-							(chunkGraph.getModuleId(m));
-						sourceMap.file =
-							typeof moduleId === "number" ? `${moduleId}.js` : moduleId;
-
-						if (options.debugIds) {
-							sourceMap.debugId = generateDebugId(content, sourceMap.file);
+						)
+					);
+					moduleFilenames = ModuleFilenameHelpers.replaceDuplicates(
+						moduleFilenames,
+						(filename, i, n) => {
+							for (let j = 0; j < n; j++) filename += "*";
+							return filename;
 						}
+					);
+					sourceMap.sources = moduleFilenames;
+					if (options.noSources) {
+						sourceMap.sourcesContent = undefined;
+					}
+					sourceMap.sourceRoot = options.sourceRoot || "";
+					const moduleId =
+						/** @type {ModuleId} */
+						(chunkGraph.getModuleId(m));
+					sourceMap.file =
+						typeof moduleId === "number" ? `${moduleId}.js` : moduleId;
 
-						const footer = `${this.sourceMapComment.replace(
-							/\[url\]/g,
-							`data:application/json;charset=utf-8;base64,${Buffer.from(
-								JSON.stringify(sourceMap),
-								"utf8"
-							).toString("base64")}`
-						)}\n//# sourceURL=webpack-internal:///${moduleId}\n`; // workaround for chrome bug
-
-						return result(
-							new RawSource(
-								`eval(${
-									compilation.outputOptions.trustedTypes
-										? `${RuntimeGlobals.createScript}(${JSON.stringify(
-												content + footer
-											)})`
-										: JSON.stringify(content + footer)
-								});`
-							)
-						);
+					if (options.debugIds) {
+						sourceMap.debugId = generateDebugId(content, sourceMap.file);
 					}
-				);
-				hooks.inlineInRuntimeBailout.tap(
-					"EvalDevToolModulePlugin",
-					() => "the eval-source-map devtool is used."
-				);
-				hooks.render.tap(
-					"EvalSourceMapDevToolPlugin",
-					source => new ConcatSource(devtoolWarning, source)
-				);
-				hooks.chunkHash.tap("EvalSourceMapDevToolPlugin", (chunk, hash) => {
-					hash.update("EvalSourceMapDevToolPlugin");
-					hash.update("2");
-				});
-				if (compilation.outputOptions.trustedTypes) {
-					compilation.hooks.additionalModuleRuntimeRequirements.tap(
-						"EvalSourceMapDevToolPlugin",
-						(module, set, context) => {
-							set.add(RuntimeGlobals.createScript);
-						}
+
+					const footer = `${this.sourceMapComment.replace(
+						/\[url\]/g,
+						`data:application/json;charset=utf-8;base64,${Buffer.from(
+							JSON.stringify(sourceMap),
+							"utf8"
+						).toString("base64")}`
+					)}\n//# sourceURL=webpack-internal:///${moduleId}\n`; // workaround for chrome bug
+
+					return result(
+						new RawSource(
+							`eval(${
+								compilation.outputOptions.trustedTypes
+									? `${RuntimeGlobals.createScript}(${JSON.stringify(
+											content + footer
+										)})`
+									: JSON.stringify(content + footer)
+							});`
+						)
 					);
 				}
+			);
+			hooks.inlineInRuntimeBailout.tap(
+				"EvalDevToolModulePlugin",
+				() => "the eval-source-map devtool is used."
+			);
+			hooks.render.tap(
+				PLUGIN_NAME,
+				source => new ConcatSource(devtoolWarning, source)
+			);
+			hooks.chunkHash.tap(PLUGIN_NAME, (chunk, hash) => {
+				hash.update(PLUGIN_NAME);
+				hash.update("2");
+			});
+			if (compilation.outputOptions.trustedTypes) {
+				compilation.hooks.additionalModuleRuntimeRequirements.tap(
+					PLUGIN_NAME,
+					(module, set, context) => {
+						set.add(RuntimeGlobals.createScript);
+					}
+				);
 			}
-		);
+		});
 	}
 }