webpack 5.103.0 → 5.104.1

package/lib/ModuleFilenameHelpers.js

@@ -281,7 +281,7 @@ ModuleFilenameHelpers.createFilename = (
  * @template T
  * @param {T[]} array the array with duplicates to be replaced
  * @param {(duplicateItem: T, duplicateItemIndex: number, numberOfTimesReplaced: number) => T} fn callback function to generate new values for the duplicate items
- * @param {(firstElement:T, nextElement:T) => -1 | 0 | 1=} comparator optional comparator function to sort the duplicate items
+ * @param {(firstElement: T, nextElement: T) => -1 | 0 | 1=} comparator optional comparator function to sort the duplicate items
  * @returns {T[]} the array with duplicates replaced
  * @example
  * ```js

package/lib/ModuleGraph.js

@@ -169,6 +169,12 @@ class ModuleGraph {
 		 * @private
 		 */
 		this._dependencySourceOrderMap = new WeakMap();
+
+		/**
+		 * @type {Set<Module>}
+		 * @private
+		 */
+		this._modulesNeedingSort = new Set();
 	}
 
 	/**
@@ -305,17 +311,15 @@ class ModuleGraph {
 		// import { a, b } from "lib" -> a and b have the same source order -> a = b = 1
 		// import { d } from "lib/d" -> d = 2
 		const currentSourceOrder =
-			/** @type { HarmonyImportSideEffectDependency | HarmonyImportSpecifierDependency} */ (
-				dependency
-			).sourceOrder;
+			/** @type {HarmonyImportSideEffectDependency | HarmonyImportSpecifierDependency} */
+			(dependency).sourceOrder;
 
 		// lib/index.js (reexport)
 		// import { a } from "lib/a" -> a = 0
 		// import { b } from "lib/b" -> b = 1
 		const originSourceOrder =
-			/** @type { HarmonyImportSideEffectDependency | HarmonyImportSpecifierDependency} */ (
-				originDependency
-			).sourceOrder;
+			/** @type {HarmonyImportSideEffectDependency | HarmonyImportSpecifierDependency} */
+			(originDependency).sourceOrder;
 		if (
 			typeof currentSourceOrder === "number" &&
 			typeof originSourceOrder === "number"
@@ -330,17 +334,28 @@ class ModuleGraph {
 				sub: originSourceOrder
 			});
 
+			// Save for later batch sorting
+			this._modulesNeedingSort.add(parentModule);
+		}
+	}
+
+	/**
+	 * @returns {void}
+	 */
+	finishUpdateParent() {
+		if (this._modulesNeedingSort.size === 0) {
+			return;
+		}
+		for (const mod of this._modulesNeedingSort) {
 			// If dependencies like HarmonyImportSideEffectDependency and HarmonyImportSpecifierDependency have a SourceOrder,
 			// we sort based on it; otherwise, we preserve the original order.
 			sortWithSourceOrder(
-				parentModule.dependencies,
-				this._dependencySourceOrderMap
+				mod.dependencies,
+				this._dependencySourceOrderMap,
+				(dep, index) => this.setParentDependenciesBlockIndex(dep, index)
 			);
-
-			for (const [index, dep] of parentModule.dependencies.entries()) {
-				this.setParentDependenciesBlockIndex(dep, index);
-			}
 		}
+		this._modulesNeedingSort.clear();
 	}
 
 	/**

package/lib/ModuleGraphConnection.js

@@ -52,8 +52,8 @@ const intersectConnectionStates = (a, b) => {
 
 class ModuleGraphConnection {
 	/**
-	 * @param {Module|null} originModule the referencing module
-	 * @param {Dependency|null} dependency the referencing dependency
+	 * @param {Module | null} originModule the referencing module
+	 * @param {Dependency | null} dependency the referencing dependency
 	 * @param {Module} module the referenced module
 	 * @param {string=} explanation some extra detail
 	 * @param {boolean=} weak the reference is weak

package/lib/ModuleSourceTypeConstants.js

@@ -0,0 +1,189 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+/**
+ * @type {Readonly<"javascript">}
+ */
+const JAVASCRIPT_TYPE = "javascript";
+
+/**
+ * @type {Readonly<"runtime">}
+ */
+const RUNTIME_TYPE = "runtime";
+
+/**
+ * @type {Readonly<"webassembly">}
+ */
+const WEBASSEMBLY_TYPE = "webassembly";
+
+/**
+ * @type {Readonly<"asset">}
+ */
+const ASSET_TYPE = "asset";
+
+/**
+ * @type {Readonly<"css">}
+ */
+const CSS_TYPE = "css";
+
+/**
+ * @type {Readonly<"css-import">}
+ */
+const CSS_IMPORT_TYPE = "css-import";
+
+/**
+ * @type {Readonly<"css-url">}
+ */
+const CSS_URL_TYPE = "css-url";
+
+/**
+ * @type {Readonly<"share-init">}
+ */
+const SHARED_INIT_TYPE = "share-init";
+
+/**
+ * @type {Readonly<"remote">}
+ */
+const REMOTE_GENERATOR_TYPE = "remote";
+
+/**
+ * @type {Readonly<"consume-shared">}
+ */
+const CONSUME_SHARED_GENERATOR_TYPE = "consume-shared";
+
+/**
+ * @type {Readonly<"unknown">}
+ */
+const UNKNOWN_TYPE = "unknown";
+
+/**
+ * @typedef {JAVASCRIPT_TYPE |
+ * RUNTIME_TYPE |
+ * WEBASSEMBLY_TYPE |
+ * ASSET_TYPE |
+ * CSS_TYPE |
+ * CSS_IMPORT_TYPE |
+ * CSS_URL_TYPE |
+ * SHARED_INIT_TYPE |
+ * REMOTE_GENERATOR_TYPE |
+ * CONSUME_SHARED_GENERATOR_TYPE |
+ * UNKNOWN_TYPE} AllTypes
+ */
+
+/**
+ * @type {ReadonlySet<never>}
+ */
+const NO_TYPES = new Set();
+
+/**
+ * @type {ReadonlySet<"asset">}
+ */
+const ASSET_TYPES = new Set([ASSET_TYPE]);
+
+/**
+ * @type {ReadonlySet<"asset" | "javascript" | "asset">}
+ */
+const ASSET_AND_JAVASCRIPT_TYPES = new Set([ASSET_TYPE, JAVASCRIPT_TYPE]);
+
+/**
+ * @type {ReadonlySet<"css-url" | "asset">}
+ */
+const ASSET_AND_CSS_URL_TYPES = new Set([ASSET_TYPE, CSS_URL_TYPE]);
+
+/**
+ * @type {ReadonlySet<"javascript" | "css-url" | "asset">}
+ */
+const ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES = new Set([
+	ASSET_TYPE,
+	JAVASCRIPT_TYPE,
+	CSS_URL_TYPE
+]);
+
+/**
+ * @type {ReadonlySet<"javascript">}
+ */
+const JAVASCRIPT_TYPES = new Set([JAVASCRIPT_TYPE]);
+
+/**
+ * @type {ReadonlySet<"javascript" | "css-url">}
+ */
+const JAVASCRIPT_AND_CSS_URL_TYPES = new Set([JAVASCRIPT_TYPE, CSS_URL_TYPE]);
+
+/**
+ * @type {ReadonlySet<"javascript" | "css">}
+ */
+const JAVASCRIPT_AND_CSS_TYPES = new Set([JAVASCRIPT_TYPE, CSS_TYPE]);
+
+/**
+ * @type {ReadonlySet<"css">}
+ */
+const CSS_TYPES = new Set([CSS_TYPE]);
+
+/**
+ * @type {ReadonlySet<"css-url">}
+ */
+const CSS_URL_TYPES = new Set([CSS_URL_TYPE]);
+/**
+ * @type {ReadonlySet<"css-import">}
+ */
+const CSS_IMPORT_TYPES = new Set([CSS_IMPORT_TYPE]);
+
+/**
+ * @type {ReadonlySet<"webassembly">}
+ */
+const WEBASSEMBLY_TYPES = new Set([WEBASSEMBLY_TYPE]);
+
+/**
+ * @type {ReadonlySet<"runtime">}
+ */
+const RUNTIME_TYPES = new Set([RUNTIME_TYPE]);
+
+/**
+ * @type {ReadonlySet<"remote" | "share-init">}
+ */
+const REMOTE_AND_SHARE_INIT_TYPES = new Set([
+	REMOTE_GENERATOR_TYPE,
+	SHARED_INIT_TYPE
+]);
+
+/**
+ * @type {ReadonlySet<"consume-shared">}
+ */
+const CONSUME_SHARED_TYPES = new Set([CONSUME_SHARED_GENERATOR_TYPE]);
+
+/**
+ * @type {ReadonlySet<"share-init">}
+ */
+const SHARED_INIT_TYPES = new Set([SHARED_INIT_TYPE]);
+
+module.exports.ASSET_AND_CSS_URL_TYPES = ASSET_AND_CSS_URL_TYPES;
+module.exports.ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES =
+	ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES;
+module.exports.ASSET_AND_JAVASCRIPT_TYPES = ASSET_AND_JAVASCRIPT_TYPES;
+module.exports.ASSET_TYPE = ASSET_TYPE;
+module.exports.ASSET_TYPES = ASSET_TYPES;
+module.exports.CONSUME_SHARED_TYPES = CONSUME_SHARED_TYPES;
+module.exports.CSS_IMPORT_TYPE = CSS_IMPORT_TYPE;
+module.exports.CSS_IMPORT_TYPES = CSS_IMPORT_TYPES;
+module.exports.CSS_TYPE = CSS_TYPE;
+module.exports.CSS_TYPE = CSS_TYPE;
+module.exports.CSS_TYPES = CSS_TYPES;
+module.exports.CSS_URL_TYPE = CSS_URL_TYPE;
+module.exports.CSS_URL_TYPES = CSS_URL_TYPES;
+module.exports.JAVASCRIPT_AND_CSS_TYPES = JAVASCRIPT_AND_CSS_TYPES;
+module.exports.JAVASCRIPT_AND_CSS_URL_TYPES = JAVASCRIPT_AND_CSS_URL_TYPES;
+module.exports.JAVASCRIPT_TYPE = JAVASCRIPT_TYPE;
+module.exports.JAVASCRIPT_TYPES = JAVASCRIPT_TYPES;
+module.exports.NO_TYPES = NO_TYPES;
+module.exports.REMOTE_AND_SHARE_INIT_TYPES = REMOTE_AND_SHARE_INIT_TYPES;
+module.exports.RUNTIME_TYPE = RUNTIME_TYPE;
+module.exports.RUNTIME_TYPES = RUNTIME_TYPES;
+module.exports.SHARED_INIT_TYPE = SHARED_INIT_TYPE;
+module.exports.SHARED_INIT_TYPES = SHARED_INIT_TYPES;
+module.exports.UNKNOWN_TYPE = UNKNOWN_TYPE;
+module.exports.WEBASSEMBLY_TYPE = WEBASSEMBLY_TYPE;
+module.exports.WEBASSEMBLY_TYPES = WEBASSEMBLY_TYPES;

package/lib/ModuleTypeConstants.js

@@ -97,7 +97,7 @@ const ASSET_MODULE_TYPE_BYTES = "asset/bytes";
 
 /**
  * @type {Readonly<"asset/raw-data-url">}
- * TODO: Document what this asset type is for. See css-loader tests for its usage.
+ * This is the module type used for the ignored asset module.
  */
 const ASSET_MODULE_TYPE_RAW_DATA_URL = "asset/raw-data-url";
 
@@ -110,21 +110,18 @@ const WEBPACK_MODULE_TYPE_RUNTIME = "runtime";
 /**
  * @type {Readonly<"fallback-module">}
  * This is the module type used for the ModuleFederation feature's FallbackModule class.
- * TODO: Document this better.
  */
 const WEBPACK_MODULE_TYPE_FALLBACK = "fallback-module";
 
 /**
  * @type {Readonly<"remote-module">}
  * This is the module type used for the ModuleFederation feature's RemoteModule class.
- * TODO: Document this better.
  */
 const WEBPACK_MODULE_TYPE_REMOTE = "remote-module";
 
 /**
  * @type {Readonly<"provide-module">}
  * This is the module type used for the ModuleFederation feature's ProvideModule class.
- * TODO: Document this better.
  */
 const WEBPACK_MODULE_TYPE_PROVIDE = "provide-module";
 

package/lib/ModuleWarning.js

@@ -15,7 +15,7 @@ const makeSerializable = require("./util/makeSerializable");
 class ModuleWarning extends WebpackError {
 	/**
 	 * @param {Error} warning error thrown
-	 * @param {{from?: string|null}} info additional info
+	 * @param {{from?: string | null}} info additional info
 	 */
 	constructor(warning, { from = null } = {}) {
 		let message = "Module Warning";

package/lib/NodeStuffPlugin.js

@@ -245,45 +245,46 @@ class NodeStuffPlugin {
 					parser.hooks.expression
 						.for(expressionName)
 						.tap(PLUGIN_NAME, (expr) => {
+							// We use `CachedConstDependency` because of `eval` devtool, there is no `import.meta` inside `eval()`
 							const { importMetaName, environment, module } =
 								compilation.outputOptions;
 
-							if (
-								module &&
-								importMetaName === "import.meta" &&
-								(expressionName === "import.meta.filename" ||
-									expressionName === "import.meta.dirname") &&
-								environment.importMetaDirnameAndFilename
-							) {
-								return true;
-							}
-
 							// Generate `import.meta.dirname` and `import.meta.filename` when:
 							// - they are supported by the environment
 							// - it is a universal target, because we can't use `import mod from "node:url"; ` at the top file
-							const dep =
+							if (
 								environment.importMetaDirnameAndFilename ||
 								(compiler.platform.web === null &&
 									compiler.platform.node === null &&
 									module)
-									? new ConstDependency(
-											`${importMetaName}.${property}`,
-											/** @type {Range} */
-											(expr.range)
-										)
-									: new ExternalModuleDependency(
-											"url",
-											[
-												{
-													name: "fileURLToPath",
-													value: URL_MODULE_CONSTANT_FUNCTION_NAME
-												}
-											],
-											undefined,
-											`${URL_MODULE_CONSTANT_FUNCTION_NAME}(${value()})`,
-											/** @type {Range} */ (expr.range),
-											`__webpack_${property}__`
-										);
+							) {
+								const dep = new CachedConstDependency(
+									`${importMetaName}.${property}`,
+									/** @type {Range} */
+									(expr.range),
+									`__webpack_${property}__`,
+									CachedConstDependency.PLACE_CHUNK
+								);
+
+								dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+								parser.state.module.addPresentationalDependency(dep);
+								return;
+							}
+
+							const dep = new ExternalModuleDependency(
+								"url",
+								[
+									{
+										name: "fileURLToPath",
+										value: URL_MODULE_CONSTANT_FUNCTION_NAME
+									}
+								],
+								undefined,
+								`${URL_MODULE_CONSTANT_FUNCTION_NAME}(${value()})`,
+								/** @type {Range} */ (expr.range),
+								`__webpack_${property}__`,
+								ExternalModuleDependency.PLACE_CHUNK
+							);
 							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 
@@ -300,20 +301,25 @@ class NodeStuffPlugin {
 									compilation.outputOptions;
 
 								if (
-									module &&
-									importMetaName === "import.meta" &&
-									(expressionName === "import.meta.filename" ||
-										expressionName === "import.meta.dirname") &&
-									environment.importMetaDirnameAndFilename
+									environment.importMetaDirnameAndFilename ||
+									(compiler.platform.web === null &&
+										compiler.platform.node === null &&
+										module)
 								) {
-									return `${property}: ${importMetaName}.${property},`;
-								}
-
-								if (environment.importMetaDirnameAndFilename) {
-									return `${property}: ${importMetaName}.${property},`;
+									const dep = new CachedConstDependency(
+										`${importMetaName}.${property}`,
+										null,
+										`__webpack_${property}__`,
+										CachedConstDependency.PLACE_CHUNK
+									);
+									dep.loc = /** @type {DependencyLocation} */ (
+										usingProperty.loc
+									);
+									parser.state.module.addPresentationalDependency(dep);
+									return `${property}: __webpack_${property}__,`;
 								}
 
-								const dep = new ExternalModuleInitFragmentDependency(
+								const dep = new ExternalModuleDependency(
 									"url",
 									[
 										{
@@ -321,13 +327,17 @@ class NodeStuffPlugin {
 											value: URL_MODULE_CONSTANT_FUNCTION_NAME
 										}
 									],
-									undefined
+									undefined,
+									`${URL_MODULE_CONSTANT_FUNCTION_NAME}(${value()})`,
+									null,
+									`__webpack_${property}__`,
+									ExternalModuleDependency.PLACE_CHUNK
 								);
 
 								dep.loc = /** @type {DependencyLocation} */ (usingProperty.loc);
 								parser.state.module.addPresentationalDependency(dep);
 
-								return `${property}: ${URL_MODULE_CONSTANT_FUNCTION_NAME}(${value()}),`;
+								return `${property}: __webpack_${property}__,`;
 							}
 						});
 					}

package/lib/NormalModule.js

@@ -79,7 +79,8 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("./Module").BuildCallback} BuildCallback */
 /** @typedef {import("./Module").RuntimeRequirements} RuntimeRequirements */
-/** @typedef {import("./Generator").SourceTypes} SourceTypes */
+/** @typedef {import("./Module").SourceType} SourceType */
+/** @typedef {import("./Module").SourceTypes} SourceTypes */
 /** @typedef {import("./Module").UnsafeCacheData} UnsafeCacheData */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./ModuleGraphConnection").ConnectionState} ConnectionState */
@@ -394,7 +395,7 @@ class NormalModule extends Module {
 		this._source = null;
 		/**
 		 * @private
-		 * @type {Map<string | undefined, number> | undefined}
+		 * @type {Map<undefined | SourceType, number> | undefined}
 		 */
 		this._sourceSizes = undefined;
 		/**
@@ -699,7 +700,8 @@ class NormalModule extends Module {
 							options = parseJson(options);
 						} catch (err) {
 							throw new Error(
-								`Cannot parse string options: ${/** @type {Error} */ (err).message}`
+								`Cannot parse string options: ${/** @type {Error} */ (err).message}`,
+								{ cause: err }
 							);
 						}
 					} else {
@@ -1307,7 +1309,7 @@ class NormalModule extends Module {
 				/** @type {undefined | Set<string>} */
 				let nonAbsoluteDependencies;
 				/**
-				 * @param {LazySet<string>} deps deps
+				 * @param {FileSystemDependencies} deps deps
 				 */
 				const checkDependencies = (deps) => {
 					for (const dep of deps) {

package/lib/NormalModuleFactory.js

@@ -38,6 +38,7 @@ const {
 /** @typedef {import("enhanced-resolve").ResolveRequest} ResolveRequest */
 /** @typedef {import("../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptions */
 /** @typedef {import("../declarations/WebpackOptions").RuleSetRule} RuleSetRule */
+/** @typedef {import("./Compilation").FileSystemDependencies} FileSystemDependencies */
 /** @typedef {import("./Generator")} Generator */
 /** @typedef {import("./ModuleFactory").ModuleFactoryCallback} ModuleFactoryCallback */
 /** @typedef {import("./ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
@@ -61,7 +62,7 @@ const {
  * @typedef {import("./Compiler").Callback<T>} Callback
  */
 
-/** @typedef {Pick<RuleSetRule, 'type' | 'sideEffects' | 'parser' | 'generator' | 'resolve' | 'layer' | 'extractSourceMap'>} ModuleSettings */
+/** @typedef {Pick<RuleSetRule, "type" | "sideEffects" | "parser" | "generator" | "resolve" | "layer" | "extractSourceMap">} ModuleSettings */
 /** @typedef {Partial<NormalModuleCreateData & { settings: ModuleSettings }>} CreateData */
 
 /**
@@ -74,9 +75,9 @@ const {
  * @property {ModuleDependency[]} dependencies
  * @property {string} dependencyType
  * @property {CreateData} createData
- * @property {LazySet<string>} fileDependencies
- * @property {LazySet<string>} missingDependencies
- * @property {LazySet<string>} contextDependencies
+ * @property {FileSystemDependencies} fileDependencies
+ * @property {FileSystemDependencies} missingDependencies
+ * @property {FileSystemDependencies} contextDependencies
  * @property {Module=} ignoredModule
  * @property {boolean} cacheable allow to use the unsafe cache
  */
@@ -296,14 +297,10 @@ const ruleSetCompiler = new RuleSetCompiler([
 
 /** @typedef {import("./css/CssParser")} CssParser */
 /** @typedef {import("../declarations/WebpackOptions").CssParserOptions} CssParserOptions */
-/** @typedef {import("../declarations/WebpackOptions").CssAutoParserOptions} CssAutoParserOptions */
-/** @typedef {import("../declarations/WebpackOptions").CssGlobalParserOptions} CssGlobalParserOptions */
 /** @typedef {import("../declarations/WebpackOptions").CssModuleParserOptions} CssModuleParserOptions */
 /** @typedef {import("./css/CssGenerator")} CssGenerator */
 /** @typedef {import("../declarations/WebpackOptions").CssGeneratorOptions} CssGeneratorOptions */
-/** @typedef {import("../declarations/WebpackOptions").CssGlobalGeneratorOptions} CssGlobalGeneratorOptions */
 /** @typedef {import("../declarations/WebpackOptions").CssModuleGeneratorOptions} CssModuleGeneratorOptions */
-/** @typedef {import("../declarations/WebpackOptions").CssAutoGeneratorOptions} CssAutoGeneratorOptions */
 
 /**
  * @typedef {[
@@ -319,9 +316,9 @@ const ruleSetCompiler = new RuleSetCompiler([
  * [WEBASSEMBLY_MODULE_TYPE_ASYNC, AsyncWebAssemblyParser, EmptyParserOptions, Generator, EmptyParserOptions],
  * [WEBASSEMBLY_MODULE_TYPE_SYNC, WebAssemblyParser, EmptyParserOptions, Generator, EmptyParserOptions],
  * [CSS_MODULE_TYPE, CssParser, CssParserOptions, CssGenerator, CssGeneratorOptions],
- * [CSS_MODULE_TYPE_AUTO, CssParser, CssAutoParserOptions, CssGenerator, CssAutoGeneratorOptions],
+ * [CSS_MODULE_TYPE_AUTO, CssParser, CssModuleParserOptions, CssGenerator, CssModuleGeneratorOptions],
  * [CSS_MODULE_TYPE_MODULE, CssParser, CssModuleParserOptions, CssGenerator, CssModuleGeneratorOptions],
- * [CSS_MODULE_TYPE_GLOBAL, CssParser, CssGlobalParserOptions, CssGenerator, CssGlobalGeneratorOptions],
+ * [CSS_MODULE_TYPE_GLOBAL, CssParser, CssModuleParserOptions, CssGenerator, CssModuleGeneratorOptions],
  * [string, Parser, ParserOptions, Generator, GeneratorOptions],
  * ]} ParsersAndGeneratorsByTypes
  */

package/lib/Parser.js

@@ -20,7 +20,7 @@
  * @property {WebpackOptions} options
  */
 
-/** @typedef {Record<string, EXPECTED_ANY> & ParserStateBase} ParserState */
+/** @typedef {ParserStateBase & Record<string, EXPECTED_ANY>} ParserState */
 
 class Parser {
 	/* istanbul ignore next */

package/lib/RawModule.js

@@ -7,7 +7,10 @@
 
 const { OriginalSource, RawSource } = require("webpack-sources");
 const Module = require("./Module");
-const { JS_TYPES } = require("./ModuleSourceTypesConstants");
+const {
+	JAVASCRIPT_TYPE,
+	JAVASCRIPT_TYPES
+} = require("./ModuleSourceTypeConstants");
 const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const makeSerializable = require("./util/makeSerializable");
 
@@ -49,7 +52,7 @@ class RawModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return JS_TYPES;
+		return JAVASCRIPT_TYPES;
 	}
 
 	/**
@@ -122,11 +125,11 @@ class RawModule extends Module {
 		const sources = new Map();
 		if (this.useSourceMap || this.useSimpleSourceMap) {
 			sources.set(
-				"javascript",
+				JAVASCRIPT_TYPE,
 				new OriginalSource(this.sourceStr, this.identifier())
 			);
 		} else {
-			sources.set("javascript", new RawSource(this.sourceStr));
+			sources.set(JAVASCRIPT_TYPE, new RawSource(this.sourceStr));
 		}
 		return { sources, runtimeRequirements: this.runtimeRequirements };
 	}

package/lib/RuntimeModule.js

@@ -8,7 +8,7 @@
 const { RawSource } = require("webpack-sources");
 const OriginalSource = require("webpack-sources").OriginalSource;
 const Module = require("./Module");
-const { RUNTIME_TYPES } = require("./ModuleSourceTypesConstants");
+const { RUNTIME_TYPES } = require("./ModuleSourceTypeConstants");
 const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
 
 /** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */

package/lib/RuntimeTemplate.js

@@ -127,6 +127,10 @@ class RuntimeTemplate {
 		return this.outputOptions.environment.const;
 	}
 
+	supportsMethodShorthand() {
+		return this.outputOptions.environment.methodShorthand;
+	}
+
 	supportsArrowFunction() {
 		return this.outputOptions.environment.arrowFunction;
 	}
@@ -956,7 +960,7 @@ class RuntimeTemplate {
 	 * @param {string} options.request the request
 	 * @param {string | string[]} options.exportName the export name
 	 * @param {Module} options.originModule the origin module
-	 * @param {boolean|undefined} options.asiSafe true, if location is safe for ASI, a bracket can be emitted
+	 * @param {boolean | undefined} options.asiSafe true, if location is safe for ASI, a bracket can be emitted
 	 * @param {boolean} options.isCall true, if expression will be called
 	 * @param {boolean | null} options.callContext when false, call context will not be preserved
 	 * @param {boolean} options.defaultInterop when true and accessing the default exports, interop code will be generated

package/lib/SizeFormatHelpers.js

@@ -6,7 +6,7 @@
 "use strict";
 
 /**
- * @param {number} size the size in bytes
+ * @param {number=} size the size in bytes
  * @returns {string} the formatted size
  */
 module.exports.formatSize = (size) => {

package/lib/SourceMapDevToolPlugin.js

@@ -496,7 +496,12 @@ 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);