webpack 5.61.0 → 5.63.0

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -11,6 +11,7 @@ const HarmonyExportExpressionDependency = require("./HarmonyExportExpressionDepe
 const HarmonyExportHeaderDependency = require("./HarmonyExportHeaderDependency");
 const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImportedSpecifierDependency");
 const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
+const { ExportPresenceModes } = require("./HarmonyImportDependency");
 const {
 	harmonySpecifierTag,
 	getAssertions
@@ -21,10 +22,18 @@ const { HarmonyStarExportsList } = HarmonyExportImportedSpecifierDependency;
 
 module.exports = class HarmonyExportDependencyParserPlugin {
 	constructor(options) {
-		this.strictExportPresence = options.strictExportPresence;
+		this.exportPresenceMode =
+			options.reexportExportsPresence !== undefined
+				? ExportPresenceModes.fromUserOption(options.reexportExportsPresence)
+				: options.exportsPresence !== undefined
+				? ExportPresenceModes.fromUserOption(options.exportsPresence)
+				: options.strictExportPresence
+				? ExportPresenceModes.ERROR
+				: ExportPresenceModes.AUTO;
 	}
 
 	apply(parser) {
+		const { exportPresenceMode } = this;
 		parser.hooks.export.tap(
 			"HarmonyExportDependencyParserPlugin",
 			statement => {
@@ -128,7 +137,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						name,
 						harmonyNamedExports,
 						null,
-						this.strictExportPresence,
+						exportPresenceMode,
 						null,
 						settings.assertions
 					);
@@ -160,7 +169,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					name,
 					harmonyNamedExports,
 					harmonyStarExports && harmonyStarExports.slice(),
-					this.strictExportPresence,
+					exportPresenceMode,
 					harmonyStarExports
 				);
 				if (harmonyStarExports) {

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -40,6 +40,8 @@ const processExportInfo = require("./processExportInfo");
 
 /** @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;
+
 const idsSymbol = Symbol("HarmonyExportImportedSpecifierDependency.ids");
 
 class NormalReexportItem {
@@ -325,7 +327,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {string | null} name the export name of for this module
 	 * @param {Set<string>} activeExports other named exports in the module
 	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | Iterable<HarmonyExportImportedSpecifierDependency>} otherStarExports other star exports in the module before this import
-	 * @param {boolean} strictExportPresence when true, missing exports in the imported module lead to errors instead of warnings
+	 * @param {number} exportPresenceMode mode of checking export names
 	 * @param {HarmonyStarExportsList} allStarExports all star exports in the module
 	 * @param {Record<string, any>=} assertions import assertions
 	 */
@@ -336,7 +338,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		name,
 		activeExports,
 		otherStarExports,
-		strictExportPresence,
+		exportPresenceMode,
 		allStarExports,
 		assertions
 	) {
@@ -346,7 +348,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		this.name = name;
 		this.activeExports = activeExports;
 		this.otherStarExports = otherStarExports;
-		this.strictExportPresence = strictExportPresence;
+		this.exportPresenceMode = exportPresenceMode;
 		this.allStarExports = allStarExports;
 	}
 
@@ -735,20 +737,29 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		}
 	}
 
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @returns {number} effective mode
+	 */
+	_getEffectiveExportPresenceLevel(moduleGraph) {
+		if (this.exportPresenceMode !== ExportPresenceModes.AUTO)
+			return this.exportPresenceMode;
+		return moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
+			? ExportPresenceModes.ERROR
+			: ExportPresenceModes.WARN;
+	}
+
 	/**
 	 * Returns warnings
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {WebpackError[]} warnings
 	 */
 	getWarnings(moduleGraph) {
-		if (
-			this.strictExportPresence ||
-			moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
-		) {
-			return null;
+		const exportsPresence = this._getEffectiveExportPresenceLevel(moduleGraph);
+		if (exportsPresence === ExportPresenceModes.WARN) {
+			return this._getErrors(moduleGraph);
 		}
-
-		return this._getErrors(moduleGraph);
+		return null;
 	}
 
 	/**
@@ -757,13 +768,10 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @returns {WebpackError[]} errors
 	 */
 	getErrors(moduleGraph) {
-		if (
-			this.strictExportPresence ||
-			moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
-		) {
+		const exportsPresence = this._getEffectiveExportPresenceLevel(moduleGraph);
+		if (exportsPresence === ExportPresenceModes.ERROR) {
 			return this._getErrors(moduleGraph);
 		}
-
 		return null;
 	}
 
@@ -856,7 +864,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		write(this.name);
 		write(this.activeExports);
 		write(this.otherStarExports);
-		write(this.strictExportPresence);
+		write(this.exportPresenceMode);
 		write(this.allStarExports);
 
 		super.serialize(context);
@@ -870,7 +878,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		this.name = read();
 		this.activeExports = read();
 		this.otherStarExports = read();
-		this.strictExportPresence = read();
+		this.exportPresenceMode = read();
 		this.allStarExports = read();
 
 		super.deserialize(context);

package/lib/dependencies/HarmonyImportDependency.js

@@ -27,6 +27,27 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
+const ExportPresenceModes = {
+	NONE: /** @type {0} */ (0),
+	WARN: /** @type {1} */ (1),
+	AUTO: /** @type {2} */ (2),
+	ERROR: /** @type {3} */ (3),
+	fromUserOption(str) {
+		switch (str) {
+			case "error":
+				return ExportPresenceModes.ERROR;
+			case "warn":
+				return ExportPresenceModes.WARN;
+			case "auto":
+				return ExportPresenceModes.AUTO;
+			case false:
+				return ExportPresenceModes.NONE;
+			default:
+				throw new Error(`Invalid export presence value ${str}`);
+		}
+	}
+};
+
 class HarmonyImportDependency extends ModuleDependency {
 	/**
 	 *
@@ -334,3 +355,5 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 		return emittedModules.get(referencedModule) || false;
 	}
 };
+
+module.exports.ExportPresenceModes = ExportPresenceModes;

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -11,6 +11,7 @@ const ConstDependency = require("./ConstDependency");
 const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
 const HarmonyAcceptImportDependency = require("./HarmonyAcceptImportDependency");
 const HarmonyExports = require("./HarmonyExports");
+const { ExportPresenceModes } = require("./HarmonyImportDependency");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
@@ -19,6 +20,7 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("estree").Identifier} Identifier */
 /** @typedef {import("estree").ImportDeclaration} ImportDeclaration */
 /** @typedef {import("estree").ImportExpression} ImportExpression */
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
 /** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
@@ -60,8 +62,18 @@ function getAssertions(node) {
 }
 
 module.exports = class HarmonyImportDependencyParserPlugin {
+	/**
+	 * @param {JavascriptParserOptions} options options
+	 */
 	constructor(options) {
-		this.strictExportPresence = options.strictExportPresence;
+		this.exportPresenceMode =
+			options.importExportsPresence !== undefined
+				? ExportPresenceModes.fromUserOption(options.importExportsPresence)
+				: options.exportsPresence !== undefined
+				? ExportPresenceModes.fromUserOption(options.exportsPresence)
+				: options.strictExportPresence
+				? ExportPresenceModes.ERROR
+				: ExportPresenceModes.AUTO;
 		this.strictThisContextOnImports = options.strictThisContextOnImports;
 	}
 
@@ -70,6 +82,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 	 * @returns {void}
 	 */
 	apply(parser) {
+		const { exportPresenceMode } = this;
 		parser.hooks.isPure
 			.for("Identifier")
 			.tap("HarmonyImportDependencyParserPlugin", expression => {
@@ -128,7 +141,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.ids,
 					settings.name,
 					expr.range,
-					this.strictExportPresence,
+					exportPresenceMode,
 					settings.assertions
 				);
 				dep.shorthand = parser.scope.inShorthand;
@@ -150,7 +163,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					ids,
 					settings.name,
 					expr.range,
-					this.strictExportPresence,
+					exportPresenceMode,
 					settings.assertions
 				);
 				dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
@@ -171,7 +184,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					ids,
 					settings.name,
 					callee.range,
-					this.strictExportPresence,
+					exportPresenceMode,
 					settings.assertions
 				);
 				dep.directImport = members.length === 0;

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -28,6 +28,8 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 
 const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
 
+const { ExportPresenceModes } = HarmonyImportDependency;
+
 class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	constructor(
 		request,
@@ -35,14 +37,14 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		ids,
 		name,
 		range,
-		strictExportPresence,
+		exportPresenceMode,
 		assertions
 	) {
 		super(request, sourceOrder, assertions);
 		this.ids = ids;
 		this.name = name;
 		this.range = range;
-		this.strictExportPresence = strictExportPresence;
+		this.exportPresenceMode = exportPresenceMode;
 		this.namespaceObjectAsContext = false;
 		this.call = undefined;
 		this.directImport = undefined;
@@ -153,19 +155,29 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		return [ids];
 	}
 
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @returns {number} effective mode
+	 */
+	_getEffectiveExportPresenceLevel(moduleGraph) {
+		if (this.exportPresenceMode !== ExportPresenceModes.AUTO)
+			return this.exportPresenceMode;
+		return moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
+			? ExportPresenceModes.ERROR
+			: ExportPresenceModes.WARN;
+	}
+
 	/**
 	 * Returns warnings
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {WebpackError[]} warnings
 	 */
 	getWarnings(moduleGraph) {
-		if (
-			this.strictExportPresence ||
-			moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
-		) {
-			return null;
+		const exportsPresence = this._getEffectiveExportPresenceLevel(moduleGraph);
+		if (exportsPresence === ExportPresenceModes.WARN) {
+			return this._getErrors(moduleGraph);
 		}
-		return this._getErrors(moduleGraph);
+		return null;
 	}
 
 	/**
@@ -174,10 +186,8 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 * @returns {WebpackError[]} errors
 	 */
 	getErrors(moduleGraph) {
-		if (
-			this.strictExportPresence ||
-			moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
-		) {
+		const exportsPresence = this._getEffectiveExportPresenceLevel(moduleGraph);
+		if (exportsPresence === ExportPresenceModes.ERROR) {
 			return this._getErrors(moduleGraph);
 		}
 		return null;
@@ -209,7 +219,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		write(this.ids);
 		write(this.name);
 		write(this.range);
-		write(this.strictExportPresence);
+		write(this.exportPresenceMode);
 		write(this.namespaceObjectAsContext);
 		write(this.call);
 		write(this.directImport);
@@ -224,7 +234,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		this.ids = read();
 		this.name = read();
 		this.range = read();
-		this.strictExportPresence = read();
+		this.exportPresenceMode = read();
 		this.namespaceObjectAsContext = read();
 		this.call = read();
 		this.directImport = read();

package/lib/dependencies/RequireEnsureDependency.js

@@ -85,14 +85,14 @@ RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends
 			source.replace(
 				contentRange[1],
 				errorHandlerRange[0] - 1,
-				").bind(null, __webpack_require__)).catch("
+				").bind(null, __webpack_require__))['catch']("
 			);
 			source.replace(errorHandlerRange[1], range[1] - 1, ")");
 		} else {
 			source.replace(
 				contentRange[1],
 				range[1] - 1,
-				`).bind(null, __webpack_require__)).catch(${RuntimeGlobals.uncaughtErrorHandler})`
+				`).bind(null, __webpack_require__))['catch'](${RuntimeGlobals.uncaughtErrorHandler})`
 			);
 		}
 	}

package/lib/hmr/lazyCompilationBackend.js

@@ -41,7 +41,12 @@ module.exports = options => (compiler, callback) => {
 	const listen =
 		typeof options.listen === "function"
 			? options.listen
-			: server => server.listen(options.listen);
+			: server => {
+					let listen = options.listen;
+					if (typeof listen === "object" && !("port" in listen))
+						listen = { ...listen, port: undefined };
+					server.listen(listen);
+			  };
 
 	const protocol = options.protocol || (isHttps ? "https" : "http");
 

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -211,7 +211,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 									RuntimeGlobals.getUpdateManifestFilename
 								}());`
 							]),
-							'}).catch(function(err) { if(err.code !== "MODULE_NOT_FOUND") throw err; });'
+							"})['catch'](function(err) { if(err.code !== 'MODULE_NOT_FOUND') throw err; });"
 						]),
 						"}"
 				  ])

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -56,6 +56,7 @@ class ModuleConcatenationPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		const { _backCompat: backCompat } = compiler;
 		compiler.hooks.compilation.tap("ModuleConcatenationPlugin", compilation => {
 			const moduleGraph = compilation.moduleGraph;
 			const bailoutReasonMap = new Map();
@@ -389,8 +390,10 @@ class ModuleConcatenationPlugin {
 							};
 
 							const integrate = () => {
-								ChunkGraph.setChunkGraphForModule(newModule, chunkGraph);
-								ModuleGraph.setModuleGraphForModule(newModule, moduleGraph);
+								if (backCompat) {
+									ChunkGraph.setChunkGraphForModule(newModule, chunkGraph);
+									ModuleGraph.setModuleGraphForModule(newModule, moduleGraph);
+								}
 
 								for (const warning of concatConfiguration.getWarningsSorted()) {
 									moduleGraph

package/lib/optimize/SplitChunksPlugin.js

@@ -102,6 +102,7 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
 
 /**
  * @typedef {Object} FallbackCacheGroup
+ * @property {ChunkFilterFunction} chunksFilter
  * @property {SplitChunksSizes} minSize
  * @property {SplitChunksSizes} maxAsyncSize
  * @property {SplitChunksSizes} maxInitialSize
@@ -658,6 +659,9 @@ module.exports = class SplitChunksPlugin {
 			automaticNameDelimiter: options.automaticNameDelimiter,
 			usedExports: options.usedExports,
 			fallbackCacheGroup: {
+				chunksFilter: normalizeChunksFilter(
+					fallbackCacheGroup.chunks || options.chunks || "all"
+				),
 				minSize: mergeSizes(
 					normalizeSizes(fallbackCacheGroup.minSize, defaultSizeTypes),
 					minSize
@@ -1598,6 +1602,7 @@ module.exports = class SplitChunksPlugin {
 					const { outputOptions } = compilation;
 
 					// Make sure that maxSize is fulfilled
+					const { fallbackCacheGroup } = this.options;
 					for (const chunk of Array.from(compilation.chunks)) {
 						const chunkConfig = maxSizeQueueMap.get(chunk);
 						const {
@@ -1605,7 +1610,9 @@ module.exports = class SplitChunksPlugin {
 							maxAsyncSize,
 							maxInitialSize,
 							automaticNameDelimiter
-						} = chunkConfig || this.options.fallbackCacheGroup;
+						} = chunkConfig || fallbackCacheGroup;
+						if (!chunkConfig && !fallbackCacheGroup.chunksFilter(chunk))
+							continue;
 						/** @type {SplitChunksSizes} */
 						let maxSize;
 						if (chunk.isOnlyInitial()) {

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -59,7 +59,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 							])});`,
 							`var obj = {};
 							obj[webpackThen] = ${runtimeTemplate.expressionFunction(
-								"queueFunction(queue, fn), dep.catch(reject)",
+								"queueFunction(queue, fn), dep['catch'](reject)",
 								"fn, reject"
 							)};`,
 							"return obj;"
@@ -114,7 +114,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 						"if (isEvaluating) { return completeFunction(fn); }",
 						"if (currentDeps) whenAll(currentDeps, fn, rejectFn);",
 						"queueFunction(queue, fn);",
-						"promise.catch(rejectFn);"
+						"promise['catch'](rejectFn);"
 					]
 				)};`,
 				"module.exports = promise;",

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -320,7 +320,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 											"var promise = moduleToHandlerMapping[id]();",
 											"if(promise.then) {",
 											Template.indent(
-												`promises.push(installedModules[id] = promise.then(onFactory).catch(onError));`
+												"promises.push(installedModules[id] = promise.then(onFactory)['catch'](onError));"
 											),
 											"} else onFactory(promise);"
 										]),

package/lib/sharing/ShareRuntimeModule.js

@@ -105,7 +105,7 @@ class ShareRuntimeModule extends RuntimeModule {
 							)}`,
 							"if(module.then) return promises.push(module.then(initFn, handleError));",
 							"var initResult = initFn(module);",
-							"if(initResult && initResult.then) return promises.push(initResult.catch(handleError));"
+							"if(initResult && initResult.then) return promises.push(initResult['catch'](handleError));"
 						]),
 						"} catch(err) { handleError(err); }"
 					])}`,

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -1160,7 +1160,7 @@ const AVAILABLE_FORMATS = {
 			},
 			{ regExp: /(\(module has no exports\))/g, format: red },
 			{ regExp: /\(possible exports: (.+)\)/g, format: green },
-			{ regExp: /\s*(.+ doesn't exist)/g, format: red },
+			{ regExp: /\s*([^\s].* doesn't exist)/g, format: red },
 			{ regExp: /('\w+' option has not been set)/g, format: red },
 			{
 				regExp: /(Emitted value instead of an instance of Error)/g,

package/lib/util/deprecation.js

@@ -165,8 +165,16 @@ exports.arrayToSetDeprecation = (set, name) => {
 };
 
 exports.createArrayToSetDeprecationSet = name => {
-	class SetDeprecatedArray extends Set {}
-	exports.arrayToSetDeprecation(SetDeprecatedArray.prototype, name);
+	let initialized = false;
+	class SetDeprecatedArray extends Set {
+		constructor(items) {
+			super(items);
+			if (!initialized) {
+				initialized = true;
+				exports.arrayToSetDeprecation(SetDeprecatedArray.prototype, name);
+			}
+		}
+	}
 	return SetDeprecatedArray;
 };
 

package/lib/util/hash/BatchedHash.js

@@ -36,7 +36,11 @@ class BatchedHash extends Hash {
 			this.string = undefined;
 		}
 		if (typeof data === "string") {
-			if (data.length < MAX_SHORT_STRING) {
+			if (
+				data.length < MAX_SHORT_STRING &&
+				// base64 encoding is not valid since it may contain padding chars
+				(!inputEncoding || !inputEncoding.startsWith("ba"))
+			) {
 				this.string = data;
 				this.encoding = inputEncoding;
 			} else {

package/lib/util/hash/wasm-hash.js

@@ -72,7 +72,7 @@ class WasmHash {
 						endPos += 2;
 					} else {
 						// bail-out for weird chars
-						endPos += mem.write(data.slice(endPos), endPos, encoding);
+						endPos += mem.write(data.slice(i), endPos, encoding);
 						break;
 					}
 				}

package/lib/webpack.js

@@ -61,8 +61,7 @@ const createMultiCompiler = (childOptions, options) => {
 const createCompiler = rawOptions => {
 	const options = getNormalizedWebpackOptions(rawOptions);
 	applyWebpackOptionsBaseDefaults(options);
-	const compiler = new Compiler(options.context);
-	compiler.options = options;
+	const compiler = new Compiler(options.context, options);
 	new NodeEnvironmentPlugin({
 		infrastructureLogging: options.infrastructureLogging
 	}).apply(compiler);