webpack 5.103.0 → 5.104.1

package/lib/javascript/JavascriptModulesPlugin.js

@@ -20,6 +20,7 @@ const Compilation = require("../Compilation");
 const { tryRunOrWebpackError } = require("../HookWebpackError");
 const HotUpdateChunk = require("../HotUpdateChunk");
 const InitFragment = require("../InitFragment");
+const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
@@ -79,7 +80,7 @@ const chunkHasJs = (chunk, chunkGraph) => {
 	if (chunkGraph.getNumberOfEntryModules(chunk) > 0) return true;
 
 	return Boolean(
-		chunkGraph.getChunkModulesIterableBySourceType(chunk, "javascript")
+		chunkGraph.getChunkModulesIterableBySourceType(chunk, JAVASCRIPT_TYPE)
 	);
 };
 
@@ -99,7 +100,7 @@ const chunkHasRuntimeOrJs = (chunk, chunkGraph) => {
 	}
 
 	return Boolean(
-		chunkGraph.getChunkModulesIterableBySourceType(chunk, "javascript")
+		chunkGraph.getChunkModulesIterableBySourceType(chunk, JAVASCRIPT_TYPE)
 	);
 };
 
@@ -181,7 +182,7 @@ const printGeneratedCodeForStack = (module, code) => {
  * @property {ChunkGraph} chunkGraph the chunk graph
  * @property {CodeGenerationResults} codeGenerationResults results of code generation
  * @property {boolean | undefined} strictMode rendering in strict context
- * @property {boolean } inlined inlined
+ * @property {boolean} inlined inlined
  * @property {boolean=} inlinedInIIFE the inlined entry module is wrapped in an IIFE
  */
 
@@ -197,6 +198,7 @@ const printGeneratedCodeForStack = (module, code) => {
  * @property {boolean | undefined} strictMode rendering in strict context
  * @property {boolean} factory true: renders as factory method, false: pure module content
  * @property {boolean=} inlinedInIIFE the inlined entry module is wrapped in an IIFE, existing only when `factory` is set to false
+ * @property {boolean=} renderInObject render module in object container
  */
 
 /**
@@ -276,7 +278,7 @@ class JavascriptModulesPlugin {
 
 	constructor(options = {}) {
 		this.options = options;
-		/** @type {WeakMap<Source, { source: Source, needModule:boolean, needExports: boolean, needRequire: boolean, needThisAsExports: boolean, needStrict: boolean | undefined }>} */
+		/** @type {WeakMap<Source, { source: Source, needModule:boolean, needExports: boolean, needRequire: boolean, needThisAsExports: boolean, needStrict: boolean | undefined, renderShorthand: boolean }>} */
 		this._moduleFactoryCache = new WeakMap();
 	}
 
@@ -487,7 +489,7 @@ class JavascriptModulesPlugin {
 					});
 					const modules = chunkGraph.getChunkModulesIterableBySourceType(
 						chunk,
-						"javascript"
+						JAVASCRIPT_TYPE
 					);
 					if (modules) {
 						const xor = new StringXor();
@@ -527,7 +529,8 @@ class JavascriptModulesPlugin {
 					}
 				);
 				compilation.hooks.executeModule.tap(PLUGIN_NAME, (options, context) => {
-					const source = options.codeGenerationResult.sources.get("javascript");
+					const source =
+						options.codeGenerationResult.sources.get(JAVASCRIPT_TYPE);
 					if (source === undefined) return;
 					const { module } = options;
 					const code = source.source();
@@ -615,11 +618,12 @@ class JavascriptModulesPlugin {
 			runtimeTemplate,
 			codeGenerationResults,
 			strictMode,
-			factory
+			factory,
+			renderInObject
 		} = renderContext;
 		try {
 			const codeGenResult = codeGenerationResults.get(module, chunk.runtime);
-			const moduleSource = codeGenResult.sources.get("javascript");
+			const moduleSource = codeGenResult.sources.get(JAVASCRIPT_TYPE);
 			if (!moduleSource) return null;
 			if (codeGenResult.data !== undefined) {
 				const chunkInitFragments = codeGenResult.data.get("chunkInitFragments");
@@ -654,6 +658,8 @@ class JavascriptModulesPlugin {
 				const cacheEntry = this._moduleFactoryCache.get(
 					moduleSourcePostContent
 				);
+				const renderShorthand =
+					renderInObject === true && runtimeTemplate.supportsMethodShorthand();
 				let source;
 				if (
 					cacheEntry &&
@@ -661,7 +667,8 @@ class JavascriptModulesPlugin {
 					cacheEntry.needExports === needExports &&
 					cacheEntry.needRequire === needRequire &&
 					cacheEntry.needThisAsExports === needThisAsExports &&
-					cacheEntry.needStrict === needStrict
+					cacheEntry.needStrict === needStrict &&
+					cacheEntry.renderShorthand === renderShorthand
 				) {
 					source = cacheEntry.source;
 				} else {
@@ -682,16 +689,24 @@ class JavascriptModulesPlugin {
 						);
 					}
 					if (needRequire) args.push(RuntimeGlobals.require);
-					if (!needThisAsExports && runtimeTemplate.supportsArrowFunction()) {
+
+					if (renderShorthand) {
+						// we can optimize function to methodShorthand if render module factory in object
+						factorySource.add(`(${args.join(", ")}) {\n\n`);
+					} else if (
+						!needThisAsExports &&
+						runtimeTemplate.supportsArrowFunction()
+					) {
 						factorySource.add(`/***/ ((${args.join(", ")}) => {\n\n`);
 					} else {
 						factorySource.add(`/***/ (function(${args.join(", ")}) {\n\n`);
 					}
+
 					if (needStrict) {
 						factorySource.add('"use strict";\n');
 					}
 					factorySource.add(moduleSourcePostContent);
-					factorySource.add("\n\n/***/ })");
+					factorySource.add(`\n\n/***/ }${renderShorthand ? "" : ")"}`);
 					source = new CachedSource(factorySource);
 					this._moduleFactoryCache.set(moduleSourcePostContent, {
 						source,
@@ -699,7 +714,8 @@ class JavascriptModulesPlugin {
 						needExports,
 						needRequire,
 						needThisAsExports,
-						needStrict
+						needStrict,
+						renderShorthand
 					});
 				}
 				moduleSourcePostContainer = tryRunOrWebpackError(
@@ -734,7 +750,7 @@ class JavascriptModulesPlugin {
 		const { chunk, chunkGraph } = renderContext;
 		const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType(
 			chunk,
-			"javascript",
+			JAVASCRIPT_TYPE,
 			compareModulesByIdOrIdentifier(chunkGraph)
 		);
 		const allModules = modules ? [...modules] : [];
@@ -757,12 +773,15 @@ class JavascriptModulesPlugin {
 			strictMode: allStrict
 		};
 		const moduleSources =
-			Template.renderChunkModules(chunkRenderContext, allModules, (module) =>
-				this.renderModule(
-					module,
-					{ ...chunkRenderContext, factory: true },
-					hooks
-				)
+			Template.renderChunkModules(
+				chunkRenderContext,
+				allModules,
+				(module, renderInObject) =>
+					this.renderModule(
+						module,
+						{ ...chunkRenderContext, factory: true, renderInObject },
+						hooks
+					)
 			) || new RawSource("{}");
 		let source = tryRunOrWebpackError(
 			() => hooks.renderChunk.call(moduleSources, chunkRenderContext),
@@ -818,7 +837,7 @@ class JavascriptModulesPlugin {
 		const allModules = [
 			...(chunkGraph.getOrderedChunkModulesIterableBySourceType(
 				chunk,
-				"javascript",
+				JAVASCRIPT_TYPE,
 				compareModulesByIdOrIdentifier(chunkGraph)
 			) || [])
 		];
@@ -874,10 +893,10 @@ class JavascriptModulesPlugin {
 						(m) => !(/** @type {Set<Module>} */ (inlinedModules).has(m))
 					)
 				: allModules,
-			(module) =>
+			(module, renderInObject) =>
 				this.renderModule(
 					module,
-					{ ...chunkRenderContext, factory: true },
+					{ ...chunkRenderContext, factory: true, renderInObject },
 					hooks
 				),
 			prefix
@@ -1280,7 +1299,9 @@ class JavascriptModulesPlugin {
 					entryModule,
 					entrypoint
 				] of chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)) {
-					if (!chunkGraph.getModuleSourceTypes(entryModule).has("javascript")) {
+					if (
+						!chunkGraph.getModuleSourceTypes(entryModule).has(JAVASCRIPT_TYPE)
+					) {
 						i--;
 						continue;
 					}
@@ -1540,6 +1561,19 @@ class JavascriptModulesPlugin {
 					])
 				: Template.indent("return cachedModule.exports;"),
 			"}",
+			// Add helpful error message in development mode when module is not found
+			...(outputOptions.pathinfo
+				? [
+						"// Check if module exists (development only)",
+						"if (__webpack_modules__[moduleId] === undefined) {",
+						Template.indent([
+							'var e = new Error("Cannot find module \'" + moduleId + "\'");',
+							"e.code = 'MODULE_NOT_FOUND';",
+							"throw e;"
+						]),
+						"}"
+					]
+				: []),
 			"// Create a new module (and put it into the cache)",
 			"var module = __webpack_module_cache__[moduleId] = {",
 			Template.indent([
@@ -1652,7 +1686,6 @@ class JavascriptModulesPlugin {
 		const inlinedModulesToInfo = new Map();
 		/** @type {Set<string>} */
 		const nonInlinedModuleThroughIdentifiers = new Set();
-		/** @type {Map<Module, Source>} */
 
 		for (const m of allModules) {
 			const isInlinedModule = inlinedModules && inlinedModules.has(m);

package/lib/javascript/JavascriptParser.js

@@ -100,6 +100,19 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 
+/** @typedef {import("../dependencies/LocalModule")} LocalModule */
+/** @typedef {import("../dependencies/HarmonyExportImportedSpecifierDependency").HarmonyStarExportsList} HarmonyStarExportsList */
+
+/**
+ * @typedef {object} KnownJavascriptParserState
+ * @property {Set<string>=} harmonyNamedExports
+ * @property {HarmonyStarExportsList=} harmonyStarExports
+ * @property {number=} lastHarmonyImportOrder
+ * @property {LocalModule[]=} localModules
+ */
+
+/** @typedef {ParserState & KnownJavascriptParserState} JavascriptParserState */
+
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Module")} Module */
 
@@ -666,7 +679,7 @@ class JavascriptParser extends Parser {
 
 		/** @type {ScopeInfo} */
 		this.scope = /** @type {EXPECTED_ANY} */ (undefined);
-		/** @type {ParserState} */
+		/** @type {JavascriptParserState} */
 		this.state = /** @type {EXPECTED_ANY} */ (undefined);
 		/** @type {Comment[] | undefined} */
 		this.comments = undefined;
@@ -1898,7 +1911,7 @@ class JavascriptParser extends Parser {
 			const expr = /** @type {ChainExpression} */ (_expr);
 			/** @type {Expression[]} */
 			const optionalExpressionsStack = [];
-			/** @type {Expression|Super} */
+			/** @type {Expression | Super} */
 			let next = expr.expression;
 
 			while (
@@ -5133,7 +5146,7 @@ class JavascriptParser extends Parser {
 		if (comments.length === 0) {
 			return EMPTY_COMMENT_OPTIONS;
 		}
-		/** @type {Record<string, EXPECTED_ANY> } */
+		/** @type {Record<string, EXPECTED_ANY>} */
 		const options = {};
 		/** @type {(Error & { comment: Comment })[]} */
 		const errors = [];
@@ -5235,8 +5248,8 @@ class JavascriptParser extends Parser {
 		return { info, name };
 	}
 
-	/** @typedef {{ type: "call", call: CallExpression, calleeName: string, rootInfo: string | VariableInfo, getCalleeMembers: () => CalleeMembers, name: string, getMembers: () => Members, getMembersOptionals: () => MembersOptionals, getMemberRanges: () => MemberRanges}} CallExpressionInfo */
-	/** @typedef {{ type: "expression", rootInfo: string | VariableInfo, name: string, getMembers: () => Members, getMembersOptionals: () => MembersOptionals, getMemberRanges: () => MemberRanges}} ExpressionExpressionInfo */
+	/** @typedef {{ type: "call", call: CallExpression, calleeName: string, rootInfo: string | VariableInfo, getCalleeMembers: () => CalleeMembers, name: string, getMembers: () => Members, getMembersOptionals: () => MembersOptionals, getMemberRanges: () => MemberRanges }} CallExpressionInfo */
+	/** @typedef {{ type: "expression", rootInfo: string | VariableInfo, name: string, getMembers: () => Members, getMembersOptionals: () => MembersOptionals, getMemberRanges: () => MemberRanges }} ExpressionExpressionInfo */
 
 	/**
 	 * @param {Expression | Super} expression a member expression
@@ -5297,7 +5310,7 @@ class JavascriptParser extends Parser {
 
 	/**
 	 * @param {Expression} expression an expression
-	 * @returns {{ name: string, rootInfo: ExportedVariableInfo, getMembers: () => Members} | undefined} name info
+	 * @returns {{ name: string, rootInfo: ExportedVariableInfo, getMembers: () => Members } | undefined} name info
 	 */
 	getNameForExpression(expression) {
 		return this.getMemberExpressionInfo(

package/lib/json/JsonGenerator.js

@@ -9,7 +9,7 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const { UsageState } = require("../ExportsInfo");
 const Generator = require("../Generator");
-const { JS_TYPES } = require("../ModuleSourceTypesConstants");
+const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -17,6 +17,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
@@ -26,7 +27,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 
 /**
  * @param {JsonValue} data Raw JSON data
- * @returns {undefined|string} stringified data
+ * @returns {undefined | string} stringified data
  */
 const stringifySafe = (data) => {
 	const stringified = JSON.stringify(data);
@@ -132,12 +133,12 @@ class JsonGenerator 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) {

package/lib/json/JsonParser.js

@@ -54,7 +54,8 @@ class JsonParser extends Parser {
 					: parseFn(source[0] === "\uFEFF" ? source.slice(1) : source);
 		} catch (err) {
 			throw new Error(
-				`Cannot parse JSON: ${/** @type {Error} */ (err).message}`
+				`Cannot parse JSON: ${/** @type {Error} */ (err).message}`,
+				{ cause: err }
 			);
 		}
 		const jsonData = new JsonData(/** @type {Buffer | JsonValue} */ (data));

package/lib/library/AbstractLibraryPlugin.js

@@ -308,7 +308,7 @@ class AbstractLibraryPlugin {
 	 * @param {Source} source source
 	 * @param {Module} module module
 	 * @param {ModuleRenderContext} renderContext render context
-	 * @param {Omit<LibraryContext<T>, 'options'>} libraryContext context
+	 * @param {Omit<LibraryContext<T>, "options">} libraryContext context
 	 * @returns {Source} source with library export
 	 */
 	renderModuleContent(source, module, renderContext, libraryContext) {

package/lib/library/AmdLibraryPlugin.js

@@ -17,7 +17,10 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
 /** @typedef {import("../util/Hash")} Hash */
-/** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
+/**
+ * @template T
+ * @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T>
+ */
 
 /**
  * @typedef {object} AmdLibraryPluginOptions

package/lib/library/ExportPropertyLibraryPlugin.js

@@ -20,7 +20,10 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").StartupRenderContext} StartupRenderContext */
-/** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
+/**
+ * @template T
+ * @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T>
+ */
 
 /**
  * @typedef {object} ExportPropertyLibraryPluginParsed

package/lib/library/ModuleLibraryPlugin.js

@@ -21,6 +21,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").StartupRenderContext} StartupRenderContext */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").ModuleRenderContext} ModuleRenderContext */
@@ -69,7 +70,28 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			const { onDemandExportsGeneration } =
 				ConcatenatedModule.getCompilationHooks(compilation);
-			onDemandExportsGeneration.tap(PLUGIN_NAME, (_module) => true);
+			onDemandExportsGeneration.tap(
+				PLUGIN_NAME,
+				(module, runtimes, source, finalName) => {
+					/** @type {BuildMeta} */
+					const buildMeta = module.buildMeta || (module.buildMeta = {});
+
+					const exportsSourceByRuntime =
+						buildMeta.exportsSourceByRuntime ||
+						(buildMeta.exportsSourceByRuntime = new Map());
+
+					const exportsFinalNameByRuntime =
+						buildMeta.exportsFinalNameByRuntime ||
+						(buildMeta.exportsFinalNameByRuntime = new Map());
+
+					for (const runtime of runtimes) {
+						exportsSourceByRuntime.set(runtime, source);
+						exportsFinalNameByRuntime.set(runtime, finalName);
+					}
+
+					return true;
+				}
+			);
 		});
 	}
 
@@ -152,10 +174,16 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 					)
 				]
 			: moduleGraph.getExportsInfo(module).orderedExports;
+
+		const exportsFinalNameByRuntime =
+			(module.buildMeta &&
+				module.buildMeta.exportsFinalNameByRuntime &&
+				module.buildMeta.exportsFinalNameByRuntime.get(chunk.runtime)) ||
+			{};
+
 		const definitions =
-			inlined && !inlinedInIIFE
-				? (module.buildMeta && module.buildMeta.exportsFinalName) || {}
-				: {};
+			inlined && !inlinedInIIFE ? exportsFinalNameByRuntime : {};
+
 		/** @type {string[]} */
 		const shortHandedExports = [];
 		/** @type {[string, string][]} */
@@ -268,23 +296,23 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 	 * @param {Source} source source
 	 * @param {Module} module module
 	 * @param {ModuleRenderContext} renderContext render context
-	 * @param {Omit<LibraryContext<T>, 'options'>} libraryContext context
+	 * @param {Omit<LibraryContext<T>, "options">} libraryContext context
 	 * @returns {Source} source with library export
 	 */
 	renderModuleContent(
 		source,
 		module,
-		{ factory, inlinedInIIFE },
+		{ factory, inlinedInIIFE, chunk },
 		libraryContext
 	) {
-		// Re-add `factoryExportsBinding` to the source
-		// when the module is rendered as a factory or treated as an inlined (startup) module but wrapped in an IIFE
-		if (
-			(inlinedInIIFE || factory) &&
+		const exportsSource =
 			module.buildMeta &&
-			module.buildMeta.factoryExportsBinding
-		) {
-			return new ConcatSource(module.buildMeta.factoryExportsBinding, source);
+			module.buildMeta.exportsSourceByRuntime &&
+			module.buildMeta.exportsSourceByRuntime.get(chunk.runtime);
+
+		// Re-add the module's exports source when rendered in factory or as an inlined startup module wrapped in an IIFE
+		if ((inlinedInIIFE || factory) && exportsSource) {
+			return new ConcatSource(exportsSource, source);
 		}
 		return source;
 	}

package/lib/library/SystemLibraryPlugin.js

@@ -19,7 +19,10 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
 /** @typedef {import("../util/Hash")} Hash */
-/** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
+/**
+ * @template T
+ * @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T>
+ */
 
 /**
  * @typedef {object} SystemLibraryPluginOptions

package/lib/library/UmdLibraryPlugin.js

@@ -34,7 +34,7 @@ const accessorToObjectAccess = (accessor) =>
 /** @typedef {string | string[]} Accessor */
 
 /**
- * @param {string|undefined} base the path prefix
+ * @param {string | undefined} base the path prefix
  * @param {Accessor} accessor the accessor
  * @param {string=} joinWith the element separator
  * @returns {string} the path

package/lib/logging/Logger.js

@@ -30,6 +30,7 @@ const LogType = Object.freeze({
 module.exports.LogType = LogType;
 
 /** @typedef {typeof LogType[keyof typeof LogType]} LogTypeEnum */
+/** @typedef {Map<string | undefined, [number, number]>} TimersMap */
 
 const LOG_SYMBOL = Symbol("webpack logger raw log method");
 const TIMERS_SYMBOL = Symbol("webpack logger times");
@@ -143,7 +144,7 @@ class WebpackLogger {
 	 * @param {string} label label
 	 */
 	time(label) {
-		/** @type {Map<string | undefined, [number, number]>} */
+		/** @type {TimersMap} */
 		this[TIMERS_SYMBOL] = this[TIMERS_SYMBOL] || new Map();
 		this[TIMERS_SYMBOL].set(label, process.hrtime());
 	}
@@ -169,7 +170,7 @@ class WebpackLogger {
 			throw new Error(`No such label '${label}' for WebpackLogger.timeEnd()`);
 		}
 		const time = process.hrtime(prev);
-		/** @type {Map<string | undefined, [number, number]>} */
+		/** @type {TimersMap} */
 		(this[TIMERS_SYMBOL]).delete(label);
 		this[LOG_SYMBOL](LogType.time, [label, ...time]);
 	}
@@ -185,9 +186,9 @@ class WebpackLogger {
 			);
 		}
 		const time = process.hrtime(prev);
-		/** @type {Map<string | undefined, [number, number]>} */
+		/** @type {TimersMap} */
 		(this[TIMERS_SYMBOL]).delete(label);
-		/** @type {Map<string | undefined, [number, number]>} */
+		/** @type {TimersMap} */
 		this[TIMERS_AGGREGATES_SYMBOL] =
 			this[TIMERS_AGGREGATES_SYMBOL] || new Map();
 		const current = this[TIMERS_AGGREGATES_SYMBOL].get(label);

package/lib/logging/createConsoleLogger.js

@@ -35,8 +35,8 @@ const { LogType } = require("./Logger");
 
 /**
  * @typedef {object} LoggerOptions
- * @property {false|true|"none"|"error"|"warn"|"info"|"log"|"verbose"} level loglevel
- * @property {FilterTypes|boolean} debug filter for debug logging
+ * @property {false | true | "none" | "error" | "warn" | "info" | "log" | "verbose"} level loglevel
+ * @property {FilterTypes | boolean} debug filter for debug logging
  * @property {LoggerConsole} console the console to log to
  */