webpack 5.89.0 → 5.90.0

package/lib/dependencies/JsonExportsDependency.js

@@ -28,7 +28,7 @@ const getExportsFromData = data => {
 							canMangle: true,
 							exports: getExportsFromData(item)
 						};
-				  })
+					})
 				: undefined;
 		} else {
 			const exports = [];

package/lib/dependencies/LoaderPlugin.js

@@ -185,7 +185,8 @@ class LoaderPlugin {
 									issuerLayer: options.layer
 								},
 								context: loaderContext.context,
-								connectOrigin: false
+								connectOrigin: false,
+								checkCycle: true
 							},
 							err => {
 								compilation.buildQueue.decreaseParallelism();

package/lib/dependencies/PureExpressionDependency.js

@@ -7,7 +7,7 @@
 
 const { UsageState } = require("../ExportsInfo");
 const makeSerializable = require("../util/makeSerializable");
-const { filterRuntime } = require("../util/runtime");
+const { filterRuntime, deepMergeRuntime } = require("../util/runtime");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -93,7 +93,14 @@ PureExpressionDependency.Template = class PureExpressionDependencyTemplate exten
 	apply(
 		dependency,
 		source,
-		{ chunkGraph, moduleGraph, runtime, runtimeTemplate, runtimeRequirements }
+		{
+			chunkGraph,
+			moduleGraph,
+			runtime,
+			runtimes,
+			runtimeTemplate,
+			runtimeRequirements
+		}
 	) {
 		const dep = /** @type {PureExpressionDependency} */ (dependency);
 
@@ -101,7 +108,8 @@ PureExpressionDependency.Template = class PureExpressionDependencyTemplate exten
 		if (usedByExports !== false) {
 			const selfModule = moduleGraph.getParentModule(dep);
 			const exportsInfo = moduleGraph.getExportsInfo(selfModule);
-			const runtimeCondition = filterRuntime(runtime, runtime => {
+			const merged = deepMergeRuntime(runtimes, runtime);
+			const runtimeCondition = filterRuntime(merged, runtime => {
 				for (const exportName of usedByExports) {
 					if (exportsInfo.getUsed(exportName, runtime) !== UsageState.Unused) {
 						return true;
@@ -113,7 +121,7 @@ PureExpressionDependency.Template = class PureExpressionDependencyTemplate exten
 			if (runtimeCondition !== false) {
 				const condition = runtimeTemplate.runtimeConditionExpression({
 					chunkGraph,
-					runtime,
+					runtime: merged,
 					runtimeCondition,
 					runtimeRequirements
 				});

package/lib/dependencies/RequireIncludeDependency.js

@@ -69,7 +69,7 @@ RequireIncludeDependency.Template = class RequireIncludeDependencyTemplate exten
 					`require.include ${runtimeTemplate.requestShortener.shorten(
 						dep.request
 					)}`
-			  )
+				)
 			: "";
 
 		source.replace(dep.range[0], dep.range[1] - 1, `undefined${comment}`);

package/lib/dependencies/WebpackIsIncludedDependency.js

@@ -71,7 +71,7 @@ WebpackIsIncludedDependency.Template = class WebpackIsIncludedDependencyTemplate
 					`__webpack_is_included__ ${runtimeTemplate.requestShortener.shorten(
 						dep.request
 					)}`
-			  )
+				)
 			: "";
 
 		source.replace(

package/lib/dependencies/WorkerPlugin.js

@@ -240,7 +240,7 @@ class WorkerPlugin {
 									insertLocation: arg2
 										? /** @type {Range} */ (arg2.range)
 										: /** @type {Range} */ (arg1.range)[1]
-							  };
+								};
 						const { options: importOptions, errors: commentErrors } =
 							parser.parseCommentOptions(/** @type {Range} */ (expr.range));
 
@@ -429,6 +429,12 @@ class WorkerPlugin {
 							const pattern = item.slice(1, firstDot);
 							const itemMembers = item.slice(firstDot + 1, -2);
 
+							parser.hooks.preDeclarator.tap(PLUGIN_NAME, (decl, statement) => {
+								if (decl.id.type === "Identifier" && decl.id.name === pattern) {
+									parser.tagVariable(decl.id.name, WorkerSpecifierTag);
+									return true;
+								}
+							});
 							parser.hooks.pattern.for(pattern).tap(PLUGIN_NAME, pattern => {
 								parser.tagVariable(pattern.name, WorkerSpecifierTag);
 								return true;

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -172,7 +172,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						withOnChunkLoad ? `${RuntimeGlobals.onChunksLoaded}();` : ""
-				  ])}`
+					])}`
 				: "// no install chunk",
 			"",
 			withLoading
@@ -222,25 +222,25 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 											"}"
 										]),
 										"}"
-								  ])
+									])
 								: Template.indent(["installedChunks[chunkId] = 0;"])
 						)};`
-				  ])
+					])
 				: "// no chunk on demand loading",
 			"",
 			withExternalInstallChunk
 				? Template.asString([
 						`${RuntimeGlobals.externalInstallChunk} = installChunk;`
-				  ])
+					])
 				: "// no external install chunk",
 			"",
 			withOnChunkLoad
 				? `${
 						RuntimeGlobals.onChunksLoaded
-				  }.j = ${runtimeTemplate.returningFunction(
+					}.j = ${runtimeTemplate.returningFunction(
 						"installedChunks[chunkId] === 0",
 						"chunkId"
-				  )};`
+					)};`
 				: "// no on chunks loaded"
 		]);
 	}

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -35,7 +35,6 @@ module.exports = function () {
 	var currentUpdateApplyHandlers;
 	var queuedInvalidatedModules;
 
-	// eslint-disable-next-line no-unused-vars
 	$hmrModuleData$ = currentModuleData;
 
 	$interceptModuleExecution$.push(function (options) {
@@ -96,8 +95,8 @@ module.exports = function () {
 				Object.defineProperty(fn, name, createPropertyDescriptor(name));
 			}
 		}
-		fn.e = function (chunkId) {
-			return trackBlockingPromise(require.e(chunkId));
+		fn.e = function (chunkId, fetchPriority) {
+			return trackBlockingPromise(require.e(chunkId, fetchPriority));
 		};
 		return fn;
 	}
@@ -289,8 +288,7 @@ module.exports = function () {
 								updatedModules
 							);
 							return promises;
-						},
-						[])
+						}, [])
 					).then(function () {
 						return waitForBlockingPromises(function () {
 							if (applyOnUpdate) {

package/lib/hmr/lazyCompilationBackend.js

@@ -37,7 +37,7 @@ module.exports = options => (compiler, callback) => {
 			: (() => {
 					const http = isHttps ? require("https") : require("http");
 					return http.createServer.bind(http, options.server);
-			  })();
+				})();
 	const listen =
 		typeof options.listen === "function"
 			? options.listen
@@ -46,7 +46,7 @@ module.exports = options => (compiler, callback) => {
 					if (typeof listen === "object" && !("port" in listen))
 						listen = { ...listen, port: undefined };
 					server.listen(listen);
-			  };
+				};
 
 	const protocol = options.protocol || (isHttps ? "https" : "http");
 
@@ -109,8 +109,8 @@ module.exports = options => (compiler, callback) => {
 			addr.address === "::" || addr.address === "0.0.0.0"
 				? `${protocol}://localhost:${addr.port}`
 				: addr.family === "IPv6"
-				? `${protocol}://[${addr.address}]:${addr.port}`
-				: `${protocol}://${addr.address}:${addr.port}`;
+					? `${protocol}://[${addr.address}]:${addr.port}`
+					: `${protocol}://${addr.address}:${addr.port}`;
 		logger.log(
 			`Server-Sent-Events server for lazy compilation open at ${urlBase}.`
 		);

package/lib/ids/DeterministicModuleIdsPlugin.js

@@ -66,7 +66,7 @@ class DeterministicModuleIdsPlugin {
 							? () => 0
 							: compareModulesByPreOrderIndexOrIdentifier(
 									compilation.moduleGraph
-							  ),
+								),
 						(module, id) => {
 							const size = usedIds.size;
 							usedIds.add(`${id}`);

package/lib/index.js

@@ -37,6 +37,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./Compilation").EntryOptions} EntryOptions */
 /** @typedef {import("./Compilation").PathData} PathData */
 /** @typedef {import("./Compiler").AssetEmittedInfo} AssetEmittedInfo */
+/** @typedef {import("./MultiCompiler").MultiCompilerOptions} MultiCompilerOptions */
 /** @typedef {import("./MultiStats")} MultiStats */
 /** @typedef {import("./NormalModuleFactory").ResolveData} ResolveData */
 /** @typedef {import("./Parser").ParserState} ParserState */
@@ -270,6 +271,9 @@ module.exports = mergeExports(fn, {
 	get MultiCompiler() {
 		return require("./MultiCompiler");
 	},
+	get OptimizationStages() {
+		return require("./OptimizationStages");
+	},
 	get Parser() {
 		return require("./Parser");
 	},

package/lib/javascript/JavascriptGenerator.js

@@ -190,6 +190,8 @@ class JavascriptGenerator extends Generator {
 			);
 		}
 
+		let chunkInitFragments;
+
 		const templateContext = {
 			runtimeTemplate: generateContext.runtimeTemplate,
 			dependencyTemplates: generateContext.dependencyTemplates,
@@ -197,10 +199,23 @@ class JavascriptGenerator extends Generator {
 			chunkGraph: generateContext.chunkGraph,
 			module,
 			runtime: generateContext.runtime,
+			runtimes: generateContext.runtimes,
 			runtimeRequirements: generateContext.runtimeRequirements,
 			concatenationScope: generateContext.concatenationScope,
 			codeGenerationResults: generateContext.codeGenerationResults,
-			initFragments
+			initFragments,
+			get chunkInitFragments() {
+				if (!chunkInitFragments) {
+					const data = generateContext.getData();
+					chunkInitFragments = data.get("chunkInitFragments");
+					if (!chunkInitFragments) {
+						chunkInitFragments = [];
+						data.set("chunkInitFragments", chunkInitFragments);
+					}
+				}
+
+				return chunkInitFragments;
+			}
 		};
 
 		template.apply(dependency, source, templateContext);

package/lib/javascript/JavascriptModulesPlugin.js

@@ -679,8 +679,8 @@ class JavascriptModulesPlugin {
 		return strictHeader
 			? new ConcatSource(strictHeader, source, ";")
 			: renderContext.runtimeTemplate.isModule()
-			? source
-			: new ConcatSource(source, ";");
+				? source
+				: new ConcatSource(source, ";");
 	}
 
 	/**
@@ -751,7 +751,7 @@ class JavascriptModulesPlugin {
 			inlinedModules
 				? allModules.filter(
 						m => !(/** @type {Set<Module>} */ (inlinedModules).has(m))
-				  )
+					)
 				: allModules,
 			module => this.renderModule(module, chunkRenderContext, hooks, true),
 			prefix
@@ -837,14 +837,14 @@ class JavascriptModulesPlugin {
 					let iife = innerStrict
 						? "it need to be in strict mode."
 						: inlinedModules.size > 1
-						? // TODO check globals and top-level declarations of other entries and chunk modules
-						  // to make a better decision
-						  "it need to be isolated against other entry modules."
-						: chunkModules
-						? "it need to be isolated against other modules in the chunk."
-						: exports && !webpackExports
-						? `it uses a non-standard name for the exports (${m.exportsArgument}).`
-						: hooks.embedInRuntimeBailout.call(m, renderContext);
+							? // TODO check globals and top-level declarations of other entries and chunk modules
+								// to make a better decision
+								"it need to be isolated against other entry modules."
+							: chunkModules
+								? "it need to be isolated against other modules in the chunk."
+								: exports && !webpackExports
+									? `it uses a non-standard name for the exports (${m.exportsArgument}).`
+									: hooks.embedInRuntimeBailout.call(m, renderContext);
 					let footer;
 					if (iife !== undefined) {
 						startupSource.add(
@@ -1310,14 +1310,14 @@ class JavascriptModulesPlugin {
 					`${RuntimeGlobals.interceptModuleExecution}.forEach(function(handler) { handler(execOptions); });`,
 					"module = execOptions.module;",
 					"execOptions.factory.call(module.exports, module, module.exports, execOptions.require);"
-			  ])
+				])
 			: runtimeRequirements.has(RuntimeGlobals.thisAsExports)
-			? Template.asString([
-					`__webpack_modules__[moduleId].call(module.exports, module, module.exports, ${RuntimeGlobals.require});`
-			  ])
-			: Template.asString([
-					`__webpack_modules__[moduleId](module, module.exports, ${RuntimeGlobals.require});`
-			  ]);
+				? Template.asString([
+						`__webpack_modules__[moduleId].call(module.exports, module, module.exports, ${RuntimeGlobals.require});`
+					])
+				: Template.asString([
+						`__webpack_modules__[moduleId](module, module.exports, ${RuntimeGlobals.require});`
+					]);
 		const needModuleId = runtimeRequirements.has(RuntimeGlobals.moduleId);
 		const needModuleLoaded = runtimeRequirements.has(
 			RuntimeGlobals.moduleLoaded
@@ -1330,7 +1330,7 @@ class JavascriptModulesPlugin {
 				? Template.indent([
 						"if (cachedModule.error !== undefined) throw cachedModule.error;",
 						"return cachedModule.exports;"
-				  ])
+					])
 				: Template.indent("return cachedModule.exports;"),
 			"}",
 			"// Create a new module (and put it into the cache)",
@@ -1353,27 +1353,27 @@ class JavascriptModulesPlugin {
 							"if(threw) delete __webpack_module_cache__[moduleId];"
 						]),
 						"}"
-				  ])
+					])
 				: outputOptions.strictModuleErrorHandling
-				? Template.asString([
-						"// Execute the module function",
-						"try {",
-						Template.indent(moduleExecution),
-						"} catch(e) {",
-						Template.indent(["module.error = e;", "throw e;"]),
-						"}"
-				  ])
-				: Template.asString([
-						"// Execute the module function",
-						moduleExecution
-				  ]),
+					? Template.asString([
+							"// Execute the module function",
+							"try {",
+							Template.indent(moduleExecution),
+							"} catch(e) {",
+							Template.indent(["module.error = e;", "throw e;"]),
+							"}"
+						])
+					: Template.asString([
+							"// Execute the module function",
+							moduleExecution
+						]),
 			needModuleLoaded
 				? Template.asString([
 						"",
 						"// Flag the module as loaded",
 						`${RuntimeGlobals.moduleLoaded} = true;`,
 						""
-				  ])
+					])
 				: "",
 			"// Return the exports of the module",
 			"return module.exports;"

package/lib/javascript/JavascriptParser.js

@@ -4071,6 +4071,14 @@ class JavascriptParser extends Parser {
 						return false;
 					}
 
+					if (
+						expr.superClass &&
+						item.type === "MethodDefinition" &&
+						item.kind === "constructor"
+					) {
+						return false;
+					}
+
 					return true;
 				});
 			}

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;