webpack 5.92.1 → 5.94.0

package/lib/DllReferencePlugin.js

@@ -15,6 +15,7 @@ const makePathsRelative = require("./util/identifier").makePathsRelative;
 
 /** @typedef {import("../declarations/WebpackOptions").Externals} Externals */
 /** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptions} DllReferencePluginOptions */
+/** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptionsContent} DllReferencePluginOptionsContent */
 /** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptionsManifest} DllReferencePluginOptionsManifest */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
@@ -28,6 +29,8 @@ const validate = createSchemaValidation(
 	}
 );
 
+/** @typedef {{ path: string, data: DllReferencePluginOptionsManifest | undefined, error: Error | undefined }} CompilationDataItem */
+
 class DllReferencePlugin {
 	/**
 	 * @param {DllReferencePluginOptions} options options object
@@ -35,7 +38,7 @@ class DllReferencePlugin {
 	constructor(options) {
 		validate(options);
 		this.options = options;
-		/** @type {WeakMap<object, {path: string, data: DllReferencePluginOptionsManifest?, error: Error?}>} */
+		/** @type {WeakMap<object, CompilationDataItem>} */
 		this._compilationData = new WeakMap();
 	}
 
@@ -64,6 +67,7 @@ class DllReferencePlugin {
 						/** @type {InputFileSystem} */
 						(compiler.inputFileSystem).readFile(manifest, (err, result) => {
 							if (err) return callback(err);
+							/** @type {CompilationDataItem} */
 							const data = {
 								path: manifest,
 								data: undefined,
@@ -75,15 +79,18 @@ class DllReferencePlugin {
 								data.data = parseJson(
 									/** @type {Buffer} */ (result).toString("utf-8")
 								);
-							} catch (e) {
+							} catch (parseErr) {
 								// Store the error in the params so that it can
 								// be added as a compilation error later on.
 								const manifestPath = makePathsRelative(
-									compiler.options.context,
+									/** @type {string} */ (compiler.options.context),
 									manifest,
 									compiler.root
 								);
-								data.error = new DllManifestError(manifestPath, e.message);
+								data.error = new DllManifestError(
+									manifestPath,
+									/** @type {Error} */ (parseErr).message
+								);
 							}
 							this._compilationData.set(params, data);
 							return callback();
@@ -98,13 +105,15 @@ class DllReferencePlugin {
 		compiler.hooks.compile.tap("DllReferencePlugin", params => {
 			let name = this.options.name;
 			let sourceType = this.options.sourceType;
-			let content =
+			let resolvedContent =
 				"content" in this.options ? this.options.content : undefined;
 			if ("manifest" in this.options) {
-				let manifestParameter = this.options.manifest;
+				const manifestParameter = this.options.manifest;
 				let manifest;
 				if (typeof manifestParameter === "string") {
-					const data = this._compilationData.get(params);
+					const data =
+						/** @type {CompilationDataItem} */
+						(this._compilationData.get(params));
 					// If there was an error parsing the manifest
 					// file, exit now because the error will be added
 					// as a compilation error in the "compilation" hook.
@@ -118,23 +127,27 @@ class DllReferencePlugin {
 				if (manifest) {
 					if (!name) name = manifest.name;
 					if (!sourceType) sourceType = manifest.type;
-					if (!content) content = manifest.content;
+					if (!resolvedContent) resolvedContent = manifest.content;
 				}
 			}
 			/** @type {Externals} */
 			const externals = {};
-			const source = "dll-reference " + name;
-			externals[source] = name;
+			const source = `dll-reference ${name}`;
+			externals[source] = /** @type {string} */ (name);
 			const normalModuleFactory = params.normalModuleFactory;
 			new ExternalModuleFactoryPlugin(sourceType || "var", externals).apply(
 				normalModuleFactory
 			);
 			new DelegatedModuleFactoryPlugin({
-				source: source,
+				source,
 				type: this.options.type,
 				scope: this.options.scope,
-				context: this.options.context || compiler.options.context,
-				content,
+				context:
+					/** @type {string} */
+					(this.options.context || compiler.options.context),
+				content:
+					/** @type {DllReferencePluginOptionsContent} */
+					(resolvedContent),
 				extensions: this.options.extensions,
 				associatedObjectForCache: compiler.root
 			}).apply(normalModuleFactory);
@@ -144,9 +157,11 @@ class DllReferencePlugin {
 			"DllReferencePlugin",
 			(compilation, params) => {
 				if ("manifest" in this.options) {
-					let manifest = this.options.manifest;
+					const manifest = this.options.manifest;
 					if (typeof manifest === "string") {
-						const data = this._compilationData.get(params);
+						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) {

package/lib/EntryPlugin.js

@@ -12,9 +12,7 @@ const EntryDependency = require("./dependencies/EntryDependency");
 
 class EntryPlugin {
 	/**
-	 * An entry plugin which will handle
-	 * creation of the EntryDependency
-	 *
+	 * An entry plugin which will handle creation of the EntryDependency
 	 * @param {string} context context path
 	 * @param {string} entry entry path
 	 * @param {EntryOptions | string=} options entry options (passing a string is deprecated)

package/lib/EnvironmentPlugin.js

@@ -12,15 +12,18 @@ const WebpackError = require("./WebpackError");
 /** @typedef {import("./DefinePlugin").CodeValue} CodeValue */
 
 class EnvironmentPlugin {
+	/**
+	 * @param {(string | string[] | Record<string, string>)[]} keys keys
+	 */
 	constructor(...keys) {
 		if (keys.length === 1 && Array.isArray(keys[0])) {
 			this.keys = keys[0];
 			this.defaultValues = {};
 		} else if (keys.length === 1 && keys[0] && typeof keys[0] === "object") {
 			this.keys = Object.keys(keys[0]);
-			this.defaultValues = keys[0];
+			this.defaultValues = /** @type {Record<string, string>} */ (keys[0]);
 		} else {
-			this.keys = keys;
+			this.keys = /** @type {string[]} */ (keys);
 			this.defaultValues = {};
 		}
 	}

package/lib/ErrorHelpers.js

@@ -48,9 +48,9 @@ const cutOffMultilineMessage = (stack, message) => {
 	/** @type {string[]} */
 	const result = [];
 
-	stackSplitByLines.forEach((line, idx) => {
+	for (const [idx, line] of stackSplitByLines.entries()) {
 		if (!line.includes(messageSplitByLines[idx])) result.push(line);
-	});
+	}
 
 	return result.join("\n");
 };
@@ -64,10 +64,9 @@ const cutOffMessage = (stack, message) => {
 	const nextLine = stack.indexOf("\n");
 	if (nextLine === -1) {
 		return stack === message ? "" : stack;
-	} else {
-		const firstLine = stack.slice(0, nextLine);
-		return firstLine === message ? stack.slice(nextLine + 1) : stack;
 	}
+	const firstLine = stack.slice(0, nextLine);
+	return firstLine === message ? stack.slice(nextLine + 1) : stack;
 };
 
 /**
@@ -92,10 +91,10 @@ const cleanUpWebpackOptions = (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;
+module.exports.cutOffByFlag = cutOffByFlag;
+module.exports.cutOffLoaderExecution = cutOffLoaderExecution;
+module.exports.cutOffWebpackOptions = cutOffWebpackOptions;
+module.exports.cutOffMultilineMessage = cutOffMultilineMessage;
+module.exports.cutOffMessage = cutOffMessage;
+module.exports.cleanUp = cleanUp;
+module.exports.cleanUpWebpackOptions = cleanUpWebpackOptions;

package/lib/EvalDevToolModulePlugin.js

@@ -39,7 +39,7 @@ class EvalDevToolModulePlugin {
 	/**
 	 * @param {EvalDevToolModulePluginOptions=} options options
 	 */
-	constructor(options) {
+	constructor(options = {}) {
 		this.namespace = options.namespace || "";
 		this.sourceUrlComment = options.sourceUrlComment || "\n//# sourceURL=[url]";
 		this.moduleFilenameTemplate =
@@ -77,17 +77,15 @@ class EvalDevToolModulePlugin {
 							hashFunction: compilation.outputOptions.hashFunction
 						}
 					);
-					const footer =
-						"\n" +
-						this.sourceUrlComment.replace(
-							/\[url\]/g,
-							encodeURI(str)
-								.replace(/%2F/g, "/")
-								.replace(/%20/g, "_")
-								.replace(/%5E/g, "^")
-								.replace(/%5C/g, "\\")
-								.replace(/^\//, "")
-						);
+					const footer = `\n${this.sourceUrlComment.replace(
+						/\[url\]/g,
+						encodeURI(str)
+							.replace(/%2F/g, "/")
+							.replace(/%20/g, "_")
+							.replace(/%5E/g, "^")
+							.replace(/%5C/g, "\\")
+							.replace(/^\//, "")
+					)}`;
 					const result = new RawSource(
 						`eval(${
 							compilation.outputOptions.trustedTypes

package/lib/EvalSourceMapDevToolPlugin.js

@@ -17,6 +17,7 @@ const { makePathsAbsolute } = require("./util/identifier");
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").DevTool} DevToolOptions */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
+/** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./NormalModule").SourceMap} SourceMap */
 
@@ -137,8 +138,8 @@ class EvalSourceMapDevToolPlugin {
 							const module = compilation.findModule(source);
 							return module || source;
 						});
-						let moduleFilenames = modules.map(module => {
-							return ModuleFilenameHelpers.createFilename(
+						let moduleFilenames = modules.map(module =>
+							ModuleFilenameHelpers.createFilename(
 								module,
 								{
 									moduleFilenameTemplate: this.moduleFilenameTemplate,
@@ -149,8 +150,8 @@ class EvalSourceMapDevToolPlugin {
 									chunkGraph,
 									hashFunction: compilation.outputOptions.hashFunction
 								}
-							);
-						});
+							)
+						);
 						moduleFilenames = ModuleFilenameHelpers.replaceDuplicates(
 							moduleFilenames,
 							(filename, i, n) => {
@@ -163,18 +164,19 @@ class EvalSourceMapDevToolPlugin {
 							sourceMap.sourcesContent = undefined;
 						}
 						sourceMap.sourceRoot = options.sourceRoot || "";
-						const moduleId = chunkGraph.getModuleId(m);
+						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
+						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(