webpack 5.105.2 → 5.105.3

package/lib/CleanPlugin.js

@@ -369,6 +369,7 @@ class CleanPlugin {
 	/** @param {CleanOptions} options options */
 	constructor(options = {}) {
 		validate(options);
+		/** @type {CleanOptions & { dry: boolean }} */
 		this.options = { dry: false, ...options };
 	}
 

package/lib/Compilation.js

@@ -4531,12 +4531,14 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 					(e) => e.chunks[e.chunks.length - 1]
 				)
 			)) {
-				const otherInfo =
-					/** @type {RuntimeChunkInfo} */
-					(runtimeChunksMap.get(other));
-				otherInfo.referencedBy.push(info);
-				info.remaining++;
-				remaining++;
+				const otherInfo = runtimeChunksMap.get(other);
+				// other may be a non-runtime chunk (e.g. worker chunk)
+				// when you have a worker chunk in your app.js (new Worker(...)) and as a separate entry point
+				if (otherInfo) {
+					otherInfo.referencedBy.push(info);
+					info.remaining++;
+					remaining++;
+				}
 			}
 		}
 		/** @type {Chunk[]} */

package/lib/ContextModule.js

@@ -119,6 +119,7 @@ const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {Record<ModuleId, FakeMapType>} FakeMap */
 /** @typedef {Record<string, ModuleId>} UserRequestMap */
+/** @typedef {Record<ModuleId, ModuleId[]>} UserRequestsMap */
 
 class ContextModule extends Module {
 	/**
@@ -711,7 +712,7 @@ class ContextModule extends Module {
 	/**
 	 * @param {Dependency[]} dependencies all dependencies
 	 * @param {ChunkGraph} chunkGraph chunk graph
-	 * @returns {Map<string, ModuleId[] | undefined>} map with user requests
+	 * @returns {UserRequestsMap} map with user requests
 	 */
 	getModuleDeferredAsyncDepsMap(dependencies, chunkGraph) {
 		const moduleGraph = chunkGraph.moduleGraph;
@@ -726,6 +727,7 @@ class ContextModule extends Module {
 			)
 			.filter(Boolean)
 			.sort(comparator);
+		/** @type {UserRequestsMap} */
 		const map = Object.create(null);
 		for (const module of sortedModules) {
 			if (!(/** @type {BuildMeta} */ (module.buildMeta).async)) {
@@ -740,7 +742,7 @@ class ContextModule extends Module {
 	}
 
 	/**
-	 * @param {false | Map<string, ModuleId[] | undefined>} asyncDepsMap fake map
+	 * @param {false | UserRequestsMap} asyncDepsMap fake map
 	 * @returns {string} async deps map init statement
 	 */
 	getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap) {
@@ -1168,12 +1170,16 @@ function webpackAsyncContext(req) {
 	])});
 }`
 				: `function webpackAsyncContext(req) {
-	if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {
-		return Promise.resolve().then(${runtimeTemplate.basicFunction("", [
-			'var e = new Error("Cannot find module \'" + req + "\'");',
-			"e.code = 'MODULE_NOT_FOUND';",
-			"throw e;"
-		])});
+	try {
+		if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {
+			return Promise.resolve().then(${runtimeTemplate.basicFunction("", [
+				'var e = new Error("Cannot find module \'" + req + "\'");',
+				"e.code = 'MODULE_NOT_FOUND';",
+				"throw e;"
+			])});
+		}
+	} catch(err) {
+		return Promise.reject(err);
 	}
 
 	var ids = map[req], id = ids[0];

package/lib/Dependency.js

@@ -227,7 +227,7 @@ class Dependency {
 	 */
 	getReference(moduleGraph) {
 		throw new Error(
-			"Dependency.getReference was removed in favor of Dependency.getReferencedExports, ModuleGraph.getModule and ModuleGraph.getConnection().active"
+			"Dependency.getReference was removed in favor of Dependency.getReferencedExports, ModuleGraph.getModule, ModuleGraph.getConnection(), and ModuleGraphConnection.getActiveState(runtime)"
 		);
 	}
 

package/lib/EnvironmentNotSupportAsyncWarning.js

@@ -26,6 +26,7 @@ As a result, the code may not run as expected or may cause runtime errors.`;
 
 		/** @type {string} */
 		this.name = "EnvironmentNotSupportAsyncWarning";
+		/** @type {Module} */
 		this.module = module;
 	}
 

package/lib/EvalDevToolModulePlugin.js

@@ -43,8 +43,11 @@ class EvalDevToolModulePlugin {
 	 * @param {EvalDevToolModulePluginOptions=} options options
 	 */
 	constructor(options = {}) {
+		/** @type {DevtoolNamespace} */
 		this.namespace = options.namespace || "";
+		/** @type {string} */
 		this.sourceUrlComment = options.sourceUrlComment || "\n//# sourceURL=[url]";
+		/** @type {DevtoolModuleFilenameTemplate} */
 		this.moduleFilenameTemplate =
 			options.moduleFilenameTemplate ||
 			"webpack://[namespace]/[resourcePath]?[loaders]";

package/lib/EvalSourceMapDevToolPlugin.js

@@ -17,10 +17,13 @@ const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolNamespace} DevtoolNamespace */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolModuleFilenameTemplate} DevtoolModuleFilenameTemplate */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").Rules} Rules */
-/** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
+/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 
 /** @type {WeakMap<Source, Source>} */
 const cache = new WeakMap();
@@ -51,14 +54,18 @@ class EvalSourceMapDevToolPlugin {
 		} else {
 			options = inputOptions;
 		}
+		/** @type {string} */
 		this.sourceMapComment =
 			options.append && typeof options.append !== "function"
 				? options.append
 				: "//# sourceURL=[module]\n//# sourceMappingURL=[url]";
+		/** @type {DevtoolModuleFilenameTemplate} */
 		this.moduleFilenameTemplate =
 			options.moduleFilenameTemplate ||
 			"webpack://[namespace]/[resource-path]?[hash]";
+		/** @type {DevtoolNamespace} */
 		this.namespace = options.namespace || "";
+		/** @type {SourceMapDevToolPluginOptions} */
 		this.options = options;
 	}
 

package/lib/ExportsInfo.js

@@ -933,36 +933,6 @@ class ExportInfo {
 		this._maxTarget = undefined;
 	}
 
-	// TODO webpack 5 remove
-	/**
-	 * @private
-	 * @param {EXPECTED_ANY} v v
-	 */
-	set used(v) {
-		throw new Error("REMOVED");
-	}
-
-	// TODO webpack 5 remove
-	/** @private */
-	get used() {
-		throw new Error("REMOVED");
-	}
-
-	// TODO webpack 5 remove
-	/**
-	 * @private
-	 * @param {EXPECTED_ANY} v v
-	 */
-	set usedName(v) {
-		throw new Error("REMOVED");
-	}
-
-	// TODO webpack 5 remove
-	/** @private */
-	get usedName() {
-		throw new Error("REMOVED");
-	}
-
 	get canMangle() {
 		switch (this.canMangleProvide) {
 			case undefined:

package/lib/ExternalModule.js

@@ -995,7 +995,7 @@ class ExternalModule extends Module {
 				);
 				/** @type {CodeGenerationResultData} */
 				const data = new Map();
-				data.set("url", { javascript: request });
+				data.set("url", { javascript: /** @type {string} */ (request) });
 				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
 			}
 			case "css-url": {
@@ -1003,7 +1003,7 @@ class ExternalModule extends Module {
 				const sources = new Map();
 				/** @type {CodeGenerationResultData} */
 				const data = new Map();
-				data.set("url", { "css-url": request });
+				data.set("url", { "css-url": /** @type {string} */ (request) });
 				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
 			}
 			case "css-import": {

package/lib/Module.js

@@ -104,11 +104,36 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {Set<string>} RuntimeRequirements */
 /** @typedef {ReadonlySet<string>} ReadOnlyRuntimeRequirements */
 
-/** @typedef {Map<"topLevelDeclarations", Set<string>> & Map<"chunkInitFragments", InitFragment<EXPECTED_ANY>[]>} KnownCodeGenerationResultDataForJavascriptModules */
-/** @typedef {Map<"url", { ["css-url"]: string }>} KnownCodeGenerationResultDataForCssModules */
-/** @typedef {Map<"filename", string> & Map<"assetInfo", AssetInfo> & Map<"fullContentHash", string> & Map<"url", { javascript: string }>} KnownCodeGenerationResultDataForAssetModules */
-/** @typedef {Map<"share-init", [{ shareScope: string, initStage: number, init: string }]>} KnownCodeGenerationResultForSharing */
-/** @typedef {KnownCodeGenerationResultDataForJavascriptModules & KnownCodeGenerationResultDataForCssModules & KnownCodeGenerationResultDataForAssetModules & KnownCodeGenerationResultForSharing & Map<string, EXPECTED_ANY>} CodeGenerationResultData */
+/**
+ * @typedef {object} AllCodeGenerationSchemas
+ * @property {Set<string>} topLevelDeclarations top level declarations for javascript modules
+ * @property {InitFragment<EXPECTED_ANY>[]} chunkInitFragments chunk init fragments for javascript modules
+ * @property {{ javascript?: string, ["css-url"]?: string }} url url for css and javascript modules
+ * @property {string} filename a filename for asset modules
+ * @property {AssetInfo} assetInfo an asset info for asset modules
+ * @property {string} fullContentHash a full content hash for asset modules
+ * @property {[{ shareScope: string, initStage: number, init: string }]} share-init share-init for modules federation
+ */
+
+/* eslint-disable jsdoc/type-formatting */
+/**
+ * @template {string} K
+ * @typedef {K extends keyof AllCodeGenerationSchemas ? AllCodeGenerationSchemas[K] : EXPECTED_ANY} CodeGenValue
+ */
+/* eslint-enable jsdoc/type-formatting */
+
+/* eslint-disable jsdoc/require-template */
+/**
+ * @typedef {object} CodeGenMapOverloads
+ * @property {<K extends string>(key: K) => CodeGenValue<K> | undefined} get
+ * @property {<K extends string>(key: K, value: CodeGenValue<K>) => CodeGenerationResultData} set
+ * @property {<K extends string>(key: K) => boolean} has
+ * @property {<K extends string>(key: K) => boolean} delete
+ */
+
+/**
+ * @typedef {Omit<Map<string, EXPECTED_ANY>, "get" | "set" | "has" | "delete"> & CodeGenMapOverloads} CodeGenerationResultData
+ */
 
 /** @typedef {Map<SourceType, Source>} Sources */
 

package/lib/ModuleGraphConnection.js

@@ -184,15 +184,6 @@ class ModuleGraphConnection {
 		this.conditional = false;
 		this._active = value;
 	}
-
-	// TODO webpack 5 remove
-	get active() {
-		throw new Error("Use getActiveState instead");
-	}
-
-	set active(value) {
-		throw new Error("Use setActive instead");
-	}
 }
 
 /** @typedef {typeof TRANSITIVE_ONLY} TRANSITIVE_ONLY */

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -17,6 +17,7 @@ class SourceMapDevToolModuleOptionsPlugin {
 	 * @param {SourceMapDevToolPluginOptions=} options options
 	 */
 	constructor(options = {}) {
+		/** @type {SourceMapDevToolPluginOptions} */
 		this.options = options;
 	}
 

package/lib/SourceMapDevToolPlugin.js

@@ -19,6 +19,9 @@ const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolNamespace} DevtoolNamespace */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolModuleFilenameTemplate} DevtoolModuleFilenameTemplate */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolFallbackModuleFilenameTemplate} DevtoolFallbackModuleFilenameTemplate */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").Rules} Rules */
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
@@ -140,19 +143,24 @@ class SourceMapDevToolPlugin {
 	constructor(options = {}) {
 		validate(options);
 
-		this.sourceMapFilename = /** @type {string | false} */ (options.filename);
-		/** @type {false | TemplatePath}} */
+		/** @type {undefined | null | false | string} */
+		this.sourceMapFilename = options.filename;
+		/** @type {false | TemplatePath} */
 		this.sourceMappingURLComment =
 			options.append === false
 				? false
 				: // eslint-disable-next-line no-useless-concat
 					options.append || "\n//# source" + "MappingURL=[url]";
+		/** @type {DevtoolModuleFilenameTemplate} */
 		this.moduleFilenameTemplate =
 			options.moduleFilenameTemplate || "webpack://[namespace]/[resourcePath]";
+		/** @type {DevtoolFallbackModuleFilenameTemplate} */
 		this.fallbackModuleFilenameTemplate =
 			options.fallbackModuleFilenameTemplate ||
 			"webpack://[namespace]/[resourcePath]?[hash]";
+		/** @type {DevtoolNamespace} */
 		this.namespace = options.namespace || "";
+		/** @type {SourceMapDevToolPluginOptions} */
 		this.options = options;
 	}
 

package/lib/WebpackOptionsApply.js

@@ -60,6 +60,7 @@ const URLPlugin = require("./dependencies/URLPlugin");
 const WorkerPlugin = require("./dependencies/WorkerPlugin");
 
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
+const JavascriptParser = require("./javascript/JavascriptParser");
 
 const JsonModulesPlugin = require("./json/JsonModulesPlugin");
 
@@ -371,7 +372,9 @@ class WebpackOptionsApply extends OptionsApply {
 
 		new JavascriptModulesPlugin().apply(compiler);
 		new JsonModulesPlugin().apply(compiler);
-		new AssetModulesPlugin().apply(compiler);
+		new AssetModulesPlugin({
+			sideEffectFree: options.experiments.futureDefaults
+		}).apply(compiler);
 
 		if (!options.experiments.outputModule) {
 			if (options.output.module) {
@@ -483,11 +486,18 @@ class WebpackOptionsApply extends OptionsApply {
 			new HttpUriPlugin(httpOptions).apply(compiler);
 		}
 
-		if (options.experiments.deferImport) {
-			const JavascriptParser = require("./javascript/JavascriptParser");
+		if (
+			options.experiments.deferImport &&
+			!(
+				/** @type {typeof JavascriptParser & { __importPhasesExtended?: true }} */
+				(JavascriptParser).__importPhasesExtended
+			)
+		) {
 			const importPhases = require("acorn-import-phases");
 
 			JavascriptParser.extend(importPhases({ source: false }));
+			/** @type {typeof JavascriptParser & { __importPhasesExtended?: true }} */
+			(JavascriptParser).__importPhasesExtended = true;
 		}
 
 		new EntryOptionPlugin().apply(compiler);

package/lib/asset/AssetModulesPlugin.js

@@ -86,7 +86,19 @@ const getNormalModule = memoize(() => require("../NormalModule"));
 const type = ASSET_MODULE_TYPE;
 const PLUGIN_NAME = "AssetModulesPlugin";
 
+/**
+ * @typedef {object} AssetModulesPluginOptions
+ * @property {boolean=} sideEffectFree
+ */
+
 class AssetModulesPlugin {
+	/**
+	 * @param {AssetModulesPluginOptions} options options
+	 */
+	constructor(options) {
+		this.options = options;
+	}
+
 	/**
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance
@@ -112,7 +124,10 @@ class AssetModulesPlugin {
 								/** @type {NormalModuleCreateData} */
 								(createData)
 							);
-							module.factoryMeta = { sideEffectFree: true };
+							if (this.options.sideEffectFree) {
+								module.factoryMeta = { sideEffectFree: true };
+							}
+
 							return module;
 						});
 				}

package/lib/asset/RawDataUrlModule.js

@@ -42,9 +42,13 @@ class RawDataUrlModule extends Module {
 	 */
 	constructor(url, identifier, readableIdentifier) {
 		super(ASSET_MODULE_TYPE_RAW_DATA_URL, null);
+		/** @type {string} */
 		this.url = url;
+		/** @type {Buffer | undefined} */
 		this.urlBuffer = url ? Buffer.from(url) : undefined;
-		this.identifierStr = identifier || this.url;
+		/** @type {string} */
+		this.identifierStr = identifier;
+		/** @type {string} */
 		this.readableIdentifierStr = readableIdentifier || this.identifierStr;
 	}
 

package/lib/css/CssGenerator.js

@@ -19,7 +19,6 @@ const {
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const CssImportDependency = require("../dependencies/CssImportDependency");
-const EntryDependency = require("../dependencies/EntryDependency");
 const { getUndoPath } = require("../util/identifier");
 const memoize = require("../util/memoize");
 
@@ -472,11 +471,7 @@ class CssGenerator extends Generator {
 		const sourceTypes = new Set();
 		const connections = this._moduleGraph.getIncomingConnections(module);
 
-		let isEntryModule = false;
 		for (const connection of connections) {
-			if (connection.dependency instanceof EntryDependency) {
-				isEntryModule = true;
-			}
 			if (
 				exportType === "link" &&
 				connection.dependency instanceof CssImportDependency
@@ -503,7 +498,7 @@ class CssGenerator extends Generator {
 			}
 		}
 		if (this._generatesJsOnly(module)) {
-			if (sourceTypes.has(JAVASCRIPT_TYPE) || isEntryModule) {
+			if (sourceTypes.has(JAVASCRIPT_TYPE)) {
 				return JAVASCRIPT_TYPES;
 			}
 			return new Set();
@@ -578,3 +573,5 @@ class CssGenerator extends Generator {
 }
 
 module.exports = CssGenerator;
+
+module.exports = CssGenerator;

package/lib/css/CssModulesPlugin.js

@@ -386,6 +386,13 @@ class CssModulesPlugin {
 					compilation
 				).renderModuleContent.tap(PLUGIN_NAME, (source, module) => {
 					if (module instanceof CssModule && module.hot) {
+						const exportType = /** @type {BuildMeta} */ (module.buildMeta)
+							.exportType;
+						// When exportType !== "link", modules behave like JavaScript modules
+						if (exportType && exportType !== "link") {
+							return source;
+						}
+						// For exportType === "link", we can optimize with self-acceptance
 						const cssData = /** @type {BuildInfo} */ (module.buildInfo).cssData;
 						if (!cssData) {
 							return source;

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -65,6 +65,10 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		return "cjs export require";
 	}
 
+	get category() {
+		return "commonjs";
+	}
+
 	/**
 	 * @returns {boolean | TRANSITIVE} true, when changes to the referenced module could affect the referencing module; TRANSITIVE, when changes to the referenced module could affect referencing modules of the referencing module
 	 */