webpack 5.107.1 → 5.108.0

package/lib/dependencies/CommonJsRequireDependency.js

@@ -7,6 +7,7 @@
 
 const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
+const memoize = require("../util/memoize");
 const {
 	ESM_MODULE_EXPORTS_NAME,
 	getRequireEsmModuleExportsAccess,
@@ -15,15 +16,19 @@ const {
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
 /** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("./HarmonyImportGuard").DependencyGuard} DependencyGuard */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined]>} ObjectSerializerContext */
+
+const getHarmonyImportGuard = memoize(() => require("./HarmonyImportGuard"));
 
 class CommonJsRequireDependency extends ModuleDependency {
 	/**
@@ -43,9 +48,13 @@ class CommonJsRequireDependency extends ModuleDependency {
 	) {
 		super(request);
 		this.range = range;
+		/** @type {string | undefined} */
 		this._context = context;
+		/** @type {RawReferencedExports | null} */
 		this.referencedExports = referencedExports;
 		this.valueRange = valueRange;
+		/** @type {DependencyGuard[] | undefined} */
+		this.branchGuards = undefined;
 	}
 
 	get type() {
@@ -56,6 +65,18 @@ class CommonJsRequireDependency extends ModuleDependency {
 		return "commonjs";
 	}
 
+	/**
+	 * Returns function to determine if the connection is active.
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
+	 */
+	getCondition(moduleGraph) {
+		const guards = this.branchGuards;
+		if (guards === undefined) return null;
+		return (connection, runtime) =>
+			!getHarmonyImportGuard().isDeadByGuards(guards, moduleGraph, runtime);
+	}
+
 	/**
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
@@ -70,12 +91,13 @@ class CommonJsRequireDependency extends ModuleDependency {
 		) {
 			// `require(esm)` will unwrap the "module.exports" named export; only
 			// that export is observable through this `require()` call.
-			return [[ESM_MODULE_EXPORTS_NAME]];
+			return [{ name: [ESM_MODULE_EXPORTS_NAME], canInline: false }];
 		}
 		if (!this.referencedExports) return Dependency.EXPORTS_OBJECT_REFERENCED;
 		return this.referencedExports.map((name) => ({
 			name,
-			canMangle: false
+			canMangle: false,
+			canInline: false
 		}));
 	}
 
@@ -84,9 +106,10 @@ class CommonJsRequireDependency extends ModuleDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.referencedExports);
-		write(this.valueRange);
+		context
+			.write(this.referencedExports)
+			.write(this.valueRange)
+			.write(this.branchGuards);
 		super.serialize(context);
 	}
 
@@ -95,10 +118,12 @@ class CommonJsRequireDependency extends ModuleDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.referencedExports = read();
-		this.valueRange = read();
-		super.deserialize(context);
+		this.referencedExports = context.read();
+		const c1 = context.rest;
+		this.valueRange = c1.read();
+		const c2 = c1.rest;
+		this.branchGuards = c2.read();
+		super.deserialize(c2.rest);
 	}
 }
 
@@ -119,6 +144,12 @@ CommonJsRequireDependency.Template = class CommonJsRequireDependencyTemplate ext
 	) {
 		const dep = /** @type {CommonJsRequireDependency} */ (dependency);
 		if (!dep.range) return;
+		const connection = moduleGraph.getConnection(dep);
+		// Dead branch: module is excluded and has no id; code is never executed.
+		if (connection && !connection.isTargetActive(runtime)) {
+			source.replace(dep.range[0], dep.range[1] - 1, "null /* dead branch */");
+			return;
+		}
 		const importedModule = /** @type {Module} */ (moduleGraph.getModule(dep));
 		const content = runtimeTemplate.moduleId({
 			module: importedModule,

package/lib/dependencies/CommonJsSelfReferenceDependency.js

@@ -18,10 +18,10 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, CommonJSDependencyBaseKeywords, ExportInfoName[], boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, CommonJSDependencyBaseKeywords, ExportInfoName[], boolean]>} ObjectSerializerContext */
 
 class CommonJsSelfReferenceDependency extends NullDependency {
 	/**
@@ -34,8 +34,11 @@ class CommonJsSelfReferenceDependency extends NullDependency {
 	constructor(range, base, names, call) {
 		super();
 		this.range = range;
+		/** @type {CommonJSDependencyBaseKeywords} */
 		this.base = base;
+		/** @type {string[]} */
 		this.names = names;
+		/** @type {boolean} */
 		this.call = call;
 	}
 
@@ -70,11 +73,11 @@ class CommonJsSelfReferenceDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.range);
-		write(this.base);
-		write(this.names);
-		write(this.call);
+		context
+			.write(this.range)
+			.write(this.base)
+			.write(this.names)
+			.write(this.call);
 		super.serialize(context);
 	}
 
@@ -83,12 +86,14 @@ class CommonJsSelfReferenceDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.range = read();
-		this.base = read();
-		this.names = read();
-		this.call = read();
-		super.deserialize(context);
+		this.range = context.read();
+		const c1 = context.rest;
+		this.base = c1.read();
+		const c2 = c1.rest;
+		this.names = c2.read();
+		const c3 = c2.rest;
+		this.call = c3.read();
+		super.deserialize(c3.rest);
 	}
 }
 
@@ -113,10 +118,13 @@ CommonJsSelfReferenceDependency.Template = class CommonJsSelfReferenceDependency
 		{ module, moduleGraph, runtime, runtimeRequirements }
 	) {
 		const dep = /** @type {CommonJsSelfReferenceDependency} */ (dependency);
+		// CJS exports are never inlined
 		const used =
 			dep.names.length === 0
 				? dep.names
-				: moduleGraph.getExportsInfo(module).getUsedName(dep.names, runtime);
+				: /** @type {string | string[] | false} */ (
+						moduleGraph.getExportsInfo(module).getUsedName(dep.names, runtime)
+					);
 		if (!used) {
 			throw new Error(
 				"Self-reference dependency has unused export name: This should not happen"

package/lib/dependencies/ConstDependency.js

@@ -16,8 +16,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, number | Range, Set<string> | null]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, number | Range, Set<string> | null]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 
 class ConstDependency extends NullDependency {
@@ -29,8 +29,10 @@ class ConstDependency extends NullDependency {
 	 */
 	constructor(expression, range, runtimeRequirements) {
 		super();
+		/** @type {string} */
 		this.expression = expression;
 		this.range = range;
+		/** @type {Set<string> | null} */
 		this.runtimeRequirements = runtimeRequirements
 			? new Set(runtimeRequirements)
 			: null;
@@ -72,10 +74,11 @@ class ConstDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.expression);
-		write(this.range);
-		write(this.runtimeRequirements);
+		// chain writes so each position is type-checked against the tuple
+		context
+			.write(this.expression)
+			.write(this.range)
+			.write(this.runtimeRequirements);
 		super.serialize(context);
 	}
 
@@ -84,11 +87,13 @@ class ConstDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.expression = read();
-		this.range = read();
-		this.runtimeRequirements = read();
-		super.deserialize(context);
+		// advance the cursor via `rest` so each read is type-checked by position
+		this.expression = context.read();
+		const c1 = context.rest;
+		this.range = c1.read();
+		const c2 = c1.rest;
+		this.runtimeRequirements = c2.read();
+		super.deserialize(c2.rest);
 	}
 }
 

package/lib/dependencies/ContextDependency.js

@@ -42,10 +42,13 @@ class ContextDependency extends Dependency {
 	constructor(options, context) {
 		super();
 
+		/** @type {ContextDependencyOptions} */
 		this.options = options;
+		/** @type {string} */
 		this.userRequest = this.options && this.options.request;
 		/** @type {false | undefined | string} */
 		this.critical = false;
+		/** @type {boolean} */
 		this.hadGlobalOrStickyRegExp = false;
 
 		if (
@@ -67,6 +70,7 @@ class ContextDependency extends Dependency {
 		this.inShorthand = undefined;
 		/** @type {Replaces | undefined} */
 		this.replaces = undefined;
+		/** @type {string | undefined} */
 		this._requestContext = context;
 	}
 

package/lib/dependencies/ContextDependencyTemplateAsId.js

@@ -31,7 +31,7 @@ class ContextDependencyTemplateAsId extends ContextDependency.Template {
 			module,
 			chunkGraph,
 			request: /** @type {string} */ (dep.request),
-			weak: dep.weak,
+			weak: /** @type {{ weak?: boolean }} */ (dep).weak,
 			runtimeRequirements
 		});
 

package/lib/dependencies/ContextElementDependency.js

@@ -15,9 +15,9 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined]>} ObjectSerializerContext */
 
 class ContextElementDependency extends ModuleDependency {
 	/**
@@ -42,13 +42,19 @@ class ContextElementDependency extends ModuleDependency {
 		super(request);
 
 		if (userRequest) {
+			/** @type {string} */
 			this.userRequest = userRequest;
 		}
 
+		/** @type {string | undefined} */
 		this._typePrefix = typePrefix;
+		/** @type {string} */
 		this._category = category;
+		/** @type {RawReferencedExports | null | undefined} */
 		this.referencedExports = referencedExports;
+		/** @type {string | undefined} */
 		this._context = context || undefined;
+		/** @type {ImportAttributes | undefined} */
 		this.attributes = attributes;
 	}
 
@@ -110,7 +116,8 @@ class ContextElementDependency extends ModuleDependency {
 			}
 			refs.push({
 				name: referencedExport,
-				canMangle: false
+				canMangle: false,
+				canInline: false
 			});
 		}
 		return refs;
@@ -121,11 +128,11 @@ class ContextElementDependency extends ModuleDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this._typePrefix);
-		write(this._category);
-		write(this.referencedExports);
-		write(this.attributes);
+		context
+			.write(this._typePrefix)
+			.write(this._category)
+			.write(this.referencedExports)
+			.write(this.attributes);
 		super.serialize(context);
 	}
 
@@ -134,12 +141,14 @@ class ContextElementDependency extends ModuleDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this._typePrefix = read();
-		this._category = read();
-		this.referencedExports = read();
-		this.attributes = read();
-		super.deserialize(context);
+		this._typePrefix = context.read();
+		const c1 = context.rest;
+		this._category = c1.read();
+		const c2 = c1.rest;
+		this.referencedExports = c2.read();
+		const c3 = c2.rest;
+		this.attributes = c3.read();
+		super.deserialize(c3.rest);
 	}
 }
 

package/lib/dependencies/CreateRequireParserPlugin.js

@@ -50,6 +50,7 @@ class CreateRequireParserPlugin {
 	 * @param {JavascriptParserOptions} options parser options
 	 */
 	constructor(options) {
+		/** @type {JavascriptParserOptions} */
 		this.options = options;
 	}
 

package/lib/dependencies/CreateScriptUrlDependency.js

@@ -13,8 +13,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
 
 class CreateScriptUrlDependency extends NullDependency {
 	/**
@@ -35,8 +35,7 @@ class CreateScriptUrlDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.range);
+		context.write(this.range);
 		super.serialize(context);
 	}
 
@@ -45,9 +44,8 @@ class CreateScriptUrlDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.range = read();
-		super.deserialize(context);
+		this.range = context.read();
+		super.deserialize(context.rest);
 	}
 }
 

package/lib/dependencies/CriticalDependencyWarning.js

@@ -18,6 +18,7 @@ class CriticalDependencyWarning extends WebpackError {
 
 		/** @type {string} */
 		this.name = "CriticalDependencyWarning";
+		/** @type {string} */
 		this.message = `Critical dependency: ${message}`;
 	}
 }