webpack 5.97.1 → 5.104.1

package/lib/EnvironmentPlugin.js

@@ -11,9 +11,11 @@ const WebpackError = require("./WebpackError");
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./DefinePlugin").CodeValue} CodeValue */
 
+const PLUGIN_NAME = "EnvironmentPlugin";
+
 class EnvironmentPlugin {
 	/**
-	 * @param {(string | string[] | Record<string, any>)[]} keys keys
+	 * @param {(string | string[] | Record<string, EXPECTED_ANY>)[]} keys keys
 	 */
 	constructor(...keys) {
 		if (keys.length === 1 && Array.isArray(keys[0])) {
@@ -22,7 +24,9 @@ class EnvironmentPlugin {
 			this.defaultValues = {};
 		} else if (keys.length === 1 && keys[0] && typeof keys[0] === "object") {
 			this.keys = Object.keys(keys[0]);
-			this.defaultValues = /** @type {Record<string, any>} */ (keys[0]);
+			this.defaultValues =
+				/** @type {Record<string, EXPECTED_ANY>} */
+				(keys[0]);
 		} else {
 			this.keys = /** @type {string[]} */ (keys);
 			this.defaultValues = {};
@@ -35,32 +39,35 @@ class EnvironmentPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		/** @type {Record<string, CodeValue>} */
-		const definitions = {};
-		for (const key of this.keys) {
-			const value =
-				process.env[key] !== undefined
-					? process.env[key]
-					: this.defaultValues[key];
+		const definePlugin = new DefinePlugin({});
+
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+			/** @type {Record<string, CodeValue>} */
+			const definitions = {};
+			for (const key of this.keys) {
+				const value =
+					process.env[key] !== undefined
+						? process.env[key]
+						: this.defaultValues[key];
 
-			if (value === undefined) {
-				compiler.hooks.thisCompilation.tap("EnvironmentPlugin", compilation => {
+				if (value === undefined) {
 					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."
 					);
 
 					error.name = "EnvVariableNotDefinedError";
 					compilation.errors.push(error);
-				});
+				}
+				const defValue =
+					value === undefined ? "undefined" : JSON.stringify(value);
+				definitions[`process.env.${key}`] = defValue;
+				definitions[`import.meta.env.${key}`] = defValue;
 			}
-
-			definitions[`process.env.${key}`] =
-				value === undefined ? "undefined" : JSON.stringify(value);
-		}
-
-		new DefinePlugin(definitions).apply(compiler);
+			definePlugin.definitions = definitions;
+		});
+		definePlugin.apply(compiler);
 	}
 }
 

package/lib/ErrorHelpers.js

@@ -28,13 +28,13 @@ const cutOffByFlag = (stack, flag) => {
  * @param {string} stack stack trace
  * @returns {string} stack trace without the loader execution flag included
  */
-const cutOffLoaderExecution = stack => cutOffByFlag(stack, loaderFlag);
+const cutOffLoaderExecution = (stack) => cutOffByFlag(stack, loaderFlag);
 
 /**
  * @param {string} stack stack trace
  * @returns {string} stack trace without the webpack options flag included
  */
-const cutOffWebpackOptions = stack => cutOffByFlag(stack, webpackOptionsFlag);
+const cutOffWebpackOptions = (stack) => cutOffByFlag(stack, webpackOptionsFlag);
 
 /**
  * @param {string} stack stack trace
@@ -91,10 +91,10 @@ const cleanUpWebpackOptions = (stack, message) => {
 	return stack;
 };
 
+module.exports.cleanUp = cleanUp;
+module.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;
+module.exports.cutOffMultilineMessage = cutOffMultilineMessage;
+module.exports.cutOffWebpackOptions = cutOffWebpackOptions;

package/lib/EvalDevToolModulePlugin.js

@@ -12,7 +12,8 @@ const RuntimeGlobals = require("./RuntimeGlobals");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").OutputNormalized} OutputOptions */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolNamespace} DevtoolNamespace */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolModuleFilenameTemplate} DevtoolModuleFilenameTemplate */
 /** @typedef {import("./Compiler")} Compiler */
 
 /** @type {WeakMap<Source, Source>} */
@@ -30,11 +31,13 @@ const devtoolWarning = new RawSource(`/*
 
 /**
  * @typedef {object} EvalDevToolModulePluginOptions
- * @property {OutputOptions["devtoolNamespace"]=} namespace namespace
+ * @property {DevtoolNamespace=} namespace namespace
  * @property {string=} sourceUrlComment source url comment
- * @property {OutputOptions["devtoolModuleFilenameTemplate"]=} moduleFilenameTemplate module filename template
+ * @property {DevtoolModuleFilenameTemplate=} moduleFilenameTemplate module filename template
  */
 
+const PLUGIN_NAME = "EvalDevToolModulePlugin";
+
 class EvalDevToolModulePlugin {
 	/**
 	 * @param {EvalDevToolModulePluginOptions=} options options
@@ -53,10 +56,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;
@@ -93,9 +96,9 @@ class EvalDevToolModulePlugin {
 						`eval(${
 							compilation.outputOptions.trustedTypes
 								? `${RuntimeGlobals.createScript}(${JSON.stringify(
-										content + footer
+										`{${content + footer}\n}`
 									)})`
-								: JSON.stringify(content + footer)
+								: JSON.stringify(`{${content + footer}\n}`)
 						});`
 					);
 					cache.set(source, result);
@@ -103,21 +106,21 @@ class EvalDevToolModulePlugin {
 				}
 			);
 			hooks.inlineInRuntimeBailout.tap(
-				"EvalDevToolModulePlugin",
+				PLUGIN_NAME,
 				() => "the eval devtool is used."
 			);
 			hooks.render.tap(
-				"EvalDevToolModulePlugin",
-				source => new ConcatSource(devtoolWarning, source)
+				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",
-					(module, set, context) => {
+					PLUGIN_NAME,
+					(module, set, _context) => {
 						set.add(RuntimeGlobals.createScript);
 					}
 				);

package/lib/EvalSourceMapDevToolPlugin.js

@@ -15,12 +15,12 @@ const ConcatenatedModule = require("./optimize/ConcatenatedModule");
 const generateDebugId = require("./util/generateDebugId");
 const { makePathsAbsolute } = require("./util/identifier");
 
+/** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").DevTool} DevToolOptions */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
+/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").Rules} Rules */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./NormalModule").SourceMap} SourceMap */
 
 /** @type {WeakMap<Source, Source>} */
 const cache = new WeakMap();
@@ -35,11 +35,13 @@ const devtoolWarning = new RawSource(`/*
  */
 `);
 
+const PLUGIN_NAME = "EvalSourceMapDevToolPlugin";
+
 class EvalSourceMapDevToolPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions|string} inputOptions Options object
+	 * @param {SourceMapDevToolPluginOptions | string=} inputOptions Options object
 	 */
-	constructor(inputOptions) {
+	constructor(inputOptions = {}) {
 		/** @type {SourceMapDevToolPluginOptions} */
 		let options;
 		if (typeof inputOptions === "string") {
@@ -67,160 +69,172 @@ 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 {RawSourceMap} */
+					let sourceMap;
+					let content;
+					if (source.sourceAndMap) {
+						const sourceAndMap = source.sourceAndMap(options);
+						sourceMap = /** @type {RawSourceMap} */ (sourceAndMap.map);
+						content = sourceAndMap.source;
+					} else {
+						sourceMap = /** @type {RawSourceMap} */ (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 = compiler.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;
 						}
-
-						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)
-								});`
+					);
+					sourceMap.sources = 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;
 					}
-				);
-				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);
-						}
+					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);
+					}
+
+					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}\n}`
+										)})`
+									: JSON.stringify(`{${content + footer}\n}`)
+							});`
+						)
 					);
 				}
+			);
+			hooks.inlineInRuntimeBailout.tap(
+				PLUGIN_NAME,
+				() => "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);
+					}
+				);
 			}
-		);
+		});
 	}
 }