webpack 5.97.1 → 5.104.1

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -10,11 +10,13 @@ const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("./Compilation")} Compilation */
 
+const PLUGIN_NAME = "SourceMapDevToolModuleOptionsPlugin";
+
 class SourceMapDevToolModuleOptionsPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions} options options
+	 * @param {SourceMapDevToolPluginOptions=} options options
 	 */
-	constructor(options) {
+	constructor(options = {}) {
 		this.options = options;
 	}
 
@@ -25,34 +27,22 @@ class SourceMapDevToolModuleOptionsPlugin {
 	apply(compilation) {
 		const options = this.options;
 		if (options.module !== false) {
-			compilation.hooks.buildModule.tap(
-				"SourceMapDevToolModuleOptionsPlugin",
-				module => {
-					module.useSourceMap = true;
-				}
-			);
-			compilation.hooks.runtimeModule.tap(
-				"SourceMapDevToolModuleOptionsPlugin",
-				module => {
-					module.useSourceMap = true;
-				}
-			);
+			compilation.hooks.buildModule.tap(PLUGIN_NAME, (module) => {
+				module.useSourceMap = true;
+			});
+			compilation.hooks.runtimeModule.tap(PLUGIN_NAME, (module) => {
+				module.useSourceMap = true;
+			});
 		} else {
-			compilation.hooks.buildModule.tap(
-				"SourceMapDevToolModuleOptionsPlugin",
-				module => {
-					module.useSimpleSourceMap = true;
-				}
-			);
-			compilation.hooks.runtimeModule.tap(
-				"SourceMapDevToolModuleOptionsPlugin",
-				module => {
-					module.useSimpleSourceMap = true;
-				}
-			);
+			compilation.hooks.buildModule.tap(PLUGIN_NAME, (module) => {
+				module.useSimpleSourceMap = true;
+			});
+			compilation.hooks.runtimeModule.tap(PLUGIN_NAME, (module) => {
+				module.useSimpleSourceMap = true;
+			});
 		}
 		JavascriptModulesPlugin.getCompilationHooks(compilation).useSourceMap.tap(
-			"SourceMapDevToolModuleOptionsPlugin",
+			PLUGIN_NAME,
 			() => true
 		);
 	}

package/lib/SourceMapDevToolPlugin.js

@@ -13,28 +13,26 @@ const ProgressPlugin = require("./ProgressPlugin");
 const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
 const createSchemaValidation = require("./util/create-schema-validation");
 const createHash = require("./util/createHash");
-const { relative, dirname } = require("./util/fs");
+const { dirname, relative } = require("./util/fs");
 const generateDebugId = require("./util/generateDebugId");
 const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
-/** @typedef {import("./Cache").Etag} Etag */
+/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").Rules} Rules */
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Compilation").Asset} Asset */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module")} Module */
-/** @typedef {import("./NormalModule").SourceMap} SourceMap */
+/** @typedef {import("./NormalModule").RawSourceMap} RawSourceMap */
 /** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
-/** @typedef {import("./util/Hash")} Hash */
-/** @typedef {import("./util/createHash").Algorithm} Algorithm */
 /** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
 
 const validate = createSchemaValidation(
-	require("../schemas/plugins/SourceMapDevToolPlugin.check.js"),
+	require("../schemas/plugins/SourceMapDevToolPlugin.check"),
 	() => require("../schemas/plugins/SourceMapDevToolPlugin.json"),
 	{
 		name: "SourceMap DevTool Plugin",
@@ -48,7 +46,7 @@ const validate = createSchemaValidation(
  * @property {(string | Module)[]} modules
  * @property {string} source
  * @property {string} file
- * @property {SourceMap} sourceMap
+ * @property {RawSourceMap} sourceMap
  * @property {ItemCacheFacade} cacheItem cache item
  */
 
@@ -66,7 +64,7 @@ const URL_FORMATTING_REGEXP = /^\n\/\/(.*)$/;
  * @param {RegExp} regexp Stateful Regular Expression to be reset
  * @returns {void}
  */
-const resetRegexpState = regexp => {
+const resetRegexpState = (regexp) => {
 	regexp.lastIndex = -1;
 };
 
@@ -75,7 +73,7 @@ const resetRegexpState = regexp => {
  * @param {string} str String to quote
  * @returns {string} Escaped string
  */
-const quoteMeta = str => str.replace(METACHARACTERS_REGEXP, "\\$&");
+const quoteMeta = (str) => str.replace(METACHARACTERS_REGEXP, "\\$&");
 
 /**
  * Creating {@link SourceMapTask} for given file
@@ -96,24 +94,24 @@ const getTaskForFile = (
 	cacheItem
 ) => {
 	let source;
-	/** @type {SourceMap} */
+	/** @type {RawSourceMap} */
 	let sourceMap;
 	/**
 	 * Check if asset can build source map
 	 */
 	if (asset.sourceAndMap) {
 		const sourceAndMap = asset.sourceAndMap(options);
-		sourceMap = /** @type {SourceMap} */ (sourceAndMap.map);
+		sourceMap = /** @type {RawSourceMap} */ (sourceAndMap.map);
 		source = sourceAndMap.source;
 	} else {
-		sourceMap = /** @type {SourceMap} */ (asset.map(options));
+		sourceMap = /** @type {RawSourceMap} */ (asset.map(options));
 		source = asset.source();
 	}
 	if (!sourceMap || typeof source !== "string") return;
-	const context = /** @type {string} */ (compilation.options.context);
+	const context = compilation.options.context;
 	const root = compilation.compiler.root;
 	const cachedAbsolutify = makePathsAbsolute.bindContextCache(context, root);
-	const modules = sourceMap.sources.map(source => {
+	const modules = sourceMap.sources.map((source) => {
 		if (!source.startsWith("webpack://")) return source;
 		source = cachedAbsolutify(source.slice(10));
 		const module = compilation.findModule(source);
@@ -131,9 +129,11 @@ const getTaskForFile = (
 	};
 };
 
+const PLUGIN_NAME = "SourceMapDevToolPlugin";
+
 class SourceMapDevToolPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions} [options] options object
+	 * @param {SourceMapDevToolPluginOptions=} options options object
 	 * @throws {Error} throws error, if got more than 1 arguments
 	 */
 	constructor(options = {}) {
@@ -146,16 +146,12 @@ class SourceMapDevToolPlugin {
 				? false
 				: // eslint-disable-next-line no-useless-concat
 					options.append || "\n//# source" + "MappingURL=[url]";
-		/** @type {string | Function} */
 		this.moduleFilenameTemplate =
 			options.moduleFilenameTemplate || "webpack://[namespace]/[resourcePath]";
-		/** @type {string | Function} */
 		this.fallbackModuleFilenameTemplate =
 			options.fallbackModuleFilenameTemplate ||
 			"webpack://[namespace]/[resourcePath]?[hash]";
-		/** @type {string} */
 		this.namespace = options.namespace || "";
-		/** @type {SourceMapDevToolPluginOptions} */
 		this.options = options;
 	}
 
@@ -165,9 +161,9 @@ class SourceMapDevToolPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const outputFs = /** @type {OutputFileSystem} */ (
-			compiler.outputFileSystem
-		);
+		const outputFs =
+			/** @type {OutputFileSystem} */
+			(compiler.outputFileSystem);
 		const sourceMapFilename = this.sourceMapFilename;
 		const sourceMappingURLComment = this.sourceMappingURLComment;
 		const moduleFilenameTemplate = this.moduleFilenameTemplate;
@@ -182,24 +178,20 @@ class SourceMapDevToolPlugin {
 			options
 		);
 
-		compiler.hooks.compilation.tap("SourceMapDevToolPlugin", compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
 
 			compilation.hooks.processAssets.tapAsync(
 				{
-					name: "SourceMapDevToolPlugin",
+					name: PLUGIN_NAME,
 					stage: Compilation.PROCESS_ASSETS_STAGE_DEV_TOOLING,
 					additionalAssets: true
 				},
 				(assets, callback) => {
 					const chunkGraph = compilation.chunkGraph;
-					const cache = compilation.getCache("SourceMapDevToolPlugin");
+					const cache = compilation.getCache(PLUGIN_NAME);
 					/** @type {Map<string | Module, string>} */
 					const moduleToSourceNameMapping = new Map();
-					/**
-					 * @type {Function}
-					 * @returns {void}
-					 */
 					const reportProgress =
 						ProgressPlugin.getReporter(compilation.compiler) || (() => {});
 
@@ -277,8 +269,9 @@ class SourceMapDevToolPlugin {
 										/**
 										 * Add file to chunk, if not presented there
 										 */
-										if (cachedFile !== file && chunk !== undefined)
+										if (cachedFile !== file && chunk !== undefined) {
 											chunk.auxiliaryFiles.add(cachedFile);
+										}
 									}
 
 									reportProgress(
@@ -354,7 +347,7 @@ class SourceMapDevToolPlugin {
 								callback();
 							});
 						},
-						err => {
+						(err) => {
 							if (err) {
 								return callback(err);
 							}
@@ -367,15 +360,15 @@ class SourceMapDevToolPlugin {
 
 							/**
 							 * all modules in defined order (longest identifier first)
-							 * @type {Array<string | Module>}
+							 * @type {(string | Module)[]}
 							 */
-							const allModules = Array.from(
-								moduleToSourceNameMapping.keys()
-							).sort((a, b) => {
-								const ai = typeof a === "string" ? a : a.identifier();
-								const bi = typeof b === "string" ? b : b.identifier();
-								return ai.length - bi.length;
-							});
+							const allModules = [...moduleToSourceNameMapping.keys()].sort(
+								(a, b) => {
+									const ai = typeof a === "string" ? a : a.identifier();
+									const bi = typeof b === "string" ? b : b.identifier();
+									return ai.length - bi.length;
+								}
+							);
 
 							// find modules with conflicting source names
 							for (let idx = 0; idx < allModules.length; idx++) {
@@ -437,10 +430,29 @@ class SourceMapDevToolPlugin {
 										"attach SourceMap"
 									);
 
-									const moduleFilenames = modules.map(m =>
+									const moduleFilenames = modules.map((m) =>
 										moduleToSourceNameMapping.get(m)
 									);
 									sourceMap.sources = /** @type {string[]} */ (moduleFilenames);
+									sourceMap.ignoreList = options.ignoreList
+										? sourceMap.sources.reduce(
+												/** @type {(acc: number[], sourceName: string, idx: number) => number[]} */ (
+													(acc, sourceName, idx) => {
+														const rule = /** @type {Rules} */ (
+															options.ignoreList
+														);
+														if (
+															ModuleFilenameHelpers.matchPart(sourceName, rule)
+														) {
+															acc.push(idx);
+														}
+														return acc;
+													}
+												),
+												[]
+											)
+										: [];
+
 									if (options.noSources) {
 										sourceMap.sourcesContent = undefined;
 									}
@@ -460,7 +472,7 @@ class SourceMapDevToolPlugin {
 											: quoteMeta(contenthash);
 										sourceMap.file = sourceMap.file.replace(
 											new RegExp(pattern, "g"),
-											m => "x".repeat(m.length)
+											(m) => "x".repeat(m.length)
 										);
 									}
 
@@ -484,23 +496,23 @@ class SourceMapDevToolPlugin {
 									if (options.debugIds) {
 										const debugId = generateDebugId(source, sourceMap.file);
 										sourceMap.debugId = debugId;
-										currentSourceMappingURLComment = `\n//# debugId=${debugId}${currentSourceMappingURLComment}`;
+
+										const debugIdComment = `\n//# debugId=${debugId}`;
+										currentSourceMappingURLComment =
+											currentSourceMappingURLComment
+												? `${debugIdComment}${currentSourceMappingURLComment}`
+												: debugIdComment;
 									}
 
 									const sourceMapString = JSON.stringify(sourceMap);
 									if (sourceMapFilename) {
 										const filename = file;
-										const sourceMapContentHash =
-											/** @type {string} */
-											(
-												usesContentHash &&
-													createHash(
-														/** @type {Algorithm} */
-														(compilation.outputOptions.hashFunction)
-													)
-														.update(sourceMapString)
-														.digest("hex")
-											);
+										const sourceMapContentHash = usesContentHash
+											? createHash(compilation.outputOptions.hashFunction)
+													.update(sourceMapString)
+													.digest("hex")
+											: undefined;
+
 										const pathParams = {
 											chunk,
 											filename: options.fileContext
@@ -555,17 +567,18 @@ class SourceMapDevToolPlugin {
 											sourceMapAsset,
 											sourceMapAssetInfo
 										);
-										if (chunk !== undefined)
+										if (chunk !== undefined) {
 											chunk.auxiliaryFiles.add(sourceMapFile);
+										}
 									} else {
 										if (currentSourceMappingURLComment === false) {
 											throw new Error(
-												"SourceMapDevToolPlugin: append can't be false when no filename is provided"
+												`${PLUGIN_NAME}: append can't be false when no filename is provided`
 											);
 										}
 										if (typeof currentSourceMappingURLComment === "function") {
 											throw new Error(
-												"SourceMapDevToolPlugin: append can't be a function when no filename is provided"
+												`${PLUGIN_NAME}: append can't be a function when no filename is provided`
 											);
 										}
 										/**
@@ -580,7 +593,7 @@ class SourceMapDevToolPlugin {
 													() =>
 														`data:application/json;charset=utf-8;base64,${Buffer.from(
 															sourceMapString,
-															"utf-8"
+															"utf8"
 														).toString("base64")}`
 												)
 										);
@@ -589,7 +602,7 @@ class SourceMapDevToolPlugin {
 										compilation.updateAsset(file, asset);
 									}
 
-									task.cacheItem.store({ assets, assetsInfo }, err => {
+									task.cacheItem.store({ assets, assetsInfo }, (err) => {
 										reportProgress(
 											0.5 + (0.5 * ++taskIndex) / tasks.length,
 											task.file,
@@ -602,7 +615,7 @@ class SourceMapDevToolPlugin {
 										callback();
 									});
 								},
-								err => {
+								(err) => {
 									reportProgress(1);
 									callback(err);
 								}

package/lib/Stats.js

@@ -7,7 +7,6 @@
 
 /** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
 /** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./Compilation").NormalizedStatsOptions} NormalizedStatsOptions */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 class Stats {
@@ -36,7 +35,7 @@ class Stats {
 	hasWarnings() {
 		return (
 			this.compilation.getWarnings().length > 0 ||
-			this.compilation.children.some(child => child.getStats().hasWarnings())
+			this.compilation.children.some((child) => child.getStats().hasWarnings())
 		);
 	}
 
@@ -46,7 +45,7 @@ class Stats {
 	hasErrors() {
 		return (
 			this.compilation.errors.length > 0 ||
-			this.compilation.children.some(child => child.getStats().hasErrors())
+			this.compilation.children.some((child) => child.getStats().hasErrors())
 		);
 	}
 

package/lib/Template.js

@@ -10,7 +10,7 @@ const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */
+/** @typedef {import("./config/defaults").OutputNormalizedWithDefaults} OutputOptions */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
@@ -49,7 +49,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  * @property {string} fullHash
  * @property {OutputOptions} outputOptions
  * @property {CodeGenerationResults} codeGenerationResults
- * @property {{javascript: ModuleTemplate}} moduleTemplates
+ * @property {{ javascript: ModuleTemplate }} moduleTemplates
  * @property {DependencyTemplates} dependencyTemplates
  * @property {RuntimeTemplate} runtimeTemplate
  * @property {ModuleGraph} moduleGraph
@@ -60,7 +60,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 /**
  * @typedef {object} RenderManifestEntryTemplated
- * @property {function(): Source} render
+ * @property {() => Source} render
  * @property {TemplatePath} filenameTemplate
  * @property {PathData=} pathOptions
  * @property {AssetInfo=} info
@@ -71,7 +71,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 /**
  * @typedef {object} RenderManifestEntryStatic
- * @property {function(): Source} render
+ * @property {() => Source} render
  * @property {string} filename
  * @property {AssetInfo} info
  * @property {string} identifier
@@ -80,17 +80,13 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  */
 
 /**
- * @typedef {object} HasId
- * @property {number | string} id
- */
-
-/**
- * @typedef {function(Module, number): boolean} ModuleFilterPredicate
+ * @typedef {(module: Module) => boolean} ModuleFilterPredicate
  */
 
 class Template {
 	/**
-	 * @param {Function} fn a runtime function (.runtime.js) "template"
+	 * @template {EXPECTED_FUNCTION} T
+	 * @param {T} fn a runtime function (.runtime.js) "template"
 	 * @returns {string} the updated and normalized function string
 	 */
 	static getFunctionContent(fn) {
@@ -225,7 +221,7 @@ class Template {
 	}
 
 	/**
-	 * @param {string|string[]} s string to create prefix for
+	 * @param {string | string[]} s string to create prefix for
 	 * @param {string} prefix prefix to compose
 	 * @returns {string} returns new prefix string
 	 */
@@ -237,7 +233,7 @@ class Template {
 	}
 
 	/**
-	 * @param {string|string[]} str string or string collection
+	 * @param {string | string[]} str string or string collection
 	 * @returns {string} returns a single string from array
 	 */
 	static asString(str) {
@@ -249,7 +245,7 @@ class Template {
 
 	/**
 	 * @typedef {object} WithId
-	 * @property {string|number} id
+	 * @property {string | number} id
 	 */
 
 	/**
@@ -284,7 +280,7 @@ class Template {
 	/**
 	 * @param {ChunkRenderContext} renderContext render context
 	 * @param {Module[]} modules modules to render (should be ordered by identifier)
-	 * @param {function(Module): Source | null} renderModule function to render a module
+	 * @param {(module: Module, renderInArray?: boolean) => Source | null} renderModule function to render a module
 	 * @param {string=} prefix applying prefix strings
 	 * @returns {Source | null} rendered chunk modules in a Source object or null if no modules
 	 */
@@ -294,12 +290,20 @@ class Template {
 		if (modules.length === 0) {
 			return null;
 		}
-		/** @type {{id: string|number, source: Source|string}[]} */
-		const allModules = modules.map(module => ({
-			id: /** @type {ModuleId} */ (chunkGraph.getModuleId(module)),
-			source: renderModule(module) || "false"
+		/** @type {{ id: ModuleId, module: Module }[]} */
+		const modulesWithId = modules.map((m) => ({
+			id: /** @type {ModuleId} */ (chunkGraph.getModuleId(m)),
+			module: m
 		}));
-		const bounds = Template.getModulesArrayBounds(allModules);
+		const bounds = Template.getModulesArrayBounds(modulesWithId);
+		const renderInObject = bounds === false;
+
+		/** @type {{ id: ModuleId, source: Source | "false" }[]} */
+		const allModules = modulesWithId.map(({ id, module }) => ({
+			id,
+			source: renderModule(module, renderInObject) || "false"
+		}));
+
 		if (bounds) {
 			// Render a spare array
 			const minId = bounds[0];
@@ -308,7 +312,7 @@ class Template {
 				source.add(`Array(${minId}).concat(`);
 			}
 			source.add("[\n");
-			/** @type {Map<string|number, {id: string|number, source: Source|string}>} */
+			/** @type {Map<ModuleId, { id: ModuleId, source: Source | "false" }>} */
 			const modules = new Map();
 			for (const module of allModules) {
 				modules.set(module.id, module);
@@ -336,7 +340,9 @@ class Template {
 				if (i !== 0) {
 					source.add(",\n");
 				}
-				source.add(`\n/***/ ${JSON.stringify(module.id)}:\n`);
+				source.add(
+					`\n/***/ ${JSON.stringify(module.id)}${renderContext.runtimeTemplate.supportsMethodShorthand() && module.source !== "false" ? "" : ":"}\n`
+				);
 				source.add(module.source);
 			}
 			source.add(`\n\n${prefix}}`);
@@ -367,6 +373,7 @@ class Template {
 					moduleGraph: renderContext.moduleGraph,
 					runtimeTemplate: renderContext.runtimeTemplate,
 					runtime: renderContext.chunk.runtime,
+					runtimes: [renderContext.chunk.runtime],
 					codeGenerationResults
 				});
 				if (!codeGenResult) continue;
@@ -409,7 +416,7 @@ class Template {
 }
 
 module.exports = Template;
-module.exports.NUMBER_OF_IDENTIFIER_START_CHARS =
-	NUMBER_OF_IDENTIFIER_START_CHARS;
 module.exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS =
 	NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS;
+module.exports.NUMBER_OF_IDENTIFIER_START_CHARS =
+	NUMBER_OF_IDENTIFIER_START_CHARS;