webpack 5.70.0 → 5.71.0

package/lib/javascript/JavascriptParser.js

@@ -57,7 +57,7 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 /** @typedef {{declaredScope: ScopeInfo, freeName: string | true, tagInfo: TagInfo | undefined}} VariableInfoInterface */
-/** @typedef {{ name: string | VariableInfo, rootInfo: string | VariableInfo, getMembers: () => string[] }} GetInfoResult */
+/** @typedef {{ name: string | VariableInfo, rootInfo: string | VariableInfo, getMembers: () => string[], getMembersOptionals: () => boolean[] }} GetInfoResult */
 
 const EMPTY_ARRAY = [];
 const ALLOWED_MEMBER_TYPES_CALL_EXPRESSION = 0b01;
@@ -262,9 +262,9 @@ class JavascriptParser extends Parser {
 			/** @type {HookMap<SyncBailHook<[ExpressionNode], boolean | void>>} */
 			call: new HookMap(() => new SyncBailHook(["expression"])),
 			/** Something like "a.b()" */
-			/** @type {HookMap<SyncBailHook<[CallExpressionNode, string[]], boolean | void>>} */
+			/** @type {HookMap<SyncBailHook<[CallExpressionNode, string[], boolean[]], boolean | void>>} */
 			callMemberChain: new HookMap(
-				() => new SyncBailHook(["expression", "members"])
+				() => new SyncBailHook(["expression", "members", "membersOptionals"])
 			),
 			/** Something like "a.b().c.d" */
 			/** @type {HookMap<SyncBailHook<[ExpressionNode, string[], CallExpressionNode, string[]], boolean | void>>} */
@@ -292,11 +292,13 @@ class JavascriptParser extends Parser {
 			optionalChaining: new SyncBailHook(["optionalChaining"]),
 			/** @type {HookMap<SyncBailHook<[NewExpressionNode], boolean | void>>} */
 			new: new HookMap(() => new SyncBailHook(["expression"])),
+			/** @type {SyncBailHook<[BinaryExpressionNode], boolean | void>} */
+			binaryExpression: new SyncBailHook(["binaryExpression"]),
 			/** @type {HookMap<SyncBailHook<[ExpressionNode], boolean | void>>} */
 			expression: new HookMap(() => new SyncBailHook(["expression"])),
-			/** @type {HookMap<SyncBailHook<[ExpressionNode, string[]], boolean | void>>} */
+			/** @type {HookMap<SyncBailHook<[ExpressionNode, string[], boolean[]], boolean | void>>} */
 			expressionMemberChain: new HookMap(
-				() => new SyncBailHook(["expression", "members"])
+				() => new SyncBailHook(["expression", "members", "membersOptionals"])
 			),
 			/** @type {HookMap<SyncBailHook<[ExpressionNode, string[]], boolean | void>>} */
 			unhandledExpressionMemberChain: new HookMap(
@@ -416,7 +418,6 @@ class JavascriptParser extends Parser {
 				const expr = /** @type {LogicalExpressionNode} */ (_expr);
 
 				const left = this.evaluateExpression(expr.left);
-				if (!left) return;
 				let returnRight = false;
 				/** @type {boolean|undefined} */
 				let allowedRight;
@@ -437,7 +438,6 @@ class JavascriptParser extends Parser {
 					returnRight = true;
 				} else return;
 				const right = this.evaluateExpression(expr.right);
-				if (!right) return;
 				if (returnRight) {
 					if (left.couldHaveSideEffects()) right.setSideEffects();
 					return right.setRange(expr.range);
@@ -486,10 +486,10 @@ class JavascriptParser extends Parser {
 
 				const handleConstOperation = fn => {
 					const left = this.evaluateExpression(expr.left);
-					if (!left || !left.isCompileTimeValue()) return;
+					if (!left.isCompileTimeValue()) return;
 
 					const right = this.evaluateExpression(expr.right);
-					if (!right || !right.isCompileTimeValue()) return;
+					if (!right.isCompileTimeValue()) return;
 
 					const result = fn(
 						left.asCompileTimeValue(),
@@ -545,9 +545,7 @@ class JavascriptParser extends Parser {
 
 				const handleStrictEqualityComparison = eql => {
 					const left = this.evaluateExpression(expr.left);
-					if (!left) return;
 					const right = this.evaluateExpression(expr.right);
-					if (!right) return;
 					const res = new BasicEvaluatedExpression();
 					res.setRange(expr.range);
 
@@ -600,9 +598,7 @@ class JavascriptParser extends Parser {
 
 				const handleAbstractEqualityComparison = eql => {
 					const left = this.evaluateExpression(expr.left);
-					if (!left) return;
 					const right = this.evaluateExpression(expr.right);
-					if (!right) return;
 					const res = new BasicEvaluatedExpression();
 					res.setRange(expr.range);
 
@@ -635,9 +631,7 @@ class JavascriptParser extends Parser {
 
 				if (expr.operator === "+") {
 					const left = this.evaluateExpression(expr.left);
-					if (!left) return;
 					const right = this.evaluateExpression(expr.right);
-					if (!right) return;
 					const res = new BasicEvaluatedExpression();
 					if (left.isString()) {
 						if (right.isString()) {
@@ -816,7 +810,7 @@ class JavascriptParser extends Parser {
 
 				const handleConstOperation = fn => {
 					const argument = this.evaluateExpression(expr.argument);
-					if (!argument || !argument.isCompileTimeValue()) return;
+					if (!argument.isCompileTimeValue()) return;
 					const result = fn(argument.asCompileTimeValue());
 					return valueAsExpression(
 						result,
@@ -915,7 +909,6 @@ class JavascriptParser extends Parser {
 					}
 				} else if (expr.operator === "!") {
 					const argument = this.evaluateExpression(expr.argument);
-					if (!argument) return;
 					const bool = argument.asBool();
 					if (typeof bool !== "boolean") return;
 					return new BasicEvaluatedExpression()
@@ -980,7 +973,12 @@ class JavascriptParser extends Parser {
 					const info = cachedExpression === expr ? cachedInfo : getInfo(expr);
 					if (info !== undefined) {
 						return new BasicEvaluatedExpression()
-							.setIdentifier(info.name, info.rootInfo, info.getMembers)
+							.setIdentifier(
+								info.name,
+								info.rootInfo,
+								info.getMembers,
+								info.getMembersOptionals
+							)
 							.setRange(expr.range);
 					}
 				});
@@ -997,7 +995,12 @@ class JavascriptParser extends Parser {
 				typeof info === "string" ||
 				(info instanceof VariableInfo && typeof info.freeName === "string")
 			) {
-				return { name: info, rootInfo: info, getMembers: () => [] };
+				return {
+					name: info,
+					rootInfo: info,
+					getMembers: () => [],
+					getMembersOptionals: () => []
+				};
 			}
 		});
 		tapEvaluateWithVariableInfo("ThisExpression", expr => {
@@ -1006,7 +1009,12 @@ class JavascriptParser extends Parser {
 				typeof info === "string" ||
 				(info instanceof VariableInfo && typeof info.freeName === "string")
 			) {
-				return { name: info, rootInfo: info, getMembers: () => [] };
+				return {
+					name: info,
+					rootInfo: info,
+					getMembers: () => [],
+					getMembersOptionals: () => []
+				};
 			}
 		});
 		this.hooks.evaluate.for("MetaProperty").tap("JavascriptParser", expr => {
@@ -1039,7 +1047,6 @@ class JavascriptParser extends Parser {
 			const param = this.evaluateExpression(
 				/** @type {ExpressionNode} */ (expr.callee.object)
 			);
-			if (!param) return;
 			const property =
 				expr.callee.property.type === "Literal"
 					? `${expr.callee.property.value}`
@@ -1306,7 +1313,6 @@ class JavascriptParser extends Parser {
 				if (conditionValue === undefined) {
 					const consequent = this.evaluateExpression(expr.consequent);
 					const alternate = this.evaluateExpression(expr.alternate);
-					if (!consequent || !alternate) return;
 					res = new BasicEvaluatedExpression();
 					if (consequent.isConditional()) {
 						res.setOptions(consequent.options);
@@ -1380,7 +1386,7 @@ class JavascriptParser extends Parser {
 					const expression = optionalExpressionsStack.pop();
 					const evaluated = this.evaluateExpression(expression);
 
-					if (evaluated && evaluated.asNullish()) {
+					if (evaluated.asNullish()) {
 						return evaluated.setRange(_expr.range);
 					}
 				}
@@ -1390,7 +1396,7 @@ class JavascriptParser extends Parser {
 
 	getRenameIdentifier(expr) {
 		const result = this.evaluateExpression(expr);
-		if (result && result.isIdentifier()) {
+		if (result.isIdentifier()) {
 			return result.identifier;
 		}
 	}
@@ -2457,7 +2463,9 @@ class JavascriptParser extends Parser {
 	}
 
 	walkBinaryExpression(expression) {
-		this.walkLeftRightExpression(expression);
+		if (this.hooks.binaryExpression.call(expression) === undefined) {
+			this.walkLeftRightExpression(expression);
+		}
 	}
 
 	walkLogicalExpression(expression) {
@@ -2492,7 +2500,9 @@ class JavascriptParser extends Parser {
 					) {
 						this.setVariable(
 							expression.left.name,
-							this.getVariableInfo(renameIdentifier)
+							typeof renameIdentifier === "string"
+								? this.getVariableInfo(renameIdentifier)
+								: renameIdentifier
 						);
 					}
 					return;
@@ -2627,7 +2637,9 @@ class JavascriptParser extends Parser {
 							argOrThis
 						)
 					) {
-						return this.getVariableInfo(renameIdentifier);
+						return typeof renameIdentifier === "string"
+							? this.getVariableInfo(renameIdentifier)
+							: renameIdentifier;
 					}
 				}
 			}
@@ -2727,7 +2739,10 @@ class JavascriptParser extends Parser {
 					this.hooks.callMemberChain,
 					callee.rootInfo,
 					expression,
-					callee.getMembers()
+					callee.getMembers(),
+					callee.getMembersOptionals
+						? callee.getMembersOptionals()
+						: callee.getMembers().map(() => false)
 				);
 				if (result1 === true) return;
 				const result2 = this.callHooksForInfo(
@@ -2767,11 +2782,13 @@ class JavascriptParser extends Parser {
 					);
 					if (result1 === true) return;
 					const members = exprInfo.getMembers();
+					const membersOptionals = exprInfo.getMembersOptionals();
 					const result2 = this.callHooksForInfo(
 						this.hooks.expressionMemberChain,
 						exprInfo.rootInfo,
 						expression,
-						members
+						members,
+						membersOptionals
 					);
 					if (result2 === true) return;
 					this.walkMemberExpressionWithExpressionName(
@@ -3167,17 +3184,15 @@ class JavascriptParser extends Parser {
 
 	/**
 	 * @param {ExpressionNode} expression expression node
-	 * @returns {BasicEvaluatedExpression | undefined} evaluation result
+	 * @returns {BasicEvaluatedExpression} evaluation result
 	 */
 	evaluateExpression(expression) {
 		try {
 			const hook = this.hooks.evaluate.get(expression.type);
 			if (hook !== undefined) {
 				const result = hook.call(expression);
-				if (result !== undefined) {
-					if (result) {
-						result.setExpression(expression);
-					}
+				if (result !== undefined && result !== null) {
+					result.setExpression(expression);
 					return result;
 				}
 			}
@@ -3348,6 +3363,10 @@ class JavascriptParser extends Parser {
 		return state;
 	}
 
+	/**
+	 * @param {string} source source code
+	 * @returns {BasicEvaluatedExpression} evaluation result
+	 */
 	evaluate(source) {
 		const ast = JavascriptParser._parse("(" + source + ")", {
 			sourceType: this.sourceType,
@@ -3609,12 +3628,13 @@ class JavascriptParser extends Parser {
 
 	/**
 	 * @param {MemberExpressionNode} expression a member expression
-	 * @returns {{ members: string[], object: ExpressionNode | SuperNode }} member names (reverse order) and remaining object
+	 * @returns {{ members: string[], object: ExpressionNode | SuperNode, membersOptionals: boolean[] }} member names (reverse order) and remaining object
 	 */
 	extractMemberExpressionChain(expression) {
 		/** @type {AnyNode} */
 		let expr = expression;
 		const members = [];
+		const membersOptionals = [];
 		while (expr.type === "MemberExpression") {
 			if (expr.computed) {
 				if (expr.property.type !== "Literal") break;
@@ -3623,10 +3643,13 @@ class JavascriptParser extends Parser {
 				if (expr.property.type !== "Identifier") break;
 				members.push(expr.property.name);
 			}
+			membersOptionals.push(expr.optional);
 			expr = expr.object;
 		}
+
 		return {
 			members,
+			membersOptionals,
 			object: expr
 		};
 	}
@@ -3649,8 +3672,8 @@ class JavascriptParser extends Parser {
 		return { info, name };
 	}
 
-	/** @typedef {{ type: "call", call: CallExpressionNode, calleeName: string, rootInfo: string | VariableInfo, getCalleeMembers: () => string[], name: string, getMembers: () => string[]}} CallExpressionInfo */
-	/** @typedef {{ type: "expression", rootInfo: string | VariableInfo, name: string, getMembers: () => string[]}} ExpressionExpressionInfo */
+	/** @typedef {{ type: "call", call: CallExpressionNode, calleeName: string, rootInfo: string | VariableInfo, getCalleeMembers: () => string[], name: string, getMembers: () => string[], getMembersOptionals: () => boolean[]}} CallExpressionInfo */
+	/** @typedef {{ type: "expression", rootInfo: string | VariableInfo, name: string, getMembers: () => string[], getMembersOptionals: () => boolean[]}} ExpressionExpressionInfo */
 
 	/**
 	 * @param {MemberExpressionNode} expression a member expression
@@ -3658,7 +3681,8 @@ class JavascriptParser extends Parser {
 	 * @returns {CallExpressionInfo | ExpressionExpressionInfo | undefined} expression info
 	 */
 	getMemberExpressionInfo(expression, allowedTypes) {
-		const { object, members } = this.extractMemberExpressionChain(expression);
+		const { object, members, membersOptionals } =
+			this.extractMemberExpressionChain(expression);
 		switch (object.type) {
 			case "CallExpression": {
 				if ((allowedTypes & ALLOWED_MEMBER_TYPES_CALL_EXPRESSION) === 0)
@@ -3682,7 +3706,8 @@ class JavascriptParser extends Parser {
 					rootInfo,
 					getCalleeMembers: memoize(() => rootMembers.reverse()),
 					name: objectAndMembersToName(`${calleeName}()`, members),
-					getMembers: memoize(() => members.reverse())
+					getMembers: memoize(() => members.reverse()),
+					getMembersOptionals: memoize(() => membersOptionals.reverse())
 				};
 			}
 			case "Identifier":
@@ -3700,7 +3725,8 @@ class JavascriptParser extends Parser {
 					type: "expression",
 					name: objectAndMembersToName(resolvedRoot, members),
 					rootInfo,
-					getMembers: memoize(() => members.reverse())
+					getMembers: memoize(() => members.reverse()),
+					getMembersOptionals: memoize(() => membersOptionals.reverse())
 				};
 			}
 		}

package/lib/library/UmdLibraryPlugin.js

@@ -310,9 +310,11 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 								: "		var a = factory();\n") +
 						  "		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
 						  "	}\n") +
-					`})(${
-						runtimeTemplate.outputOptions.globalObject
-					}, function(${externalsArguments(externals)}) {\nreturn `,
+					`})(${runtimeTemplate.outputOptions.globalObject}, ${
+						runtimeTemplate.supportsArrowFunction()
+							? `(${externalsArguments(externals)}) =>`
+							: `function(${externalsArguments(externals)})`
+					} {\nreturn `,
 				"webpack/universalModuleDefinition"
 			),
 			source,

package/lib/runtime/BaseUriRuntimeModule.js

@@ -0,0 +1,31 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Ivan Kopeykin @vankop
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeModule = require("../RuntimeModule");
+
+class BaseUriRuntimeModule extends RuntimeModule {
+	constructor() {
+		super("base uri", RuntimeModule.STAGE_ATTACH);
+	}
+
+	/**
+	 * @returns {string} runtime code
+	 */
+	generate() {
+		const { chunk } = this;
+
+		const options = chunk.getEntryOptions();
+		return `${RuntimeGlobals.baseURI} = ${
+			options.baseUri === undefined
+				? "undefined"
+				: JSON.stringify(options.baseUri)
+		};`;
+	}
+}
+
+module.exports = BaseUriRuntimeModule;

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -2155,7 +2155,7 @@ const RESULT_GROUPERS = {
 // remove a prefixed "!" that can be specified to reverse sort order
 const normalizeFieldKey = field => {
 	if (field[0] === "!") {
-		return field.substr(1);
+		return field.slice(1);
 	}
 	return field;
 };

package/lib/util/internalSerializables.js

@@ -103,6 +103,8 @@ module.exports = {
 		require("../dependencies/HarmonyImportSideEffectDependency"),
 	"dependencies/HarmonyImportSpecifierDependency": () =>
 		require("../dependencies/HarmonyImportSpecifierDependency"),
+	"dependencies/HarmonyEvaluatedImportSpecifierDependency": () =>
+		require("../dependencies/HarmonyEvaluatedImportSpecifierDependency"),
 	"dependencies/ImportContextDependency": () =>
 		require("../dependencies/ImportContextDependency"),
 	"dependencies/ImportDependency": () =>

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -286,8 +286,9 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 				? Template.asString([
 						"var currentUpdatedModulesList;",
 						"var waitingUpdateResolves = {};",
-						"function loadUpdateChunk(chunkId) {",
+						"function loadUpdateChunk(chunkId, updatedModulesList) {",
 						Template.indent([
+							"currentUpdatedModulesList = updatedModulesList;",
 							`return new Promise(${runtimeTemplate.basicFunction(
 								"resolve, reject",
 								[

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.70.0",
+  "version": "5.71.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",

package/types.d.ts

@@ -474,9 +474,10 @@ declare abstract class BasicEvaluatedExpression {
 	prefix?: BasicEvaluatedExpression;
 	postfix?: BasicEvaluatedExpression;
 	wrappedInnerExpressions: any;
-	identifier?: string;
+	identifier?: string | VariableInfoInterface;
 	rootInfo: VariableInfoInterface;
 	getMembers: () => string[];
+	getMembersOptionals: () => boolean[];
 	expression: NodeEstreeIndex;
 	isUnknown(): boolean;
 	isNull(): boolean;
@@ -528,7 +529,8 @@ declare abstract class BasicEvaluatedExpression {
 	setIdentifier(
 		identifier?: any,
 		rootInfo?: any,
-		getMembers?: any
+		getMembers?: any,
+		getMembersOptionals?: any
 	): BasicEvaluatedExpression;
 	setWrapped(
 		prefix?: any,
@@ -681,6 +683,7 @@ declare interface CallExpressionInfo {
 	getCalleeMembers: () => string[];
 	name: string;
 	getMembers: () => string[];
+	getMembersOptionals: () => boolean[];
 }
 declare interface CallbackAsyncQueue<T> {
 	(err?: null | WebpackError, result?: T): any;
@@ -1239,6 +1242,11 @@ declare interface CodeGenerationContext {
 	 * code generation results of other modules (need to have a codeGenerationDependency to use that)
 	 */
 	codeGenerationResults: CodeGenerationResults;
+
+	/**
+	 * the compilation
+	 */
+	compilation?: Compilation;
 }
 declare interface CodeGenerationResult {
 	/**
@@ -2454,7 +2462,7 @@ declare interface ContainerReferencePluginOptions {
 	shareScope?: string;
 }
 declare abstract class ContextElementDependency extends ModuleDependency {
-	referencedExports: any;
+	referencedExports?: string[][];
 }
 declare class ContextExclusionPlugin {
 	constructor(negativeMatcher: RegExp);
@@ -2637,6 +2645,7 @@ declare class Dependency {
 		endLine?: any,
 		endColumn?: any
 	): void;
+	getContext(): undefined | string;
 	getResourceIdentifier(): null | string;
 	couldAffectReferencingModule(): boolean | typeof TRANSITIVE;
 
@@ -3819,6 +3828,7 @@ declare interface ExpressionExpressionInfo {
 	rootInfo: string | VariableInfo;
 	name: string;
 	getMembers: () => string[];
+	getMembersOptionals: () => boolean[];
 }
 type ExternalItem =
 	| string
@@ -5097,7 +5107,7 @@ declare class JavascriptParser extends Parser {
 		topLevelAwait: SyncBailHook<[Expression], boolean | void>;
 		call: HookMap<SyncBailHook<[Expression], boolean | void>>;
 		callMemberChain: HookMap<
-			SyncBailHook<[CallExpression, string[]], boolean | void>
+			SyncBailHook<[CallExpression, string[], boolean[]], boolean | void>
 		>;
 		memberChainOfCallMemberChain: HookMap<
 			SyncBailHook<
@@ -5113,9 +5123,10 @@ declare class JavascriptParser extends Parser {
 		>;
 		optionalChaining: SyncBailHook<[ChainExpression], boolean | void>;
 		new: HookMap<SyncBailHook<[NewExpression], boolean | void>>;
+		binaryExpression: SyncBailHook<[BinaryExpression], boolean | void>;
 		expression: HookMap<SyncBailHook<[Expression], boolean | void>>;
 		expressionMemberChain: HookMap<
-			SyncBailHook<[Expression, string[]], boolean | void>
+			SyncBailHook<[Expression, string[], boolean[]], boolean | void>
 		>;
 		unhandledExpressionMemberChain: HookMap<
 			SyncBailHook<[Expression, string[]], boolean | void>
@@ -5183,7 +5194,7 @@ declare class JavascriptParser extends Parser {
 	)[];
 	prevStatement: any;
 	currentTagData: any;
-	getRenameIdentifier(expr?: any): undefined | string;
+	getRenameIdentifier(expr?: any): undefined | string | VariableInfoInterface;
 	walkClass(classy: ClassExpression | ClassDeclaration): void;
 	preWalkStatements(statements?: any): void;
 	blockPreWalkStatements(statements?: any): void;
@@ -5330,12 +5341,10 @@ declare class JavascriptParser extends Parser {
 	enterArrayPattern(pattern?: any, onIdent?: any): void;
 	enterRestElement(pattern?: any, onIdent?: any): void;
 	enterAssignmentPattern(pattern?: any, onIdent?: any): void;
-	evaluateExpression(
-		expression: Expression
-	): undefined | BasicEvaluatedExpression;
+	evaluateExpression(expression: Expression): BasicEvaluatedExpression;
 	parseString(expression?: any): any;
 	parseCalculatedString(expression?: any): any;
-	evaluate(source?: any): undefined | BasicEvaluatedExpression;
+	evaluate(source: string): BasicEvaluatedExpression;
 	isPure(
 		expr:
 			| undefined
@@ -5418,6 +5427,7 @@ declare class JavascriptParser extends Parser {
 			| ImportExpression
 			| ChainExpression
 			| Super;
+		membersOptionals: boolean[];
 	};
 	getFreeInfoFromVariable(varName: string): {
 		name: string;
@@ -7481,11 +7491,11 @@ type NodeEstreeIndex =
 	| PropertyDefinition
 	| VariableDeclarator
 	| Program
-	| Super
 	| SwitchCase
 	| CatchClause
 	| Property
 	| AssignmentProperty
+	| Super
 	| TemplateElement
 	| SpreadElement
 	| ObjectPattern