webpack 5.99.8 → 5.100.0

package/lib/DllReferencePlugin.js

@@ -22,7 +22,7 @@ const makePathsRelative = require("./util/identifier").makePathsRelative;
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
 const validate = createSchemaValidation(
-	require("../schemas/plugins/DllReferencePlugin.check.js"),
+	require("../schemas/plugins/DllReferencePlugin.check"),
 	() => require("../schemas/plugins/DllReferencePlugin.json"),
 	{
 		name: "Dll Reference Plugin",
@@ -78,7 +78,7 @@ class DllReferencePlugin {
 						// or malformed manifest files don't kill the process.
 						try {
 							data.data = parseJson(
-								/** @type {Buffer} */ (result).toString("utf-8")
+								/** @type {Buffer} */ (result).toString("utf8")
 							);
 						} catch (parseErr) {
 							// Store the error in the params so that it can

package/lib/DynamicEntryPlugin.js

@@ -80,7 +80,7 @@ class DynamicEntryPlugin {
 					}
 					return Promise.all(promises);
 				})
-				.then(x => {})
+				.then(() => {})
 		);
 	}
 }

package/lib/EntryOptionPlugin.js

@@ -33,9 +33,11 @@ class EntryOptionPlugin {
 	static applyEntryOption(compiler, context, entry) {
 		if (typeof entry === "function") {
 			const DynamicEntryPlugin = require("./DynamicEntryPlugin");
+
 			new DynamicEntryPlugin(context, entry).apply(compiler);
 		} else {
 			const EntryPlugin = require("./EntryPlugin");
+
 			for (const name of Object.keys(entry)) {
 				const desc = entry[name];
 				const options = EntryOptionPlugin.entryDescriptionToOptions(
@@ -81,14 +83,17 @@ class EntryOptionPlugin {
 		}
 		if (desc.chunkLoading) {
 			const EnableChunkLoadingPlugin = require("./javascript/EnableChunkLoadingPlugin");
+
 			EnableChunkLoadingPlugin.checkEnabled(compiler, desc.chunkLoading);
 		}
 		if (desc.wasmLoading) {
 			const EnableWasmLoadingPlugin = require("./wasm/EnableWasmLoadingPlugin");
+
 			EnableWasmLoadingPlugin.checkEnabled(compiler, desc.wasmLoading);
 		}
 		if (desc.library) {
 			const EnableLibraryPlugin = require("./library/EnableLibraryPlugin");
+
 			EnableLibraryPlugin.checkEnabled(compiler, desc.library.type);
 		}
 		return options;

package/lib/ErrorHelpers.js

@@ -91,10 +91,10 @@ const cleanUpWebpackOptions = (stack, message) => {
 	return stack;
 };
 
+module.exports.cleanUp = cleanUp;
+module.exports.cleanUpWebpackOptions = cleanUpWebpackOptions;
 module.exports.cutOffByFlag = cutOffByFlag;
 module.exports.cutOffLoaderExecution = cutOffLoaderExecution;
-module.exports.cutOffWebpackOptions = cutOffWebpackOptions;
-module.exports.cutOffMultilineMessage = cutOffMultilineMessage;
 module.exports.cutOffMessage = cutOffMessage;
-module.exports.cleanUp = cleanUp;
-module.exports.cleanUpWebpackOptions = cleanUpWebpackOptions;
+module.exports.cutOffMultilineMessage = cutOffMultilineMessage;
+module.exports.cutOffWebpackOptions = cutOffWebpackOptions;

package/lib/EvalDevToolModulePlugin.js

@@ -95,9 +95,9 @@ class EvalDevToolModulePlugin {
 						`eval(${
 							compilation.outputOptions.trustedTypes
 								? `${RuntimeGlobals.createScript}(${JSON.stringify(
-										content + footer
+										`{${content + footer}\n}`
 									)})`
-								: JSON.stringify(content + footer)
+								: JSON.stringify(`{${content + footer}\n}`)
 						});`
 					);
 					cache.set(source, result);
@@ -119,7 +119,7 @@ class EvalDevToolModulePlugin {
 			if (compilation.outputOptions.trustedTypes) {
 				compilation.hooks.additionalModuleRuntimeRequirements.tap(
 					PLUGIN_NAME,
-					(module, set, context) => {
+					(module, set, _context) => {
 						set.add(RuntimeGlobals.createScript);
 					}
 				);

package/lib/EvalSourceMapDevToolPlugin.js

@@ -15,12 +15,12 @@ const ConcatenatedModule = require("./optimize/ConcatenatedModule");
 const generateDebugId = require("./util/generateDebugId");
 const { makePathsAbsolute } = require("./util/identifier");
 
+/** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").DevTool} DevToolOptions */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./NormalModule").SourceMap} SourceMap */
 
 /** @type {WeakMap<Source, Source>} */
 const cache = new WeakMap();
@@ -117,15 +117,15 @@ class EvalSourceMapDevToolPlugin {
 					const namespace = compilation.getPath(this.namespace, {
 						chunk
 					});
-					/** @type {SourceMap} */
+					/** @type {RawSourceMap} */
 					let sourceMap;
 					let content;
 					if (source.sourceAndMap) {
 						const sourceAndMap = source.sourceAndMap(options);
-						sourceMap = /** @type {SourceMap} */ (sourceAndMap.map);
+						sourceMap = /** @type {RawSourceMap} */ (sourceAndMap.map);
 						content = sourceAndMap.source;
 					} else {
-						sourceMap = /** @type {SourceMap} */ (source.map(options));
+						sourceMap = /** @type {RawSourceMap} */ (source.map(options));
 						content = source.source();
 					}
 					if (!sourceMap) {
@@ -191,16 +191,16 @@ class EvalSourceMapDevToolPlugin {
 							`eval(${
 								compilation.outputOptions.trustedTypes
 									? `${RuntimeGlobals.createScript}(${JSON.stringify(
-											content + footer
+											`{${content + footer}\n}`
 										)})`
-									: JSON.stringify(content + footer)
+									: JSON.stringify(`{${content + footer}\n}`)
 							});`
 						)
 					);
 				}
 			);
 			hooks.inlineInRuntimeBailout.tap(
-				"EvalDevToolModulePlugin",
+				PLUGIN_NAME,
 				() => "the eval-source-map devtool is used."
 			);
 			hooks.render.tap(

package/lib/ExportsInfo.js

@@ -159,8 +159,9 @@ class ExportsInfo {
 	 * @returns {ExportInfo} the export info of unlisted exports
 	 */
 	get otherExportsInfo() {
-		if (this._redirectTo !== undefined)
+		if (this._redirectTo !== undefined) {
 			return this._redirectTo.otherExportsInfo;
+		}
 		return this._otherExportsInfo;
 	}
 
@@ -259,8 +260,9 @@ class ExportsInfo {
 	getExportInfo(name) {
 		const info = this._exports.get(name);
 		if (info !== undefined) return info;
-		if (this._redirectTo !== undefined)
+		if (this._redirectTo !== undefined) {
 			return this._redirectTo.getExportInfo(name);
+		}
 		const newInfo = new ExportInfo(name, this._otherExportsInfo);
 		this._exports.set(name, newInfo);
 		this._exportsAreOrdered = false;
@@ -274,8 +276,9 @@ class ExportsInfo {
 	getReadOnlyExportInfo(name) {
 		const info = this._exports.get(name);
 		if (info !== undefined) return info;
-		if (this._redirectTo !== undefined)
+		if (this._redirectTo !== undefined) {
 			return this._redirectTo.getReadOnlyExportInfo(name);
+		}
 		return this._otherExportsInfo;
 	}
 
@@ -494,8 +497,9 @@ class ExportsInfo {
 	 */
 	isModuleUsed(runtime) {
 		if (this.isUsed(runtime)) return true;
-		if (this._sideEffectsOnlyInfo.getUsed(runtime) !== UsageState.Unused)
+		if (this._sideEffectsOnlyInfo.getUsed(runtime) !== UsageState.Unused) {
 			return true;
+		}
 		return false;
 	}
 
@@ -504,17 +508,15 @@ class ExportsInfo {
 	 * @returns {SortableSet<string> | boolean | null} set of used exports, or true (when namespace object is used), or false (when unused), or null (when unknown)
 	 */
 	getUsedExports(runtime) {
-		// eslint-disable-next-line no-constant-binary-expression
-		if (!this._redirectTo !== undefined) {
-			switch (this._otherExportsInfo.getUsed(runtime)) {
-				case UsageState.NoInfo:
-					return null;
-				case UsageState.Unknown:
-				case UsageState.OnlyPropertiesUsed:
-				case UsageState.Used:
-					return true;
-			}
+		switch (this._otherExportsInfo.getUsed(runtime)) {
+			case UsageState.NoInfo:
+				return null;
+			case UsageState.Unknown:
+			case UsageState.OnlyPropertiesUsed:
+			case UsageState.Used:
+				return true;
 		}
+
 		const array = [];
 		if (!this._exportsAreOrdered) this._sortExports();
 		for (const exportInfo of this._exports.values()) {
@@ -553,17 +555,15 @@ class ExportsInfo {
 	 * @returns {null | true | string[]} list of exports when known
 	 */
 	getProvidedExports() {
-		// eslint-disable-next-line no-constant-binary-expression
-		if (!this._redirectTo !== undefined) {
-			switch (this._otherExportsInfo.provided) {
-				case undefined:
-					return null;
-				case null:
-					return true;
-				case true:
-					return true;
-			}
+		switch (this._otherExportsInfo.provided) {
+			case undefined:
+				return null;
+			case null:
+				return true;
+			case true:
+				return true;
 		}
+
 		/** @type {string[]} */
 		const array = [];
 		if (!this._exportsAreOrdered) this._sortExports();
@@ -671,8 +671,9 @@ class ExportsInfo {
 			return false;
 		}
 		for (const exportInfo of this.ownedExports) {
-			if (exportInfo.getUsed(runtimeA) !== exportInfo.getUsed(runtimeB))
+			if (exportInfo.getUsed(runtimeA) !== exportInfo.getUsed(runtimeB)) {
 				return false;
+			}
 		}
 		return true;
 	}
@@ -722,9 +723,9 @@ class ExportsInfo {
 			) {
 				const nested = info.exportsInfo.getUsedName(name.slice(1), runtime);
 				if (!nested) return false;
-				return arr.concat(nested);
+				return [...arr, ...(Array.isArray(nested) ? nested : [nested])];
 			}
-			return arr.concat(name.slice(1));
+			return [...arr, ...name.slice(1)];
 		}
 		const info = this.getReadOnlyExportInfo(name);
 		const usedName = info.getUsedName(name, runtime);
@@ -832,7 +833,7 @@ class ExportsInfo {
 
 /** @typedef {Map<string, RuntimeUsageStateType>} UsedInRuntime */
 
-/** @typedef {{ module: Module, export: string[] }} TargetItemWithoutConnection */
+/** @typedef {{ module: Module, export: string[], deferred: boolean }} TargetItemWithoutConnection */
 
 /** @typedef {{ module: Module, connection: ModuleGraphConnection, export: string[] | undefined }} TargetItemWithConnection */
 
@@ -1245,7 +1246,7 @@ class ExportInfo {
 					}
 				} else if (
 					runtime !== undefined &&
-					Array.from(runtime).every(
+					[...runtime].every(
 						runtime =>
 							!(/** @type {UsedInRuntime} */ (this._usedInRuntime).has(runtime))
 					)
@@ -1294,8 +1295,9 @@ class ExportInfo {
 
 	_getMaxTarget() {
 		if (this._maxTarget !== undefined) return this._maxTarget;
-		if (/** @type {Target} */ (this._target).size <= 1)
+		if (/** @type {Target} */ (this._target).size <= 1) {
 			return (this._maxTarget = this._target);
+		}
 		let maxPriority = -Infinity;
 		let minPriority = Infinity;
 		for (const { priority } of /** @type {Target} */ (this._target).values()) {
@@ -1341,7 +1343,10 @@ class ExportInfo {
 		/** @type {TargetItemWithoutConnection} */
 		let target = {
 			module: rawTarget.connection.module,
-			export: rawTarget.export
+			export: rawTarget.export,
+			deferred: Boolean(
+				rawTarget.connection.dependency && rawTarget.connection.dependency.defer
+			)
 		};
 		for (;;) {
 			if (validTargetModuleFilter(target.module)) return target;
@@ -1360,8 +1365,9 @@ class ExportInfo {
 				target = {
 					module: newTarget.module,
 					export: newTarget.export
-						? newTarget.export.concat(target.export.slice(1))
-						: target.export.slice(1)
+						? [...newTarget.export, ...target.export.slice(1)]
+						: target.export.slice(1),
+					deferred: newTarget.deferred
 				};
 			}
 		}
@@ -1433,10 +1439,11 @@ class ExportInfo {
 						module: newTarget.module,
 						connection: newTarget.connection,
 						export: newTarget.export
-							? newTarget.export.concat(
-									/** @type {NonNullable<TargetItemWithConnection["export"]>} */
+							? [
+									...newTarget.export,
+									.../** @type {NonNullable<TargetItemWithConnection["export"]>} */
 									(target.export).slice(1)
-								)
+								]
 							: /** @type {NonNullable<TargetItemWithConnection["export"]>} */
 								(target.export).slice(1)
 					};
@@ -1468,8 +1475,9 @@ class ExportInfo {
 			if (
 				target.export &&
 				!equals(/** @type {ArrayLike<string>} */ (t.export), target.export)
-			)
+			) {
 				return;
+			}
 			result = values.next();
 		}
 		return target;
@@ -1517,8 +1525,9 @@ class ExportInfo {
 	 * @returns {ExportsInfo} an exports info
 	 */
 	createNestedExportsInfo() {
-		if (this.exportsInfoOwned)
+		if (this.exportsInfoOwned) {
 			return /** @type {ExportsInfo} */ (this.exportsInfo);
+		}
 		this.exportsInfoOwned = true;
 		const oldExportsInfo = this.exportsInfo;
 		this.exportsInfo = new ExportsInfo();
@@ -1671,5 +1680,5 @@ class ExportInfo {
 
 module.exports = ExportsInfo;
 module.exports.ExportInfo = ExportInfo;
-module.exports.UsageState = UsageState;
 module.exports.RestoreProvidedData = RestoreProvidedData;
+module.exports.UsageState = UsageState;

package/lib/ExternalModule.js

@@ -12,9 +12,9 @@ const { UsageState } = require("./ExportsInfo");
 const InitFragment = require("./InitFragment");
 const Module = require("./Module");
 const {
-	JS_TYPES,
+	CSS_IMPORT_TYPES,
 	CSS_URL_TYPES,
-	CSS_IMPORT_TYPES
+	JS_TYPES
 } = require("./ModuleSourceTypesConstants");
 const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
@@ -352,8 +352,9 @@ const getSourceForModuleExternal = (
 	runtimeTemplate,
 	dependencyMeta
 ) => {
-	if (!Array.isArray(moduleAndSpecifiers))
+	if (!Array.isArray(moduleAndSpecifiers)) {
 		moduleAndSpecifiers = [moduleAndSpecifiers];
+	}
 	const initFragment = new ModuleExternalInitFragment(
 		moduleAndSpecifiers[0],
 		undefined,
@@ -587,7 +588,7 @@ class ExternalModule extends Module {
 		this.buildInfo = {
 			strict: true,
 			topLevelDeclarations: new Set(),
-			module: compilation.outputOptions.module
+			javascriptModule: compilation.outputOptions.module
 		};
 		const { request, externalType } = this._getRequestAndExternalType();
 		this.buildMeta.exportsType = "dynamic";
@@ -604,7 +605,7 @@ class ExternalModule extends Module {
 				}
 				break;
 			case "module":
-				if (this.buildInfo.module) {
+				if (this.buildInfo.javascriptModule) {
 					if (!Array.isArray(request) || request.length === 1) {
 						this.buildMeta.exportsType = "namespace";
 						canMangle = true;
@@ -668,7 +669,7 @@ class ExternalModule extends Module {
 	 * @param {ConcatenationBailoutReasonContext} context context
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
 	 */
-	getConcatenationBailoutReason({ moduleGraph }) {
+	getConcatenationBailoutReason(context) {
 		switch (this.externalType) {
 			case "amd":
 			case "amd-require":
@@ -683,8 +684,9 @@ class ExternalModule extends Module {
 
 	_getRequestAndExternalType() {
 		let { request, externalType } = this;
-		if (typeof request === "object" && !Array.isArray(request))
+		if (typeof request === "object" && !Array.isArray(request)) {
 			request = request[externalType];
+		}
 		externalType = this._resolveExternalType(externalType);
 		return { request, externalType };
 	}
@@ -758,7 +760,7 @@ class ExternalModule extends Module {
 			case "commonjs-static":
 				return getSourceForCommonJsExternal(request);
 			case "node-commonjs":
-				return /** @type {BuildInfo} */ (this.buildInfo).module
+				return /** @type {BuildInfo} */ (this.buildInfo).javascriptModule
 					? getSourceForCommonJsExternalInNodeModule(
 							request,
 							/** @type {string} */
@@ -790,7 +792,7 @@ class ExternalModule extends Module {
 			case "script":
 				return getSourceForScriptExternal(request, runtimeTemplate);
 			case "module": {
-				if (!(/** @type {BuildInfo} */ (this.buildInfo).module)) {
+				if (!(/** @type {BuildInfo} */ (this.buildInfo).javascriptModule)) {
 					if (!runtimeTemplate.supportsDynamicImport()) {
 						throw new Error(
 							`The target environment doesn't support dynamic import() syntax so it's not possible to use external type 'module' within a script${
@@ -900,8 +902,9 @@ class ExternalModule extends Module {
 				);
 
 				let sourceString = sourceData.expression;
-				if (sourceData.iife)
+				if (sourceData.iife) {
 					sourceString = `(function() { return ${sourceString}; }())`;
+				}
 				if (concatenationScope) {
 					sourceString = `${
 						runtimeTemplate.supportsConst() ? "const" : "var"
@@ -912,8 +915,9 @@ class ExternalModule extends Module {
 				} else {
 					sourceString = `module.exports = ${sourceString};`;
 				}
-				if (sourceData.init)
+				if (sourceData.init) {
 					sourceString = `${sourceData.init}\n${sourceString}`;
+				}
 
 				let data;
 				if (sourceData.chunkInitFragments) {

package/lib/ExternalModuleFactoryPlugin.js

@@ -12,7 +12,7 @@ const CssImportDependency = require("./dependencies/CssImportDependency");
 const CssUrlDependency = require("./dependencies/CssUrlDependency");
 const HarmonyImportDependency = require("./dependencies/HarmonyImportDependency");
 const ImportDependency = require("./dependencies/ImportDependency");
-const { resolveByProperty, cachedSetProperty } = require("./util/cleverMerge");
+const { cachedSetProperty, resolveByProperty } = require("./util/cleverMerge");
 
 /** @typedef {import("../declarations/WebpackOptions").ExternalItemFunctionData} ExternalItemFunctionData */
 /** @typedef {import("../declarations/WebpackOptions").ExternalItemObjectKnown} ExternalItemObjectKnown */
@@ -75,6 +75,8 @@ const resolveLayer = (obj, layer) => {
 /** @typedef {string | string[] | boolean | Record<string, string | string[]>} ExternalValue */
 /** @typedef {string | undefined} ExternalType */
 
+const PLUGIN_NAME = "ExternalModuleFactoryPlugin";
+
 class ExternalModuleFactoryPlugin {
 	/**
 	 * @param {string | undefined} type default external type
@@ -92,7 +94,7 @@ class ExternalModuleFactoryPlugin {
 	apply(normalModuleFactory) {
 		const globalType = this.type;
 		normalModuleFactory.hooks.factorize.tapAsync(
-			"ExternalModuleFactoryPlugin",
+			PLUGIN_NAME,
 			(data, callback) => {
 				const context = data.context;
 				const contextInfo = data.contextInfo;
@@ -335,4 +337,5 @@ class ExternalModuleFactoryPlugin {
 		);
 	}
 }
+
 module.exports = ExternalModuleFactoryPlugin;