webpack 5.69.0 → 5.71.0

package/lib/dependencies/RequireContextDependency.js

@@ -19,22 +19,6 @@ class RequireContextDependency extends ContextDependency {
 	get type() {
 		return "require.context";
 	}
-
-	serialize(context) {
-		const { write } = context;
-
-		write(this.range);
-
-		super.serialize(context);
-	}
-
-	deserialize(context) {
-		const { read } = context;
-
-		this.range = read();
-
-		super.deserialize(context);
-	}
 }
 
 makeSerializable(

package/lib/esm/ModuleChunkLoadingPlugin.js

@@ -25,7 +25,9 @@ class ModuleChunkLoadingPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === "import";
 				};
 				const onceForChunkSet = new WeakSet();

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -55,15 +55,35 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 		this._runtimeRequirements = runtimeRequirements;
 	}
 
+	/**
+	 * @private
+	 * @param {Chunk} chunk chunk
+	 * @param {string} rootOutputDir root output directory
+	 * @returns {string} generated code
+	 */
+	_generateBaseUri(chunk, rootOutputDir) {
+		const options = chunk.getEntryOptions();
+		if (options && options.baseUri) {
+			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
+		}
+		const {
+			compilation: {
+				outputOptions: { importMetaName }
+			}
+		} = this;
+		return `${RuntimeGlobals.baseURI} = new URL(${JSON.stringify(
+			rootOutputDir
+		)}, ${importMetaName}.url);`;
+	}
+
 	/**
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { compilation, chunk } = this;
+		const { compilation, chunk, chunkGraph } = this;
 		const {
 			runtimeTemplate,
-			chunkGraph,
-			outputOptions: { importFunctionName, importMetaName }
+			outputOptions: { importFunctionName }
 		} = compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this._runtimeRequirements.has(RuntimeGlobals.baseURI);
@@ -102,11 +122,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return Template.asString([
 			withBaseURI
-				? Template.asString([
-						`${RuntimeGlobals.baseURI} = new URL(${JSON.stringify(
-							rootOutputDir
-						)}, ${importMetaName}.url);`
-				  ])
+				? this._generateBaseUri(chunk, rootOutputDir)
 				: "// no baseURI",
 			"",
 			"// object to store loaded and loading chunks",

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -28,7 +28,8 @@ module.exports = function () {
 	var currentStatus = "idle";
 
 	// while downloading
-	var blockingPromises;
+	var blockingPromises = 0;
+	var blockingPromisesWaiting = [];
 
 	// The update info
 	var currentUpdateApplyHandlers;
@@ -218,17 +219,28 @@ module.exports = function () {
 		return Promise.all(results);
 	}
 
+	function unblock() {
+		if (--blockingPromises === 0) {
+			setStatus("ready").then(function () {
+				if (blockingPromises === 0) {
+					var list = blockingPromisesWaiting;
+					blockingPromisesWaiting = [];
+					for (var i = 0; i < list.length; i++) {
+						list[i]();
+					}
+				}
+			});
+		}
+	}
+
 	function trackBlockingPromise(promise) {
 		switch (currentStatus) {
 			case "ready":
 				setStatus("prepare");
-				blockingPromises.push(promise);
-				waitForBlockingPromises(function () {
-					return setStatus("ready");
-				});
-				return promise;
+			/* fallthrough */
 			case "prepare":
-				blockingPromises.push(promise);
+				blockingPromises++;
+				promise.then(unblock, unblock);
 				return promise;
 			default:
 				return promise;
@@ -236,11 +248,11 @@ module.exports = function () {
 	}
 
 	function waitForBlockingPromises(fn) {
-		if (blockingPromises.length === 0) return fn();
-		var blocker = blockingPromises;
-		blockingPromises = [];
-		return Promise.all(blocker).then(function () {
-			return waitForBlockingPromises(fn);
+		if (blockingPromises === 0) return fn();
+		return new Promise(function (resolve) {
+			blockingPromisesWaiting.push(function () {
+				resolve(fn());
+			});
 		});
 	}
 
@@ -261,7 +273,6 @@ module.exports = function () {
 
 				return setStatus("prepare").then(function () {
 					var updatedModules = [];
-					blockingPromises = [];
 					currentUpdateApplyHandlers = [];
 
 					return Promise.all(
@@ -298,7 +309,11 @@ module.exports = function () {
 	function hotApply(options) {
 		if (currentStatus !== "ready") {
 			return Promise.resolve().then(function () {
-				throw new Error("apply() is only allowed in ready status");
+				throw new Error(
+					"apply() is only allowed in ready status (state: " +
+						currentStatus +
+						")"
+				);
 			});
 		}
 		return internalApply(options);

package/lib/hmr/JavascriptHotModuleReplacement.runtime.js

@@ -443,15 +443,16 @@ module.exports = function () {
 			) {
 				promises.push($loadUpdateChunk$(chunkId, updatedModulesList));
 				currentUpdateChunks[chunkId] = true;
+			} else {
+				currentUpdateChunks[chunkId] = false;
 			}
 		});
 		if ($ensureChunkHandlers$) {
 			$ensureChunkHandlers$.$key$Hmr = function (chunkId, promises) {
 				if (
 					currentUpdateChunks &&
-					!$hasOwnProperty$(currentUpdateChunks, chunkId) &&
-					$hasOwnProperty$($installedChunks$, chunkId) &&
-					$installedChunks$[chunkId] !== undefined
+					$hasOwnProperty$(currentUpdateChunks, chunkId) &&
+					!currentUpdateChunks[chunkId]
 				) {
 					promises.push($loadUpdateChunk$(chunkId));
 					currentUpdateChunks[chunkId] = true;

package/lib/ids/HashedModuleIdsPlugin.js

@@ -64,8 +64,8 @@ class HashedModuleIdsPlugin {
 						hash.digest(options.hashDigest)
 					);
 					let len = options.hashDigestLength;
-					while (usedIds.has(hashId.substr(0, len))) len++;
-					const moduleId = hashId.substr(0, len);
+					while (usedIds.has(hashId.slice(0, len))) len++;
+					const moduleId = hashId.slice(0, len);
 					chunkGraph.setModuleId(module, moduleId);
 					usedIds.add(moduleId);
 				}

package/lib/ids/IdHelpers.js

@@ -25,7 +25,7 @@ const getHash = (str, len, hashFunction) => {
 	const hash = createHash(hashFunction);
 	hash.update(str);
 	const digest = /** @type {string} */ (hash.digest("hex"));
-	return digest.substr(0, len);
+	return digest.slice(0, len);
 };
 
 /**

package/lib/javascript/BasicEvaluatedExpression.js

@@ -61,12 +61,14 @@ class BasicEvaluatedExpression {
 		/** @type {BasicEvaluatedExpression | undefined} */
 		this.postfix = undefined;
 		this.wrappedInnerExpressions = undefined;
-		/** @type {string | undefined} */
+		/** @type {string | VariableInfoInterface | undefined} */
 		this.identifier = undefined;
 		/** @type {VariableInfoInterface} */
 		this.rootInfo = undefined;
 		/** @type {() => string[]} */
 		this.getMembers = undefined;
+		/** @type {() => boolean[]} */
+		this.getMembersOptionals = undefined;
 		/** @type {EsTreeNode} */
 		this.expression = undefined;
 	}
@@ -342,11 +344,12 @@ class BasicEvaluatedExpression {
 		return this;
 	}
 
-	setIdentifier(identifier, rootInfo, getMembers) {
+	setIdentifier(identifier, rootInfo, getMembers, getMembersOptionals) {
 		this.type = TypeIdentifier;
 		this.identifier = identifier;
 		this.rootInfo = rootInfo;
 		this.getMembers = getMembers;
+		this.getMembersOptionals = getMembersOptionals;
 		this.sideEffects = true;
 		return this;
 	}

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/node/ReadFileChunkLoadingRuntimeModule.js

@@ -15,12 +15,33 @@ const { getInitialChunkIds } = require("../javascript/StartupHelpers");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const { getUndoPath } = require("../util/identifier");
 
+/** @typedef {import("../Chunk")} Chunk */
+
 class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 	constructor(runtimeRequirements) {
 		super("readFile chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.runtimeRequirements = runtimeRequirements;
 	}
 
+	/**
+	 * @private
+	 * @param {Chunk} chunk chunk
+	 * @param {string} rootOutputDir root output directory
+	 * @returns {string} generated code
+	 */
+	_generateBaseUri(chunk, rootOutputDir) {
+		const options = chunk.getEntryOptions();
+		if (options && options.baseUri) {
+			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
+		}
+
+		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
+			rootOutputDir
+				? `__dirname + ${JSON.stringify("/" + rootOutputDir)}`
+				: "__filename"
+		});`;
+	}
+
 	/**
 	 * @returns {string} runtime code
 	 */
@@ -67,13 +88,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return Template.asString([
 			withBaseURI
-				? Template.asString([
-						`${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
-							rootOutputDir
-								? `__dirname + ${JSON.stringify("/" + rootOutputDir)}`
-								: "__filename"
-						});`
-				  ])
+				? this._generateBaseUri(chunk, rootOutputDir)
 				: "// no baseURI",
 			"",
 			"// object to store loaded chunks",