webpack 5.89.0 → 5.90.1

package/lib/json/JsonGenerator.js

@@ -183,7 +183,7 @@ class JsonGenerator extends Generator {
 		const jsonStr = /** @type {string} */ (stringifySafe(finalJson));
 		const jsonExpr =
 			jsonStr.length > 20 && typeof finalJson === "object"
-				? `JSON.parse('${jsonStr.replace(/[\\']/g, "\\$&")}')`
+				? `/*#__PURE__*/JSON.parse('${jsonStr.replace(/[\\']/g, "\\$&")}')`
 				: jsonStr;
 		/** @type {string} */
 		let content;

package/lib/library/AmdLibraryPlugin.js

@@ -87,7 +87,11 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 		const modern = runtimeTemplate.supportsArrowFunction();
 		const modules = chunkGraph
 			.getChunkModules(chunk)
-			.filter(m => m instanceof ExternalModule);
+			.filter(
+				m =>
+					m instanceof ExternalModule &&
+					(m.externalType === "amd" || m.externalType === "amd-require")
+			);
 		const externals = /** @type {ExternalModule[]} */ (modules);
 		const externalsDepsArray = JSON.stringify(
 			externals.map(m =>

package/lib/library/AssignLibraryPlugin.js

@@ -295,7 +295,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 		const exportAccess = options.export
 			? propertyAccess(
 					Array.isArray(options.export) ? options.export : [options.export]
-			  )
+				)
 			: "";
 		const result = new ConcatSource(source);
 		if (staticExports) {

package/lib/library/SystemLibraryPlugin.js

@@ -187,7 +187,7 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 								.join(",\n")
 						),
 						"],"
-				  ]);
+					]);
 
 		return new ConcatSource(
 			Template.asString([

package/lib/library/UmdLibraryPlugin.js

@@ -243,8 +243,8 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 			const factoryArguments =
 				requiredExternals.length > 0
 					? externalsArguments(requiredExternals) +
-					  ", " +
-					  externalsRootArray(optionalExternals)
+						", " +
+						externalsRootArray(optionalExternals)
 					: externalsRootArray(optionalExternals);
 			amdFactory =
 				`function webpackLoadOptionalExternalModuleAmd(${wrapperArguments}) {\n` +
@@ -283,55 +283,55 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 					(requiredExternals.length > 0
 						? names.amd && namedDefine === true
 							? "		define(" +
-							  libraryName(names.amd) +
-							  ", " +
-							  externalsDepsArray(requiredExternals) +
-							  ", " +
-							  amdFactory +
-							  ");\n"
+								libraryName(names.amd) +
+								", " +
+								externalsDepsArray(requiredExternals) +
+								", " +
+								amdFactory +
+								");\n"
 							: "		define(" +
-							  externalsDepsArray(requiredExternals) +
-							  ", " +
-							  amdFactory +
-							  ");\n"
+								externalsDepsArray(requiredExternals) +
+								", " +
+								amdFactory +
+								");\n"
 						: names.amd && namedDefine === true
-						? "		define(" +
-						  libraryName(names.amd) +
-						  ", [], " +
-						  amdFactory +
-						  ");\n"
-						: "		define([], " + amdFactory + ");\n") +
+							? "		define(" +
+								libraryName(names.amd) +
+								", [], " +
+								amdFactory +
+								");\n"
+							: "		define([], " + amdFactory + ");\n") +
 					(names.root || names.commonjs
 						? getAuxiliaryComment("commonjs") +
-						  "	else if(typeof exports === 'object')\n" +
-						  "		exports[" +
-						  libraryName(names.commonjs || names.root) +
-						  "] = factory(" +
-						  externalsRequireArray("commonjs") +
-						  ");\n" +
-						  getAuxiliaryComment("root") +
-						  "	else\n" +
-						  "		" +
-						  replaceKeys(
+							"	else if(typeof exports === 'object')\n" +
+							"		exports[" +
+							libraryName(names.commonjs || names.root) +
+							"] = factory(" +
+							externalsRequireArray("commonjs") +
+							");\n" +
+							getAuxiliaryComment("root") +
+							"	else\n" +
+							"		" +
+							replaceKeys(
 								accessorAccess(
 									"root",
 									/** @type {string | string[]} */ (names.root) ||
 										/** @type {string} */ (names.commonjs)
 								)
-						  ) +
-						  " = factory(" +
-						  externalsRootArray(externals) +
-						  ");\n"
+							) +
+							" = factory(" +
+							externalsRootArray(externals) +
+							");\n"
 						: "	else {\n" +
-						  (externals.length > 0
+							(externals.length > 0
 								? "		var a = typeof exports === 'object' ? factory(" +
-								  externalsRequireArray("commonjs") +
-								  ") : factory(" +
-								  externalsRootArray(externals) +
-								  ");\n"
+									externalsRequireArray("commonjs") +
+									") : factory(" +
+									externalsRootArray(externals) +
+									");\n"
 								: "		var a = factory();\n") +
-						  "		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
-						  "	}\n") +
+							"		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
+							"	}\n") +
 					`})(${runtimeTemplate.outputOptions.globalObject}, ${
 						runtimeTemplate.supportsArrowFunction()
 							? `(${externalsArguments(externals)}) =>`

package/lib/logging/createConsoleLogger.js

@@ -45,11 +45,7 @@ const { LogType } = require("./Logger");
 const filterToFunction = 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);
 	}
@@ -114,9 +110,7 @@ module.exports = ({ level = "info", debug = false, console }) => {
 		switch (type) {
 			case LogType.debug:
 				if (!debug) return;
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.debug === "function") {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					console.debug(...labeledArgs());
 				} else {
 					console.log(...labeledArgs());
@@ -145,9 +139,7 @@ module.exports = ({ level = "info", debug = false, console }) => {
 			case LogType.groupCollapsed:
 				if (!debug && loglevel > LogLevel.log) return;
 				if (!debug && loglevel > LogLevel.verbose) {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					if (typeof console.groupCollapsed === "function") {
-						// eslint-disable-next-line node/no-unsupported-features/node-builtins
 						console.groupCollapsed(...labeledArgs());
 					} else {
 						console.log(...labeledArgs());
@@ -157,9 +149,7 @@ module.exports = ({ level = "info", debug = false, console }) => {
 			// falls through
 			case LogType.group:
 				if (!debug && loglevel > LogLevel.log) return;
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.group === "function") {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					console.group(...labeledArgs());
 				} else {
 					console.log(...labeledArgs());
@@ -167,9 +157,7 @@ module.exports = ({ level = "info", debug = false, console }) => {
 				break;
 			case LogType.groupEnd:
 				if (!debug && loglevel > LogLevel.log) return;
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.groupEnd === "function") {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					console.groupEnd();
 				}
 				break;
@@ -185,24 +173,18 @@ module.exports = ({ level = "info", debug = false, console }) => {
 				break;
 			}
 			case LogType.profile:
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.profile === "function") {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					console.profile(...labeledArgs());
 				}
 				break;
 			case LogType.profileEnd:
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.profileEnd === "function") {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					console.profileEnd(...labeledArgs());
 				}
 				break;
 			case LogType.clear:
 				if (!debug && loglevel > LogLevel.log) return;
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.clear === "function") {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					console.clear();
 				}
 				break;

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -113,10 +113,10 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 			withOnChunkLoad
 				? `${
 						RuntimeGlobals.onChunksLoaded
-				  }.readFileVm = ${runtimeTemplate.returningFunction(
+					}.readFileVm = ${runtimeTemplate.returningFunction(
 						"installedChunks[chunkId] === 0",
 						"chunkId"
-				  )};`
+					)};`
 				: "// no on chunks loaded",
 			"",
 			withLoading || withExternalInstallChunk
@@ -141,7 +141,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						withOnChunkLoad ? `${RuntimeGlobals.onChunksLoaded}();` : ""
-				  ])};`
+					])};`
 				: "// no chunk install function needed",
 			"",
 			withLoading
@@ -192,17 +192,17 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 										"}"
 									]),
 									"}"
-							  ])
+								])
 							: Template.indent(["installedChunks[chunkId] = 0;"]),
 						"};"
-				  ])
+					])
 				: "// no chunk loading",
 			"",
 			withExternalInstallChunk
 				? Template.asString([
 						`module.exports = ${RuntimeGlobals.require};`,
 						`${RuntimeGlobals.externalInstallChunk} = installChunk;`
-				  ])
+					])
 				: "// no external install chunk",
 			"",
 			withHmr
@@ -263,7 +263,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 								/\$hmrInvalidateModuleHandlers\$/g,
 								RuntimeGlobals.hmrInvalidateModuleHandlers
 							)
-				  ])
+					])
 				: "// no HMR",
 			"",
 			withHmrManifest
@@ -291,7 +291,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 							"});"
 						]),
 						"}"
-				  ])
+					])
 				: "// no HMR manifest"
 		]);
 	}

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -113,10 +113,10 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 			withOnChunkLoad
 				? `${
 						RuntimeGlobals.onChunksLoaded
-				  }.require = ${runtimeTemplate.returningFunction(
+					}.require = ${runtimeTemplate.returningFunction(
 						"installedChunks[chunkId]",
 						"chunkId"
-				  )};`
+					)};`
 				: "// no on chunks loaded",
 			"",
 			withLoading || withExternalInstallChunk
@@ -135,7 +135,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 						"for(var i = 0; i < chunkIds.length; i++)",
 						Template.indent("installedChunks[chunkIds[i]] = 1;"),
 						withOnChunkLoad ? `${RuntimeGlobals.onChunksLoaded}();` : ""
-				  ])};`
+					])};`
 				: "// no chunk install function needed",
 			"",
 			withLoading
@@ -162,17 +162,17 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 											""
 										]),
 										"}"
-								  ]
+									]
 								: "installedChunks[chunkId] = 1;"
 						)};`
-				  ])
+					])
 				: "// no chunk loading",
 			"",
 			withExternalInstallChunk
 				? Template.asString([
 						`module.exports = ${RuntimeGlobals.require};`,
 						`${RuntimeGlobals.externalInstallChunk} = installChunk;`
-				  ])
+					])
 				: "// no external install chunk",
 			"",
 			withHmr
@@ -220,7 +220,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 								/\$hmrInvalidateModuleHandlers\$/g,
 								RuntimeGlobals.hmrInvalidateModuleHandlers
 							)
-				  ])
+					])
 				: "// no HMR",
 			"",
 			withHmrManifest
@@ -236,7 +236,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 							"})['catch'](function(err) { if(err.code !== 'MODULE_NOT_FOUND') throw err; });"
 						]),
 						"}"
-				  ])
+					])
 				: "// no HMR manifest"
 		]);
 	}

package/lib/node/nodeConsole.js

@@ -102,17 +102,13 @@ module.exports = ({ colors, appendOnly, stream }) => {
 			else if (currentIndent.length >= 2)
 				currentIndent = currentIndent.slice(0, currentIndent.length - 2);
 		},
-		// eslint-disable-next-line node/no-unsupported-features/node-builtins
 		profile: console.profile && (name => console.profile(name)),
-		// eslint-disable-next-line node/no-unsupported-features/node-builtins
 		profileEnd: console.profileEnd && (name => console.profileEnd(name)),
 		clear:
 			!appendOnly &&
-			// eslint-disable-next-line node/no-unsupported-features/node-builtins
 			console.clear &&
 			(() => {
 				clearStatusMessage();
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				console.clear();
 				writeStatusMessage();
 			}),
@@ -136,6 +132,6 @@ module.exports = ({ colors, appendOnly, stream }) => {
 						currentStatusMessage = [name, ...args];
 						writeStatusMessage();
 					}
-			  }
+				}
 	};
 };

package/lib/optimize/ConcatenatedModule.js

@@ -335,10 +335,10 @@ const getFinalBinding = (
 						const defaultExport = asCall
 							? `${info.interopDefaultAccessName}()`
 							: asiSafe
-							? `(${info.interopDefaultAccessName}())`
-							: asiSafe === false
-							? `;(${info.interopDefaultAccessName}())`
-							: `${info.interopDefaultAccessName}.a`;
+								? `(${info.interopDefaultAccessName}())`
+								: asiSafe === false
+									? `;(${info.interopDefaultAccessName}())`
+									: `${info.interopDefaultAccessName}.a`;
 						return {
 							info,
 							rawName: defaultExport,
@@ -568,8 +568,8 @@ const getFinalName = (
 			return asiSafe
 				? `(0,${reference})`
 				: asiSafe === false
-				? `;(0,${reference})`
-				: `/*#__PURE__*/Object(${reference})`;
+					? `;(0,${reference})`
+					: `/*#__PURE__*/Object(${reference})`;
 		}
 		return reference;
 	}
@@ -1541,7 +1541,7 @@ class ConcatenatedModule extends Module {
 				nsObj.length > 0
 					? `${RuntimeGlobals.definePropertyGetters}(${name}, {${nsObj.join(
 							","
-					  )}\n});\n`
+						)}\n});\n`
 					: "";
 			if (nsObj.length > 0)
 				runtimeRequirements.add(RuntimeGlobals.definePropertyGetters);

package/lib/optimize/InnerGraphPlugin.js

@@ -177,7 +177,6 @@ class InnerGraphPlugin {
 								) {
 									pureDeclarators.add(decl);
 								}
-								return true;
 							}
 						}
 					});
@@ -336,6 +335,15 @@ class InnerGraphPlugin {
 							parser.walkExpression(decl.init);
 							InnerGraph.setTopLevelSymbol(parser.state, undefined);
 							return true;
+						} else if (
+							decl.id.type === "Identifier" &&
+							decl.init &&
+							decl.init.type === "ClassExpression" &&
+							classWithTopLevelSymbol.has(decl.init)
+						) {
+							parser.walkExpression(decl.init);
+							InnerGraph.setTopLevelSymbol(parser.state, undefined);
+							return true;
 						}
 					});
 

package/lib/optimize/MangleExportsPlugin.js

@@ -88,7 +88,11 @@ const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 				used === UsageState.OnlyPropertiesUsed ||
 				used === UsageState.Unused
 			) {
-				mangleExportsInfo(deterministic, exportInfo.exportsInfo, false);
+				mangleExportsInfo(
+					deterministic,
+					/** @type {ExportsInfo} */ (exportInfo.exportsInfo),
+					false
+				);
 			}
 		}
 	}

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -284,8 +284,8 @@ class ModuleConcatenationPlugin {
 							filteredRuntime === true
 								? chunkRuntime
 								: filteredRuntime === false
-								? undefined
-								: filteredRuntime;
+									? undefined
+									: filteredRuntime;
 
 						// create a configuration with the root
 						const currentConfiguration = new ConcatConfiguration(