webpack 5.89.0 → 5.90.0

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -90,7 +90,7 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 							'script.setAttribute("fetchpriority", fetchPriority);'
 						),
 						"}"
-				  ])
+					])
 				: "",
 			`script.src = ${
 				this._withCreateScriptUrl
@@ -106,7 +106,7 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 								`script.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
 							),
 							"}"
-					  ])
+						])
 				: ""
 		]);
 

package/lib/runtime/StartupChunkDependenciesRuntimeModule.js

@@ -46,28 +46,29 @@ class StartupChunkDependenciesRuntimeModule extends RuntimeModule {
 							)
 							.concat("return next();")
 					: chunkIds.length === 1
-					? `return ${RuntimeGlobals.ensureChunk}(${JSON.stringify(
-							chunkIds[0]
-					  )}).then(next);`
-					: chunkIds.length > 2
-					? [
-							// using map is shorter for 3 or more chunks
-							`return Promise.all(${JSON.stringify(chunkIds)}.map(${
-								RuntimeGlobals.ensureChunk
-							}, ${RuntimeGlobals.require})).then(next);`
-					  ]
-					: [
-							// calling ensureChunk directly is shorter for 0 - 2 chunks
-							"return Promise.all([",
-							Template.indent(
-								chunkIds
-									.map(
-										id => `${RuntimeGlobals.ensureChunk}(${JSON.stringify(id)})`
-									)
-									.join(",\n")
-							),
-							"]).then(next);"
-					  ]
+						? `return ${RuntimeGlobals.ensureChunk}(${JSON.stringify(
+								chunkIds[0]
+							)}).then(next);`
+						: chunkIds.length > 2
+							? [
+									// using map is shorter for 3 or more chunks
+									`return Promise.all(${JSON.stringify(chunkIds)}.map(${
+										RuntimeGlobals.ensureChunk
+									}, ${RuntimeGlobals.require})).then(next);`
+								]
+							: [
+									// calling ensureChunk directly is shorter for 0 - 2 chunks
+									"return Promise.all([",
+									Template.indent(
+										chunkIds
+											.map(
+												id =>
+													`${RuntimeGlobals.ensureChunk}(${JSON.stringify(id)})`
+											)
+											.join(",\n")
+									),
+									"]).then(next);"
+								]
 			)};`
 		]);
 	}

package/lib/runtime/StartupEntrypointRuntimeModule.js

@@ -41,12 +41,12 @@ class StartupEntrypointRuntimeModule extends RuntimeModule {
 							"var r = fn();",
 							"return r === undefined ? result : r;"
 						])})`
-				  ]
+					]
 				: [
 						`chunkIds.map(${RuntimeGlobals.ensureChunk}, ${RuntimeGlobals.require})`,
 						"var r = fn();",
 						"return r === undefined ? result : r;"
-				  ])
+					])
 		])}`;
 	}
 }

package/lib/schemes/HttpUriPlugin.js

@@ -200,7 +200,7 @@ class Lockfile {
 					: {
 							resolved: key,
 							...entry
-					  }
+						}
 			);
 		}
 		return lockfile;

package/lib/serialization/FileMiddleware.js

@@ -60,23 +60,23 @@ const DECOMPRESSION_CHUNK_SIZE = 100 * 1024 * 1024;
 const writeUInt64LE = Buffer.prototype.writeBigUInt64LE
 	? (buf, value, offset) => {
 			buf.writeBigUInt64LE(BigInt(value), offset);
-	  }
+		}
 	: (buf, value, offset) => {
 			const low = value % 0x100000000;
 			const high = (value - low) / 0x100000000;
 			buf.writeUInt32LE(low, offset);
 			buf.writeUInt32LE(high, offset + 4);
-	  };
+		};
 
 const readUInt64LE = Buffer.prototype.readBigUInt64LE
 	? (buf, offset) => {
 			return Number(buf.readBigUInt64LE(offset));
-	  }
+		}
 	: (buf, offset) => {
 			const low = buf.readUInt32LE(offset);
 			const high = buf.readUInt32LE(offset + 4);
 			return high * 0x100000000 + low;
-	  };
+		};
 
 /**
  * @typedef {Object} SerializeResult

package/lib/serialization/ObjectMiddleware.js

@@ -718,10 +718,10 @@ class ObjectMiddleware extends SerializerMiddleware {
 						const name = !serializerEntry
 							? "unknown"
 							: !serializerEntry[1].request
-							? serializerEntry[0].name
-							: serializerEntry[1].name
-							? `${serializerEntry[1].request} ${serializerEntry[1].name}`
-							: serializerEntry[1].request;
+								? serializerEntry[0].name
+								: serializerEntry[1].name
+									? `${serializerEntry[1].request} ${serializerEntry[1].name}`
+									: serializerEntry[1].request;
 						err.message += `\n(during deserialization of ${name})`;
 						throw err;
 					}

package/lib/sharing/ConsumeSharedPlugin.js

@@ -60,7 +60,7 @@ class ConsumeSharedPlugin {
 				let result =
 					item === key || !isRequiredVersion(item)
 						? // item is a request/key
-						  {
+							{
 								import: key,
 								shareScope: options.shareScope || "default",
 								shareKey: key,
@@ -69,10 +69,10 @@ class ConsumeSharedPlugin {
 								strictVersion: false,
 								singleton: false,
 								eager: false
-						  }
+							}
 						: // key is a request/key
-						  // item is a version
-						  {
+							// item is a version
+							{
 								import: key,
 								shareScope: options.shareScope || "default",
 								shareKey: key,
@@ -81,7 +81,7 @@ class ConsumeSharedPlugin {
 								packageName: undefined,
 								singleton: false,
 								eager: false
-						  };
+							};
 				return result;
 			},
 			(item, key) => ({

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -179,7 +179,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 					? runtimeTemplate.basicFunction("", "")
 					: runtimeTemplate.basicFunction("msg", [
 							'if (typeof console !== "undefined" && console.warn) console.warn(msg);'
-					  ])
+						])
 			};`,
 			`var warnInvalidVersion = ${runtimeTemplate.basicFunction(
 				"scope, scopeName, key, requiredVersion",
@@ -312,7 +312,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 								`module.exports = factory();`
 							])}`
 						])});`
-				  ])
+					])
 				: "// no consumes in initial chunks",
 			this._runtimeRequirements.has(RuntimeGlobals.ensureChunkHandlers)
 				? Template.asString([
@@ -321,6 +321,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 							null,
 							"\t"
 						)};`,
+						"var startedInstallModules = {};",
 						`${
 							RuntimeGlobals.ensureChunkHandlers
 						}.consumes = ${runtimeTemplate.basicFunction("chunkId, promises", [
@@ -330,6 +331,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 									"id",
 									[
 										`if(${RuntimeGlobals.hasOwnProperty}(installedModules, id)) return promises.push(installedModules[id]);`,
+										"if(!startedInstallModules[id]) {",
 										`var onFactory = ${runtimeTemplate.basicFunction(
 											"factory",
 											[
@@ -342,6 +344,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 												])}`
 											]
 										)};`,
+										"startedInstallModules[id] = true;",
 										`var onError = ${runtimeTemplate.basicFunction("error", [
 											"delete installedModules[id];",
 											`${
@@ -360,13 +363,14 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 											),
 											"} else onFactory(promise);"
 										]),
-										"} catch(e) { onError(e); }"
+										"} catch(e) { onError(e); }",
+										"}"
 									]
 								)});`
 							]),
 							"}"
 						])}`
-				  ])
+					])
 				: "// no chunk loading of consumes"
 		]);
 	}

package/lib/sharing/ProvideSharedModule.js

@@ -141,13 +141,13 @@ class ProvideSharedModule extends Module {
 						chunkGraph,
 						request: this._request,
 						runtimeRequirements
-				  })
+					})
 				: runtimeTemplate.asyncModuleFactory({
 						block: this.blocks[0],
 						chunkGraph,
 						request: this._request,
 						runtimeRequirements
-				  })
+					})
 		}${this._eager ? ", 1" : ""});`;
 		const sources = new Map();
 		const data = new Map();

package/lib/sharing/SharePlugin.js

@@ -34,11 +34,11 @@ class SharePlugin {
 					item === key || !isRequiredVersion(item)
 						? {
 								import: item
-						  }
+							}
 						: {
 								import: key,
 								requiredVersion: item
-						  };
+							};
 				return config;
 			},
 			item => item

package/lib/sharing/ShareRuntimeModule.js

@@ -89,7 +89,7 @@ class ShareRuntimeModule extends RuntimeModule {
 							? runtimeTemplate.basicFunction("", "")
 							: runtimeTemplate.basicFunction("msg", [
 									'if (typeof console !== "undefined" && console.warn) console.warn(msg);'
-							  ])
+								])
 					};`,
 					`var uniqueName = ${JSON.stringify(uniqueName || undefined)};`,
 					`var register = ${runtimeTemplate.basicFunction(

package/lib/sharing/utils.js

@@ -371,33 +371,29 @@ const getDescriptionFile = (fs, directory, descriptionFiles, callback) => {
 };
 exports.getDescriptionFile = getDescriptionFile;
 
-exports.getRequiredVersionFromDescriptionFile = (data, packageName) => {
-	if (
-		data.optionalDependencies &&
-		typeof data.optionalDependencies === "object" &&
-		packageName in data.optionalDependencies
-	) {
-		return normalizeVersion(data.optionalDependencies[packageName]);
-	}
-	if (
-		data.dependencies &&
-		typeof data.dependencies === "object" &&
-		packageName in data.dependencies
-	) {
-		return normalizeVersion(data.dependencies[packageName]);
-	}
-	if (
-		data.peerDependencies &&
-		typeof data.peerDependencies === "object" &&
-		packageName in data.peerDependencies
-	) {
-		return normalizeVersion(data.peerDependencies[packageName]);
-	}
-	if (
-		data.devDependencies &&
-		typeof data.devDependencies === "object" &&
-		packageName in data.devDependencies
-	) {
-		return normalizeVersion(data.devDependencies[packageName]);
+/**
+ *
+ * @param {object} data description file data i.e.: package.json
+ * @param {string} packageName name of the dependency
+ * @returns {string} normalized version
+ */
+const getRequiredVersionFromDescriptionFile = (data, packageName) => {
+	const dependencyTypes = [
+		"optionalDependencies",
+		"dependencies",
+		"peerDependencies",
+		"devDependencies"
+	];
+
+	for (const dependencyType of dependencyTypes) {
+		if (
+			data[dependencyType] &&
+			typeof data[dependencyType] === "object" &&
+			packageName in data[dependencyType]
+		) {
+			return normalizeVersion(data[dependencyType][packageName]);
+		}
 	}
 };
+exports.getRequiredVersionFromDescriptionFile =
+	getRequiredVersionFromDescriptionFile;

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -1068,7 +1068,7 @@ const SIMPLE_EXTRACTORS = {
 
 								return childStatsChunkGroup;
 							})
-					  )
+						)
 					: undefined,
 				childAssets: children
 					? mapObject(children, groups => {
@@ -1082,7 +1082,7 @@ const SIMPLE_EXTRACTORS = {
 								}
 							}
 							return Array.from(set);
-					  })
+						})
 					: undefined
 			};
 			Object.assign(object, statsChunkGroup);
@@ -1379,8 +1379,8 @@ const SIMPLE_EXTRACTORS = {
 					chunk.runtime === undefined
 						? undefined
 						: typeof chunk.runtime === "string"
-						? [makePathsRelative(chunk.runtime)]
-						: Array.from(chunk.runtime.sort(), makePathsRelative),
+							? [makePathsRelative(chunk.runtime)]
+							: Array.from(chunk.runtime.sort(), makePathsRelative),
 				files: Array.from(chunk.files),
 				auxiliaryFiles: Array.from(chunk.auxiliaryFiles).sort(compareIds),
 				hash: chunk.renderedHash,
@@ -1633,8 +1633,8 @@ const getItemSize = item => {
 	return !item.children
 		? 1
 		: item.filteredChildren
-		? 2 + getTotalSize(item.children)
-		: 1 + getTotalSize(item.children);
+			? 2 + getTotalSize(item.children)
+			: 1 + getTotalSize(item.children);
 };
 
 const getTotalSize = children => {
@@ -1912,13 +1912,13 @@ const ASSETS_GROUPERS = {
 								[name]: !!key,
 								filteredChildren: assets.length,
 								...assetGroup(children, assets)
-						  }
+							}
 						: {
 								type: "assets by status",
 								[name]: !!key,
 								children,
 								...assetGroup(children, assets)
-						  };
+							};
 				}
 			});
 		};
@@ -2169,8 +2169,8 @@ const MODULES_GROUPERS = type => ({
 						type: isDataUrl
 							? "modules by mime type"
 							: groupModulesByPath
-							? "modules by path"
-							: "modules by extension",
+								? "modules by path"
+								: "modules by extension",
 						name: isDataUrl ? key.slice(/* 'data:'.length */ 5) : key,
 						children,
 						...moduleGroup(children, modules)

package/lib/stats/DefaultStatsPresetPlugin.js

@@ -197,8 +197,8 @@ const DEFAULTS = {
 		runtime !== undefined
 			? runtime
 			: forToString
-			? all === true
-			: all !== false,
+				? all === true
+				: all !== false,
 	cachedModules: ({ all, cached }, { forToString }) =>
 		cached !== undefined ? cached : forToString ? all === true : all !== false,
 	moduleAssets: OFF_FOR_TO_STRING,
@@ -238,11 +238,7 @@ const DEFAULTS = {
 const normalizeFilter = item => {
 	if (typeof item === "string") {
 		const regExp = new RegExp(
-			`[\\\\/]${item.replace(
-				// eslint-disable-next-line no-useless-escape
-				/[-[\]{}()*+?.\\^$|]/g,
-				"\\$&"
-			)}([\\\\/]|$|!|\\?)`
+			`[\\\\/]${item.replace(/[-[\]{}()*+?.\\^$|]/g, "\\$&")}([\\\\/]|$|!|\\?)`
 		);
 		return ident => regExp.test(ident);
 	}

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -128,7 +128,7 @@ const SIMPLE_PRINTERS = {
 			warningsCount > 0
 				? yellow(
 						`${warningsCount} ${plural(warningsCount, "warning", "warnings")}`
-				  )
+					)
 				: "";
 		const errorsMessage =
 			errorsCount > 0
@@ -143,10 +143,10 @@ const SIMPLE_PRINTERS = {
 			root && name
 				? bold(name)
 				: name
-				? `Child ${bold(name)}`
-				: root
-				? ""
-				: "Child";
+					? `Child ${bold(name)}`
+					: root
+						? ""
+						: "Child";
 		const subjectMessage =
 			nameMessage && versionMessage
 				? `${nameMessage} (${versionMessage})`
@@ -180,7 +180,7 @@ const SIMPLE_PRINTERS = {
 					count,
 					"warning has",
 					"warnings have"
-			  )} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.`
+				)} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.`
 			: undefined,
 	"compilation.filteredErrorDetailsCount": (count, { yellow }) =>
 		count
@@ -190,7 +190,7 @@ const SIMPLE_PRINTERS = {
 						"error has",
 						"errors have"
 					)} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.`
-			  )
+				)
 			: undefined,
 	"compilation.env": (env, { bold }) =>
 		env
@@ -204,7 +204,7 @@ const SIMPLE_PRINTERS = {
 			: printer.print(context.type, Object.values(entrypoints), {
 					...context,
 					chunkGroupKind: "Entrypoint"
-			  }),
+				}),
 	"compilation.namedChunkGroups": (namedChunkGroups, context, printer) => {
 		if (!Array.isArray(namedChunkGroups)) {
 			const {
@@ -234,15 +234,18 @@ const SIMPLE_PRINTERS = {
 					filteredModules,
 					"module",
 					"modules"
-			  )}`
+				)}`
 			: undefined,
-	"compilation.filteredAssets": (filteredAssets, { compilation: { assets } }) =>
+	"compilation.filteredAssets": (
+		filteredAssets,
+		{ compilation: { assets } }
+	) =>
 		filteredAssets > 0
 			? `${moreCount(assets, filteredAssets)} ${plural(
 					filteredAssets,
 					"asset",
 					"assets"
-			  )}`
+				)}`
 			: undefined,
 	"compilation.logging": (logging, context, printer) =>
 		Array.isArray(logging)
@@ -251,7 +254,7 @@ const SIMPLE_PRINTERS = {
 					context.type,
 					Object.entries(logging).map(([name, value]) => ({ ...value, name })),
 					context
-			  ),
+				),
 	"compilation.warningsInChildren!": (_, { yellow, compilation }) => {
 		if (
 			!compilation.children &&
@@ -324,7 +327,7 @@ const SIMPLE_PRINTERS = {
 					sourceFilename === true
 						? "from source file"
 						: `from: ${sourceFilename}`
-			  )
+				)
 			: undefined,
 	"asset.info.development": (development, { green, formatFlag }) =>
 		development ? green(formatFlag("dev")) : undefined,
@@ -339,7 +342,7 @@ const SIMPLE_PRINTERS = {
 					filteredRelated,
 					"asset",
 					"assets"
-			  )}`
+				)}`
 			: undefined,
 	"asset.filteredChildren": (filteredChildren, { asset: { children } }) =>
 		filteredChildren > 0
@@ -347,7 +350,7 @@ const SIMPLE_PRINTERS = {
 					filteredChildren,
 					"asset",
 					"assets"
-			  )}`
+				)}`
 			: undefined,
 
 	assetChunk: (id, { formatChunkId }) => formatChunkId(id),
@@ -393,22 +396,22 @@ const SIMPLE_PRINTERS = {
 					formatFlag(
 						`${assets.length} ${plural(assets.length, "asset", "assets")}`
 					)
-			  )
+				)
 			: undefined,
 	"module.warnings": (warnings, { formatFlag, yellow }) =>
 		warnings === true
 			? yellow(formatFlag("warnings"))
 			: warnings
-			? yellow(
-					formatFlag(`${warnings} ${plural(warnings, "warning", "warnings")}`)
-			  )
-			: undefined,
+				? yellow(
+						formatFlag(`${warnings} ${plural(warnings, "warning", "warnings")}`)
+					)
+				: undefined,
 	"module.errors": (errors, { formatFlag, red }) =>
 		errors === true
 			? red(formatFlag("errors"))
 			: errors
-			? red(formatFlag(`${errors} ${plural(errors, "error", "errors")}`))
-			: undefined,
+				? red(formatFlag(`${errors} ${plural(errors, "error", "errors")}`))
+				: undefined,
 	"module.providedExports": (providedExports, { formatFlag, cyan }) => {
 		if (Array.isArray(providedExports)) {
 			if (providedExports.length === 0) return cyan(formatFlag("no exports"));
@@ -449,7 +452,7 @@ const SIMPLE_PRINTERS = {
 					filteredModules,
 					"module",
 					"modules"
-			  )}`
+				)}`
 			: undefined,
 	"module.filteredReasons": (filteredReasons, { module: { reasons } }) =>
 		filteredReasons > 0
@@ -457,7 +460,7 @@ const SIMPLE_PRINTERS = {
 					filteredReasons,
 					"reason",
 					"reasons"
-			  )}`
+				)}`
 			: undefined,
 	"module.filteredChildren": (filteredChildren, { module: { children } }) =>
 		filteredChildren > 0
@@ -465,7 +468,7 @@ const SIMPLE_PRINTERS = {
 					filteredChildren,
 					"module",
 					"modules"
-			  )}`
+				)}`
 			: undefined,
 	"module.separator!": () => "\n",
 
@@ -492,7 +495,7 @@ const SIMPLE_PRINTERS = {
 					filteredChildren,
 					"reason",
 					"reasons"
-			  )}`
+				)}`
 			: undefined,
 
 	"module.profile.total": (value, { formatTime }) => formatTime(value),
@@ -533,7 +536,7 @@ const SIMPLE_PRINTERS = {
 					n,
 					"asset",
 					"assets"
-			  )}`
+				)}`
 			: undefined,
 	"chunkGroup.is!": () => "=",
 	"chunkGroupAsset.name": (asset, { green }) => green(asset),
@@ -552,7 +555,7 @@ const SIMPLE_PRINTERS = {
 						children: children[key]
 					})),
 					context
-			  ),
+				),
 	"chunkGroupChildGroup.type": type => `${type}:`,
 	"chunkGroupChild.assets[]": (file, { formatFilename }) =>
 		formatFilename(file),
@@ -581,7 +584,7 @@ const SIMPLE_PRINTERS = {
 						children: childrenByOrder[key]
 					})),
 					context
-			  ),
+				),
 	"chunk.childrenByOrder[].type": type => `${type}:`,
 	"chunk.childrenByOrder[].children[]": (id, { formatChunkId }) =>
 		isValidId(id) ? formatChunkId(id) : undefined,
@@ -600,7 +603,7 @@ const SIMPLE_PRINTERS = {
 					filteredModules,
 					"module",
 					"modules"
-			  )}`
+				)}`
 			: undefined,
 	"chunk.separator!": () => "\n",
 
@@ -1354,7 +1357,7 @@ class DefaultStatsPrinterPlugin {
 												? str.replace(
 														/((\u001b\[39m|\u001b\[22m|\u001b\[0m)+)/g,
 														`$1${start}`
-												  )
+													)
 												: str
 										}\u001b[39m\u001b[22m`;
 								} else {

package/lib/util/cleverMerge.js

@@ -457,8 +457,8 @@ const mergeSingleValue = (a, b, internalCaching) => {
 			return aType !== VALUE_TYPE_OBJECT
 				? b
 				: internalCaching
-				? cachedCleverMerge(a, b)
-				: cleverMerge(a, b);
+					? cachedCleverMerge(a, b)
+					: cleverMerge(a, b);
 		}
 		case VALUE_TYPE_UNDEFINED:
 			return a;
@@ -467,8 +467,8 @@ const mergeSingleValue = (a, b, internalCaching) => {
 				aType !== VALUE_TYPE_ATOM
 					? aType
 					: Array.isArray(a)
-					? VALUE_TYPE_ARRAY_EXTEND
-					: VALUE_TYPE_OBJECT
+						? VALUE_TYPE_ARRAY_EXTEND
+						: VALUE_TYPE_OBJECT
 			) {
 				case VALUE_TYPE_UNDEFINED:
 					return b;