webpack 5.76.1 → 5.88.2

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -15,6 +15,7 @@ const { countIterable } = require("../util/IterableHelpers");
 const { first, combine } = require("../util/SetHelpers");
 const makeSerializable = require("../util/makeSerializable");
 const propertyAccess = require("../util/propertyAccess");
+const { propertyName } = require("../util/propertyName");
 const { getRuntimeKey, keyToRuntime } = require("../util/runtime");
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
@@ -35,6 +36,9 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
@@ -326,10 +330,10 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {string[]} ids the requested export name of the imported module
 	 * @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 {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | Iterable<HarmonyExportImportedSpecifierDependency> | null} otherStarExports other star exports in the module before this import
 	 * @param {number} exportPresenceMode mode of checking export names
-	 * @param {HarmonyStarExportsList} allStarExports all star exports in the module
-	 * @param {Record<string, any>=} assertions import assertions
+	 * @param {HarmonyStarExportsList | null} allStarExports all star exports in the module
+	 * @param {Assertions=} assertions import assertions
 	 */
 	constructor(
 		request,
@@ -752,7 +756,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	/**
 	 * Returns warnings
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {WebpackError[]} warnings
+	 * @returns {WebpackError[] | null | undefined} warnings
 	 */
 	getWarnings(moduleGraph) {
 		const exportsPresence = this._getEffectiveExportPresenceLevel(moduleGraph);
@@ -765,7 +769,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	/**
 	 * Returns errors
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {WebpackError[]} errors
+	 * @returns {WebpackError[] | null | undefined} errors
 	 */
 	getErrors(moduleGraph) {
 		const exportsPresence = this._getEffectiveExportPresenceLevel(moduleGraph);
@@ -856,6 +860,9 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		return errors;
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write, setCircularReference } = context;
 
@@ -870,6 +877,9 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read, setCircularReference } = context;
 
@@ -1211,7 +1221,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 			valueKey[0]
 		)})) ${
 			RuntimeGlobals.definePropertyGetters
-		}(${exportsName}, { ${JSON.stringify(
+		}(${exportsName}, { ${propertyName(
 			key
 		)}: function() { return ${returnValue}; } });\n`;
 	}
@@ -1251,11 +1261,17 @@ class HarmonyStarExportsList {
 		return this.dependencies.slice();
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize({ write, setCircularReference }) {
 		setCircularReference(this);
 		write(this.dependencies);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize({ read, setCircularReference }) {
 		setCircularReference(this);
 		this.dependencies = read();

package/lib/dependencies/HarmonyExportInitFragment.js

@@ -8,6 +8,7 @@
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const { first } = require("../util/SetHelpers");
+const { propertyName } = require("../util/propertyName");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
@@ -150,7 +151,7 @@ class HarmonyExportInitFragment extends InitFragment {
 		);
 		for (const [key, value] of orderedExportMap) {
 			definitions.push(
-				`\n/* harmony export */   ${JSON.stringify(
+				`\n/* harmony export */   ${propertyName(
 					key
 				)}: ${runtimeTemplate.returningFunction(value)}`
 			);

package/lib/dependencies/HarmonyExportSpecifierDependency.js

@@ -15,8 +15,14 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 class HarmonyExportSpecifierDependency extends NullDependency {
+	/**
+	 * @param {TODO} id id
+	 * @param {TODO} name name
+	 */
 	constructor(id, name) {
 		super();
 		this.id = id;
@@ -49,6 +55,9 @@ class HarmonyExportSpecifierDependency extends NullDependency {
 		return false;
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.id);
@@ -56,6 +65,9 @@ class HarmonyExportSpecifierDependency extends NullDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.id = read();

package/lib/dependencies/HarmonyExports.js

@@ -5,6 +5,10 @@
 
 "use strict";
 
+const RuntimeGlobals = require("../RuntimeGlobals");
+
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
 
 /** @type {WeakMap<ParserState, boolean>} */
@@ -20,12 +24,14 @@ exports.enable = (parserState, isStrictHarmony) => {
 	if (value === false) return;
 	parserStateExportsState.set(parserState, true);
 	if (value !== true) {
-		parserState.module.buildMeta.exportsType = "namespace";
-		parserState.module.buildInfo.strict = true;
-		parserState.module.buildInfo.exportsArgument = "__webpack_exports__";
+		const buildMeta = /** @type {BuildMeta} */ (parserState.module.buildMeta);
+		buildMeta.exportsType = "namespace";
+		const buildInfo = /** @type {BuildInfo} */ (parserState.module.buildInfo);
+		buildInfo.strict = true;
+		buildInfo.exportsArgument = RuntimeGlobals.exports;
 		if (isStrictHarmony) {
-			parserState.module.buildMeta.strictHarmonyModule = true;
-			parserState.module.buildInfo.moduleArgument = "__webpack_module__";
+			buildMeta.strictHarmonyModule = true;
+			buildInfo.moduleArgument = "__webpack_module__";
 		}
 	}
 };

package/lib/dependencies/HarmonyImportDependency.js

@@ -24,6 +24,9 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
@@ -53,7 +56,7 @@ class HarmonyImportDependency extends ModuleDependency {
 	 *
 	 * @param {string} request request string
 	 * @param {number} sourceOrder source order
-	 * @param {Record<string, any>=} assertions import assertions
+	 * @param {Assertions=} assertions import assertions
 	 */
 	constructor(request, sourceOrder, assertions) {
 		super(request);
@@ -221,6 +224,9 @@ class HarmonyImportDependency extends ModuleDependency {
 		}
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.sourceOrder);
@@ -228,6 +234,9 @@ class HarmonyImportDependency extends ModuleDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.sourceOrder = read();

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -21,8 +21,12 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("estree").Identifier} Identifier */
 /** @typedef {import("estree").ImportDeclaration} ImportDeclaration */
 /** @typedef {import("estree").ImportExpression} ImportExpression */
+/** @typedef {import("estree").MemberExpression} MemberExpression */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
 /** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
 /** @typedef {import("./HarmonyImportDependency")} HarmonyImportDependency */
@@ -113,19 +117,21 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				parser.state.lastHarmonyImportOrder =
 					(parser.state.lastHarmonyImportOrder || 0) + 1;
 				const clearDep = new ConstDependency(
-					parser.isAsiPosition(statement.range[0]) ? ";" : "",
-					statement.range
+					parser.isAsiPosition(/** @type {Range} */ (statement.range)[0])
+						? ";"
+						: "",
+					/** @type {Range} */ (statement.range)
 				);
-				clearDep.loc = statement.loc;
+				clearDep.loc = /** @type {DependencyLocation} */ (statement.loc);
 				parser.state.module.addPresentationalDependency(clearDep);
-				parser.unsetAsiPosition(statement.range[1]);
+				parser.unsetAsiPosition(/** @type {Range} */ (statement.range)[1]);
 				const assertions = getAssertions(statement);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					source,
 					parser.state.lastHarmonyImportOrder,
 					assertions
 				);
-				sideEffectDep.loc = statement.loc;
+				sideEffectDep.loc = /** @type {DependencyLocation} */ (statement.loc);
 				parser.state.module.addDependency(sideEffectDep);
 				return true;
 			}
@@ -159,6 +165,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 
 				const rootInfo = rightPart.rootInfo;
 				if (
+					typeof rootInfo === "string" ||
 					!rootInfo ||
 					!rootInfo.tagInfo ||
 					rootInfo.tagInfo.tag !== harmonySpecifierTag
@@ -171,13 +178,15 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.sourceOrder,
 					settings.ids.concat(members).concat([leftPart]),
 					settings.name,
-					expression.range,
+					/** @type {Range} */ (expression.range),
 					settings.assertions,
 					"in"
 				);
 				dep.directImport = members.length === 0;
-				dep.asiSafe = !parser.isAsiPosition(expression.range[0]);
-				dep.loc = expression.loc;
+				dep.asiSafe = !parser.isAsiPosition(
+					/** @type {Range} */ (expression.range)[0]
+				);
+				dep.loc = /** @type {DependencyLocation} */ (expression.loc);
 				parser.state.module.addDependency(dep);
 				InnerGraph.onUsage(parser.state, e => (dep.usedByExports = e));
 				return true;
@@ -192,14 +201,20 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.sourceOrder,
 					settings.ids,
 					settings.name,
-					expr.range,
+					/** @type {Range} */ (expr.range),
 					exportPresenceMode,
-					settings.assertions
+					settings.assertions,
+					[]
 				);
+				dep.referencedPropertiesInDestructuring =
+					parser.destructuringAssignmentPropertiesFor(expr);
 				dep.shorthand = parser.scope.inShorthand;
 				dep.directImport = true;
-				dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
-				dep.loc = expr.loc;
+				dep.asiSafe = !parser.isAsiPosition(
+					/** @type {Range} */ (expr.range)[0]
+				);
+				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.call = parser.scope.inTaggedTemplateTag;
 				parser.state.module.addDependency(dep);
 				InnerGraph.onUsage(parser.state, e => (dep.usedByExports = e));
 				return true;
@@ -208,7 +223,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			.for(harmonySpecifierTag)
 			.tap(
 				"HarmonyImportDependencyParserPlugin",
-				(expression, members, membersOptionals) => {
+				(expression, members, membersOptionals, memberRanges) => {
 					const settings = /** @type {HarmonySettings} */ (
 						parser.currentTagData
 					);
@@ -216,6 +231,10 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						members,
 						membersOptionals
 					);
+					const ranges = memberRanges.slice(
+						0,
+						memberRanges.length - (members.length - nonOptionalMembers.length)
+					);
 					const expr =
 						nonOptionalMembers !== members
 							? getNonOptionalMemberChain(
@@ -229,12 +248,17 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						settings.sourceOrder,
 						ids,
 						settings.name,
-						expr.range,
+						/** @type {Range} */ (expr.range),
 						exportPresenceMode,
-						settings.assertions
+						settings.assertions,
+						ranges
 					);
-					dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
-					dep.loc = expr.loc;
+					dep.referencedPropertiesInDestructuring =
+						parser.destructuringAssignmentPropertiesFor(expr);
+					dep.asiSafe = !parser.isAsiPosition(
+						/** @type {Range} */ (expr.range)[0]
+					);
+					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addDependency(dep);
 					InnerGraph.onUsage(parser.state, e => (dep.usedByExports = e));
 					return true;
@@ -244,7 +268,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			.for(harmonySpecifierTag)
 			.tap(
 				"HarmonyImportDependencyParserPlugin",
-				(expression, members, membersOptionals) => {
+				(expression, members, membersOptionals, memberRanges) => {
 					const { arguments: args, callee } = expression;
 					const settings = /** @type {HarmonySettings} */ (
 						parser.currentTagData
@@ -253,6 +277,10 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						members,
 						membersOptionals
 					);
+					const ranges = memberRanges.slice(
+						0,
+						memberRanges.length - (members.length - nonOptionalMembers.length)
+					);
 					const expr =
 						nonOptionalMembers !== members
 							? getNonOptionalMemberChain(
@@ -266,17 +294,20 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						settings.sourceOrder,
 						ids,
 						settings.name,
-						expr.range,
+						/** @type {Range} */ (expr.range),
 						exportPresenceMode,
-						settings.assertions
+						settings.assertions,
+						ranges
 					);
 					dep.directImport = members.length === 0;
 					dep.call = true;
-					dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
+					dep.asiSafe = !parser.isAsiPosition(
+						/** @type {Range} */ (expr.range)[0]
+					);
 					// only in case when we strictly follow the spec we need a special case here
 					dep.namespaceObjectAsContext =
 						members.length > 0 && this.strictThisContextOnImports;
-					dep.loc = expr.loc;
+					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addDependency(dep);
 					if (args) parser.walkExpressions(args);
 					InnerGraph.onUsage(parser.state, e => (dep.usedByExports = e));

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -11,15 +11,20 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../InitFragment")} InitFragment */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
+/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
+	/**
+	 * @param {TODO} request the request string
+	 * @param {number} sourceOrder source order
+	 * @param {Assertions=} assertions assertions
+	 */
 	constructor(request, sourceOrder, assertions) {
 		super(request, sourceOrder, assertions);
 	}
@@ -68,7 +73,7 @@ HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDepend
 	apply(dependency, source, templateContext) {
 		const { moduleGraph, concatenationScope } = templateContext;
 		if (concatenationScope) {
-			const module = moduleGraph.getModule(dependency);
+			const module = /** @type {Module} */ (moduleGraph.getModule(dependency));
 			if (concatenationScope.isModuleInScope(module)) {
 				return;
 			}