webpack 5.103.0 → 5.104.0

package/lib/dependencies/CssIcssSymbolDependency.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { CSS_TYPE } = require("../ModuleSourceTypeConstants");
 const makeSerializable = require("../util/makeSerializable");
 const CssIcssExportDependency = require("./CssIcssExportDependency");
 const NullDependency = require("./NullDependency");
@@ -42,10 +43,6 @@ class CssIcssSymbolDependency extends NullDependency {
 		return "css symbol identifier";
 	}
 
-	get category() {
-		return "self";
-	}
-
 	/**
 	 * Update the hash
 	 * @param {Hash} hash hash to be updated
@@ -106,7 +103,7 @@ CssIcssSymbolDependency.Template = class CssIcssSymbolDependencyTemplate extends
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		if (templateContext.type === "css") {
+		if (templateContext.type === CSS_TYPE) {
 			const dep = /** @type {CssIcssSymbolDependency} */ (dependency);
 			/** @type {string | undefined} */
 			const value = dep.isReference
@@ -117,7 +114,6 @@ CssIcssSymbolDependency.Template = class CssIcssSymbolDependencyTemplate extends
 				: dep.symbol;
 
 			if (!value) {
-				// TODO generate warning
 				return;
 			}
 

package/lib/dependencies/CssImportDependency.js

@@ -10,7 +10,7 @@ const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../css/CssParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -105,6 +105,7 @@ CssImportDependency.Template = class CssImportDependencyTemplate extends (
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
+		if (templateContext.type === "javascript") return;
 		const dep = /** @type {CssImportDependency} */ (dependency);
 
 		source.replace(dep.range[0], dep.range[1] - 1, "");

package/lib/dependencies/CssUrlDependency.js

@@ -13,7 +13,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
@@ -118,8 +118,9 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 	apply(
 		dependency,
 		source,
-		{ moduleGraph, runtimeTemplate, codeGenerationResults }
+		{ type, moduleGraph, runtimeTemplate, codeGenerationResults }
 	) {
+		if (type === "javascript") return;
 		const dep = /** @type {CssUrlDependency} */ (dependency);
 		const module = /** @type {Module} */ (moduleGraph.getModule(dep));
 

package/lib/dependencies/DynamicExports.js

@@ -6,13 +6,13 @@
 "use strict";
 
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../Parser").ParserState} ParserState */
+/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
 
-/** @type {WeakMap<ParserState, boolean>} */
+/** @type {WeakMap<JavascriptParserState, boolean>} */
 const parserStateExportsState = new WeakMap();
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @returns {void}
  */
 module.exports.bailout = (parserState) => {
@@ -26,7 +26,7 @@ module.exports.bailout = (parserState) => {
 };
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @returns {void}
  */
 module.exports.enable = (parserState) => {
@@ -41,7 +41,7 @@ module.exports.enable = (parserState) => {
 };
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @returns {boolean} true, when enabled
  */
 module.exports.isEnabled = (parserState) => {
@@ -50,7 +50,7 @@ module.exports.isEnabled = (parserState) => {
 };
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @returns {void}
  */
 module.exports.setDynamic = (parserState) => {
@@ -61,7 +61,7 @@ module.exports.setDynamic = (parserState) => {
 };
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @returns {void}
  */
 module.exports.setFlagged = (parserState) => {

package/lib/dependencies/ExternalModuleDependency.js

@@ -13,17 +13,19 @@ const ExternalModuleInitFragment = require("./ExternalModuleInitFragment");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../dependencies/ExternalModuleInitFragment").ArrayImportSpecifiers} ArrayImportSpecifiers */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 class ExternalModuleDependency extends CachedConstDependency {
 	/**
 	 * @param {string} module module
-	 * @param {{ name: string, value: string }[]} importSpecifiers import specifiers
+	 * @param {ArrayImportSpecifiers} importSpecifiers import specifiers
 	 * @param {string | undefined} defaultImport default import
 	 * @param {string} expression expression
-	 * @param {Range} range range
+	 * @param {Range | null} range range
 	 * @param {string} identifier identifier
+	 * @param {number=} place place where we inject the expression
 	 */
 	constructor(
 		module,
@@ -31,9 +33,10 @@ class ExternalModuleDependency extends CachedConstDependency {
 		defaultImport,
 		expression,
 		range,
-		identifier
+		identifier,
+		place = CachedConstDependency.PLACE_MODULE
 	) {
-		super(expression, range, identifier);
+		super(expression, range, identifier, place);
 
 		this.importedModule = module;
 		this.specifiers = importSpecifiers;

package/lib/dependencies/ExternalModuleInitFragment.js

@@ -12,6 +12,7 @@ const makeSerializable = require("../util/makeSerializable");
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {{ name: string, value?: string }[]} ArrayImportSpecifiers */
 /** @typedef {Map<string, Set<string>>} ImportSpecifiers */
 
 /**
@@ -20,7 +21,7 @@ const makeSerializable = require("../util/makeSerializable");
 class ExternalModuleInitFragment extends InitFragment {
 	/**
 	 * @param {string} importedModule imported module
-	 * @param {{ name: string, value?: string }[] | ImportSpecifiers} specifiers import specifiers
+	 * @param {ArrayImportSpecifiers | ImportSpecifiers} specifiers import specifiers
 	 * @param {string=} defaultImport default import
 	 */
 	constructor(importedModule, specifiers, defaultImport) {

package/lib/dependencies/ExternalModuleInitFragmentDependency.js

@@ -14,13 +14,14 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../dependencies/ExternalModuleInitFragment").ArrayImportSpecifiers} ArrayImportSpecifiers */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 class ExternalModuleInitFragmentDependency extends NullDependency {
 	/**
 	 * @param {string} module module
-	 * @param {{ name: string, value: string }[]} importSpecifiers import specifiers
+	 * @param {ArrayImportSpecifiers} importSpecifiers import specifiers
 	 * @param {string | undefined} defaultImport default import
 	 */
 	constructor(module, importSpecifiers, defaultImport) {

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -123,7 +123,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					})
 					.join(""),
 				node.type.endsWith("Declaration") &&
-				/** @type {FunctionDeclaration | ClassDeclaration} */ (node).id
+					/** @type {FunctionDeclaration | ClassDeclaration} */ (node).id
 					? /** @type {FunctionDeclaration | ClassDeclaration} */
 						(node).id.name
 					: isFunctionDeclaration
@@ -224,7 +224,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				const dep = new HarmonyExportImportedSpecifierDependency(
 					/** @type {string} */
 					(source),
-					parser.state.lastHarmonyImportOrder,
+					/** @type {number} */
+					(parser.state.lastHarmonyImportOrder),
 					id ? [id] : [],
 					name,
 					harmonyNamedExports,

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -60,7 +60,7 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
 /** @typedef {import("../dependencies/ImportPhase").ImportPhaseType} ImportPhaseType */
 
-/** @typedef {"missing"|"unused"|"empty-star"|"reexport-dynamic-default"|"reexport-named-default"|"reexport-namespace-object"|"reexport-fake-namespace-object"|"reexport-undefined"|"normal-reexport"|"dynamic-reexport"} ExportModeType */
+/** @typedef {"missing" | "unused" | "empty-star" | "reexport-dynamic-default" | "reexport-named-default" | "reexport-namespace-object" | "reexport-fake-namespace-object" | "reexport-undefined" | "normal-reexport" | "dynamic-reexport"} ExportModeType */
 
 const { ExportPresenceModes } = HarmonyImportDependency;
 

package/lib/dependencies/HarmonyExports.js

@@ -9,13 +9,13 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../Parser").ParserState} ParserState */
+/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
 
-/** @type {WeakMap<ParserState, boolean>} */
+/** @type {WeakMap<JavascriptParserState, boolean>} */
 const parserStateExportsState = new WeakMap();
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @param {boolean} isStrictHarmony strict harmony mode should be enabled
  * @returns {void}
  */
@@ -37,7 +37,7 @@ module.exports.enable = (parserState, isStrictHarmony) => {
 };
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @returns {boolean} true, when enabled
  */
 module.exports.isEnabled = (parserState) => {

package/lib/dependencies/HarmonyImportDependency.js

@@ -12,7 +12,7 @@ const InitFragment = require("../InitFragment");
 const Template = require("../Template");
 const AwaitDependenciesInitFragment = require("../async-modules/AwaitDependenciesInitFragment");
 const { filterRuntime, mergeRuntime } = require("../util/runtime");
-const { ImportPhaseUtils } = require("./ImportPhase");
+const { ImportPhase, ImportPhaseUtils } = require("./ImportPhase");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -62,10 +62,15 @@ class HarmonyImportDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request string
 	 * @param {number} sourceOrder source order
-	 * @param {ImportPhaseType} phase import phase
+	 * @param {ImportPhaseType=} phase import phase
 	 * @param {ImportAttributes=} attributes import attributes
 	 */
-	constructor(request, sourceOrder, phase, attributes) {
+	constructor(
+		request,
+		sourceOrder,
+		phase = ImportPhase.Evaluation,
+		attributes = undefined
+	) {
 		super(request, sourceOrder);
 		this.phase = phase;
 		this.attributes = attributes;

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -25,7 +25,7 @@ const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 
-/** @typedef {Pick<ContextModuleOptions, 'mode' | 'recursive' | 'regExp' | 'include' | 'exclude' | 'chunkName'> & { groupOptions: RawChunkGroupOptions, exports?: RawReferencedExports }} ImportMetaContextOptions */
+/** @typedef {Pick<ContextModuleOptions, "mode" | "recursive" | "regExp" | "include" | "exclude" | "chunkName"> & { groupOptions: RawChunkGroupOptions, exports?: RawReferencedExports }} ImportMetaContextOptions */
 
 /**
  * @param {Property} prop property

package/lib/dependencies/ImportMetaPlugin.js

@@ -8,6 +8,7 @@
 const { pathToFileURL } = require("url");
 const { SyncBailHook } = require("tapable");
 const Compilation = require("../Compilation");
+const DefinePlugin = require("../DefinePlugin");
 const ModuleDependencyWarning = require("../ModuleDependencyWarning");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
@@ -43,6 +44,31 @@ const getCriticalDependencyWarning = memoize(() =>
 
 const PLUGIN_NAME = "ImportMetaPlugin";
 
+/**
+ * Collect import.meta.env definitions from DefinePlugin and build JSON string
+ * @param {Compilation} compilation the compilation
+ * @returns {string} env object as JSON string
+ */
+const collectImportMetaEnvDefinitions = (compilation) => {
+	const definePluginHooks = DefinePlugin.getCompilationHooks(compilation);
+	const definitions = definePluginHooks.definitions.call({});
+	if (!definitions) {
+		return "{}";
+	}
+
+	/** @type {string[]} */
+	const pairs = [];
+	for (const key of Object.keys(definitions)) {
+		if (key.startsWith("import.meta.env.")) {
+			const envKey = key.slice("import.meta.env.".length);
+			const value = definitions[key];
+			pairs.push(`${JSON.stringify(envKey)}:${value}`);
+		}
+	}
+
+	return `{${pairs.join(",")}}`;
+};
+
 /**
  * @typedef {object} ImportMetaPluginHooks
  * @property {SyncBailHook<[DestructuringAssignmentProperty], string | void>} propertyInDestructuring
@@ -294,6 +320,37 @@ class ImportMetaPlugin {
 						.for("import.meta.main")
 						.tap(PLUGIN_NAME, evaluateToString("boolean"));
 
+					// import.meta.env
+					parser.hooks.typeof
+						.for("import.meta.env")
+						.tap(
+							PLUGIN_NAME,
+							toConstantDependency(parser, JSON.stringify("object"))
+						);
+					parser.hooks.expression
+						.for("import.meta.env")
+						.tap(PLUGIN_NAME, (expr) => {
+							const envCode = collectImportMetaEnvDefinitions(compilation);
+							const dep = new ConstDependency(
+								envCode,
+								/** @type {Range} */ (expr.range)
+							);
+							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+							parser.state.module.addPresentationalDependency(dep);
+							return true;
+						});
+					parser.hooks.evaluateTypeof
+						.for("import.meta.env")
+						.tap(PLUGIN_NAME, evaluateToString("object"));
+					parser.hooks.evaluateIdentifier
+						.for("import.meta.env")
+						.tap(PLUGIN_NAME, (expr) =>
+							new BasicEvaluatedExpression()
+								.setTruthy()
+								.setSideEffects(false)
+								.setRange(/** @type {Range} */ (expr.range))
+						);
+
 					// Unknown properties
 					parser.hooks.unhandledExpressionMemberChain
 						.for("import.meta")

package/lib/dependencies/ImportParserPlugin.js

@@ -29,7 +29,7 @@ const ImportWeakDependency = require("./ImportWeakDependency");
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").ImportExpression} ImportExpression */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../javascript/JavascriptParser").ParserState} ParserState */
+/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
 /** @typedef {import("../javascript/JavascriptParser").Members} Members */
 /** @typedef {import("../javascript/JavascriptParser").MembersOptionals} MembersOptionals */
 /** @typedef {import("../javascript/JavascriptParser").ArrowFunctionExpression} ArrowFunctionExpression */
@@ -41,7 +41,7 @@ const ImportWeakDependency = require("./ImportWeakDependency");
 /** @typedef {{ references: RawReferencedExports, expression: ImportExpression }} ImportSettings */
 /** @typedef {WeakMap<ImportExpression, RawReferencedExports>} State */
 
-/** @type {WeakMap<ParserState, State>} */
+/** @type {WeakMap<JavascriptParserState, State>} */
 const parserStateMap = new WeakMap();
 const dynamicImportTag = Symbol("import()");
 

package/lib/dependencies/LocalModulesHelpers.js

@@ -7,7 +7,7 @@
 
 const LocalModule = require("./LocalModule");
 
-/** @typedef {import("../javascript/JavascriptParser").ParserState} ParserState */
+/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
 
 /**
  * @param {string} parent parent module
@@ -34,7 +34,7 @@ const lookup = (parent, mod) => {
 };
 
 /**
- * @param {ParserState} state parser state
+ * @param {JavascriptParserState} state parser state
  * @param {string} name name
  * @returns {LocalModule} local module
  */
@@ -48,7 +48,7 @@ module.exports.addLocalModule = (state, name) => {
 };
 
 /**
- * @param {ParserState} state parser state
+ * @param {JavascriptParserState} state parser state
  * @param {string} name name
  * @param {string=} namedModule named module
  * @returns {LocalModule | null} local module or null

package/lib/dependencies/WorkerPlugin.js

@@ -41,9 +41,9 @@ const WorkerDependency = require("./WorkerDependency");
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../Entrypoint").EntryOptions} EntryOptions */
 /** @typedef {import("../NormalModule")} NormalModule */
-/** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
+/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./HarmonyImportDependencyParserPlugin").HarmonySettings} HarmonySettings */
 
@@ -62,7 +62,7 @@ const DEFAULT_SYNTAX = [
 	"Worker from worker_threads"
 ];
 
-/** @type {WeakMap<ParserState, number>} */
+/** @type {WeakMap<JavascriptParserState, number>} */
 const workerIndexMap = new WeakMap();
 
 const PLUGIN_NAME = "WorkerPlugin";

package/lib/dependencies/getFunctionExpression.js

@@ -12,7 +12,7 @@
 
 /**
  * @param {Expression | SpreadElement} expr expressions
- * @returns {{fn: FunctionExpression | ArrowFunctionExpression, expressions: (Expression | SpreadElement)[], needThis: boolean | undefined } | undefined} function expression with additional information
+ * @returns {{ fn: FunctionExpression | ArrowFunctionExpression, expressions: (Expression | SpreadElement)[], needThis: boolean | undefined } | undefined} function expression with additional information
  */
 module.exports = (expr) => {
 	// <FunctionExpression>

package/lib/esm/ModuleChunkFormatPlugin.js

@@ -7,6 +7,7 @@
 
 const { ConcatSource } = require("webpack-sources");
 const { HotUpdateChunk, RuntimeGlobals } = require("..");
+const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const Template = require("../Template");
 const {
 	createChunkHashHandler,
@@ -110,10 +111,10 @@ class ModuleChunkFormatPlugin {
 			);
 			const hooks = getCompilationHooks(compilation);
 			/**
-			 * @param {Set<Chunk>} chunks the chunks to render
+			 * @param {Iterable<Chunk>} chunks the chunks to render
 			 * @param {ChunkGraph} chunkGraph the chunk graph
 			 * @param {Chunk=} runtimeChunk the runtime chunk
-			 * @returns {Source|undefined} the source
+			 * @returns {Source | undefined} the source
 			 */
 			const withDependentChunks = (chunks, chunkGraph, runtimeChunk) => {
 				if (/** @type {Set<Chunk>} */ (chunks).size > 0) {
@@ -153,7 +154,7 @@ class ModuleChunkFormatPlugin {
 						const entryDependentChunks =
 							chunkGraph.getChunkEntryDependentChunksIterable(chunk);
 						const sourceWithDependentChunks = withDependentChunks(
-							/** @type {Set<Chunk>} */ (entryDependentChunks),
+							entryDependentChunks,
 							chunkGraph,
 							chunk
 						);
@@ -214,7 +215,7 @@ class ModuleChunkFormatPlugin {
 					const loadedChunks = new Set();
 					for (let i = 0; i < entries.length; i++) {
 						const [module, entrypoint] = entries[i];
-						if (!chunkGraph.getModuleSourceTypes(module).has("javascript")) {
+						if (!chunkGraph.getModuleSourceTypes(module).has(JAVASCRIPT_TYPE)) {
 							continue;
 						}
 						const final = i + 1 === entries.length;

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -285,7 +285,8 @@ module.exports = function () {
 								update.m,
 								promises,
 								currentUpdateApplyHandlers,
-								updatedModules
+								updatedModules,
+								update.css
 							);
 							return promises;
 						}, [])

package/lib/hmr/LazyCompilationPlugin.js

@@ -10,7 +10,8 @@ const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Dependency = require("../Dependency");
 const Module = require("../Module");
 const ModuleFactory = require("../ModuleFactory");
-const { JS_TYPES } = require("../ModuleSourceTypesConstants");
+const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
+const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const {
 	WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY
 } = require("../ModuleTypeConstants");
@@ -208,7 +209,7 @@ class LazyCompilationProxyModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return JS_TYPES;
+		return JAVASCRIPT_TYPES;
 	}
 
 	/**
@@ -290,7 +291,7 @@ class LazyCompilationProxyModule extends Module {
 				keepActive
 			]);
 		}
-		sources.set("javascript", new RawSource(source));
+		sources.set(JAVASCRIPT_TYPE, new RawSource(source));
 		return {
 			sources,
 			runtimeRequirements

package/lib/ids/IdHelpers.js

@@ -222,17 +222,19 @@ const addToMapOfItems = (map, key, value) => {
 	array.push(value);
 };
 
+/** @typedef {Set<string>} UsedModuleIds */
+
 /**
  * @param {Compilation} compilation the compilation
  * @param {((module: Module) => boolean)=} filter filter modules
- * @returns {[Set<string>, Module[]]} used module ids as strings and modules without id matching the filter
+ * @returns {[UsedModuleIds, Module[]]} used module ids as strings and modules without id matching the filter
  */
 const getUsedModuleIdsAndModules = (compilation, filter) => {
 	const chunkGraph = compilation.chunkGraph;
 
 	const modules = [];
 
-	/** @type {Set<string>} */
+	/** @type {UsedModuleIds} */
 	const usedIds = new Set();
 	if (compilation.usedModuleIds) {
 		for (const id of compilation.usedModuleIds) {
@@ -258,12 +260,14 @@ const getUsedModuleIdsAndModules = (compilation, filter) => {
 	return [usedIds, modules];
 };
 
+/** @typedef {Set<string>} UsedChunkIds */
+
 /**
  * @param {Compilation} compilation the compilation
- * @returns {Set<string>} used chunk ids as strings
+ * @returns {UsedChunkIds} used chunk ids as strings
  */
 const getUsedChunkIds = (compilation) => {
-	/** @type {Set<string>} */
+	/** @type {UsedChunkIds} */
 	const usedIds = new Set();
 	if (compilation.usedChunkIds) {
 		for (const id of compilation.usedChunkIds) {
@@ -299,7 +303,12 @@ const assignNames = (
 	usedIds,
 	assignName
 ) => {
-	/** @type {Map<string, T[]>} */
+	/**
+	 * @template T
+	 * @typedef {Map<string, T[]>} MapToItem
+	 */
+
+	/** @type {MapToItem<T>} */
 	const nameToItems = new Map();
 
 	for (const item of items) {
@@ -307,7 +316,7 @@ const assignNames = (
 		addToMapOfItems(nameToItems, name, item);
 	}
 
-	/** @type {Map<string, T[]>} */
+	/** @type {MapToItem<T>} */
 	const nameToItems2 = new Map();
 
 	for (const [name, items] of nameToItems) {
@@ -402,7 +411,7 @@ const assignDeterministicIds = (
 };
 
 /**
- * @param {Set<string>} usedIds used ids
+ * @param {UsedModuleIds} usedIds used ids
  * @param {Iterable<Module>} modules the modules
  * @param {Compilation} compilation the compilation
  * @returns {void}

package/lib/javascript/ChunkHelpers.js

@@ -19,7 +19,7 @@ const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
 	/** @type {Set<Entrypoint>} */
 	const queue = new Set([entrypoint]);
 	/** @type {Set<Entrypoint>} */
-	const groups = new Set([]);
+	const groups = new Set();
 	for (const group of queue) {
 		if (group !== entrypoint) {
 			groups.add(group);

package/lib/javascript/JavascriptGenerator.js

@@ -9,7 +9,7 @@ const util = require("util");
 const { RawSource, ReplaceSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
-const { JS_TYPES } = require("../ModuleSourceTypesConstants");
+const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
 const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -21,6 +21,7 @@ const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibi
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../NormalModule")} NormalModule */
 
@@ -59,12 +60,12 @@ class JavascriptGenerator extends Generator {
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
-		return JS_TYPES;
+		return JAVASCRIPT_TYPES;
 	}
 
 	/**
 	 * @param {NormalModule} module the module
-	 * @param {string=} type source type
+	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {