webpack 5.70.0 → 5.71.0

package/hot/poll.js

@@ -4,7 +4,7 @@
 */
 /*globals __resourceQuery */
 if (module.hot) {
-	var hotPollInterval = +__resourceQuery.substr(1) || 10 * 60 * 1000;
+	var hotPollInterval = +__resourceQuery.slice(1) || 10 * 60 * 1000;
 	var log = require("./log");
 
 	var checkForUpdate = function checkForUpdate(fromUpdate) {

package/hot/signal.js

@@ -45,7 +45,7 @@ if (module.hot) {
 			});
 	};
 
-	process.on(__resourceQuery.substr(1) || "SIGUSR2", function () {
+	process.on(__resourceQuery.slice(1) || "SIGUSR2", function () {
 		if (module.hot.status() !== "idle") {
 			log(
 				"warning",

package/lib/Chunk.js

@@ -690,7 +690,7 @@ class Chunk {
 				for (const childGroup of group.childrenIterable) {
 					for (const key of Object.keys(childGroup.options)) {
 						if (key.endsWith("Order")) {
-							const name = key.substr(0, key.length - "Order".length);
+							const name = key.slice(0, key.length - "Order".length);
 							let list = lists.get(name);
 							if (list === undefined) {
 								list = [];

package/lib/ChunkGroup.js

@@ -486,7 +486,7 @@ class ChunkGroup {
 		for (const childGroup of this._children) {
 			for (const key of Object.keys(childGroup.options)) {
 				if (key.endsWith("Order")) {
-					const name = key.substr(0, key.length - "Order".length);
+					const name = key.slice(0, key.length - "Order".length);
 					let list = lists.get(name);
 					if (list === undefined) {
 						lists.set(name, (list = []));

package/lib/Compilation.js

@@ -1436,7 +1436,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 	 * @returns {void}
 	 */
 	_processModuleDependencies(module, callback) {
-		/** @type {Array<{factory: ModuleFactory, dependencies: Dependency[], originModule: Module|null}>} */
+		/** @type {Array<{factory: ModuleFactory, dependencies: Dependency[], context: string|undefined, originModule: Module|null}>} */
 		const sortedDependencies = [];
 
 		/** @type {DependenciesBlock} */
@@ -1668,6 +1668,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 					sortedDependencies.push({
 						factory: factoryCacheKey2,
 						dependencies: list,
+						context: dep.getContext(),
 						originModule: module
 					});
 				}
@@ -3328,7 +3329,8 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 						dependencyTemplates,
 						runtimeTemplate,
 						runtime,
-						codeGenerationResults: results
+						codeGenerationResults: results,
+						compilation: this
 					});
 				} catch (err) {
 					errors.push(new CodeGenerationError(module, err));
@@ -3895,7 +3897,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 							module,
 							runtime,
 							digest,
-							digest.substr(0, hashDigestLength)
+							digest.slice(0, hashDigestLength)
 						);
 						statModulesFromCache++;
 						continue;
@@ -3959,7 +3961,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 			module,
 			runtime,
 			moduleHashDigest,
-			moduleHashDigest.substr(0, hashDigestLength)
+			moduleHashDigest.slice(0, hashDigestLength)
 		);
 		return moduleHashDigest;
 	}
@@ -4163,7 +4165,7 @@ This prevents using hashes of each other and should be avoided.`);
 				);
 				hash.update(chunkHashDigest);
 				chunk.hash = chunkHashDigest;
-				chunk.renderedHash = chunk.hash.substr(0, hashDigestLength);
+				chunk.renderedHash = chunk.hash.slice(0, hashDigestLength);
 				const fullHashModules =
 					chunkGraph.getChunkFullHashModulesIterable(chunk);
 				if (fullHashModules) {
@@ -4190,7 +4192,7 @@ This prevents using hashes of each other and should be avoided.`);
 		this.logger.time("hashing: hash digest");
 		this.hooks.fullHash.call(hash);
 		this.fullHash = /** @type {string} */ (hash.digest(hashDigest));
-		this.hash = this.fullHash.substr(0, hashDigestLength);
+		this.hash = this.fullHash.slice(0, hashDigestLength);
 		this.logger.timeEnd("hashing: hash digest");
 
 		this.logger.time("hashing: process full hash modules");
@@ -4210,7 +4212,7 @@ This prevents using hashes of each other and should be avoided.`);
 					module,
 					chunk.runtime,
 					moduleHashDigest,
-					moduleHashDigest.substr(0, hashDigestLength)
+					moduleHashDigest.slice(0, hashDigestLength)
 				);
 				codeGenerationJobsMap.get(oldHash).get(module).hash = moduleHashDigest;
 			}
@@ -4221,7 +4223,7 @@ This prevents using hashes of each other and should be avoided.`);
 				chunkHash.digest(hashDigest)
 			);
 			chunk.hash = chunkHashDigest;
-			chunk.renderedHash = chunk.hash.substr(0, hashDigestLength);
+			chunk.renderedHash = chunk.hash.slice(0, hashDigestLength);
 			this.hooks.contentHash.call(chunk);
 		}
 		this.logger.timeEnd("hashing: process full hash modules");

package/lib/Compiler.js

@@ -545,8 +545,21 @@ class Compiler {
 	 */
 	runAsChild(callback) {
 		const startTime = Date.now();
+
+		const finalCallback = (err, entries, compilation) => {
+			try {
+				callback(err, entries, compilation);
+			} catch (e) {
+				const err = new WebpackError(
+					`compiler.runAsChild callback error: ${e}`
+				);
+				err.details = e.stack;
+				this.parentCompilation.errors.push(err);
+			}
+		};
+
 		this.compile((err, compilation) => {
-			if (err) return callback(err);
+			if (err) return finalCallback(err);
 
 			this.parentCompilation.children.push(compilation);
 			for (const { name, source, info } of compilation.getAssets()) {
@@ -561,7 +574,7 @@ class Compiler {
 			compilation.startTime = startTime;
 			compilation.endTime = Date.now();
 
-			return callback(null, entries, compilation);
+			return finalCallback(null, entries, compilation);
 		});
 	}
 
@@ -596,7 +609,7 @@ class Compiler {
 					let immutable = info.immutable;
 					const queryStringIdx = targetFile.indexOf("?");
 					if (queryStringIdx >= 0) {
-						targetFile = targetFile.substr(0, queryStringIdx);
+						targetFile = targetFile.slice(0, queryStringIdx);
 						// We may remove the hash, which is in the query string
 						// So we recheck if the file is immutable
 						// This doesn't cover all cases, but immutable is only a performance optimization anyway

package/lib/ConstPlugin.js

@@ -324,7 +324,7 @@ class ConstPlugin {
 								}
 							} else if (expression.operator === "??") {
 								const param = parser.evaluateExpression(expression.left);
-								const keepRight = param && param.asNullish();
+								const keepRight = param.asNullish();
 								if (typeof keepRight === "boolean") {
 									// ------------------------------------------
 									//
@@ -407,7 +407,7 @@ class ConstPlugin {
 							const expression = optionalExpressionsStack.pop();
 							const evaluated = parser.evaluateExpression(expression);
 
-							if (evaluated && evaluated.asNullish()) {
+							if (evaluated.asNullish()) {
 								// ------------------------------------------
 								//
 								// Given the following code:

package/lib/ContextModule.js

@@ -19,7 +19,11 @@ const {
 	keepOriginalOrder,
 	compareModulesById
 } = require("./util/comparators");
-const { contextify, parseResource } = require("./util/identifier");
+const {
+	contextify,
+	parseResource,
+	makePathsRelative
+} = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -1066,9 +1070,21 @@ module.exports = webpackEmptyAsyncContext;`;
 		return this.getSourceForEmptyContext(id, runtimeTemplate);
 	}
 
-	getSource(sourceString) {
+	/**
+	 * @param {string} sourceString source content
+	 * @param {Compilation=} compilation the compilation
+	 * @returns {Source} generated source
+	 */
+	getSource(sourceString, compilation) {
 		if (this.useSourceMap || this.useSimpleSourceMap) {
-			return new OriginalSource(sourceString, this.identifier());
+			return new OriginalSource(
+				sourceString,
+				`webpack://${makePathsRelative(
+					(compilation && compilation.compiler.context) || "",
+					this.identifier(),
+					compilation && compilation.compiler.root
+				)}`
+			);
 		}
 		return new RawSource(sourceString);
 	}
@@ -1078,16 +1094,23 @@ module.exports = webpackEmptyAsyncContext;`;
 	 * @returns {CodeGenerationResult} result
 	 */
 	codeGeneration(context) {
-		const { chunkGraph } = context;
+		const { chunkGraph, compilation } = context;
 		const sources = new Map();
 		sources.set(
 			"javascript",
-			this.getSource(this.getSourceString(this.options.mode, context))
+			this.getSource(
+				this.getSourceString(this.options.mode, context),
+				compilation
+			)
 		);
 		const set = new Set();
-		const allDeps = /** @type {ContextElementDependency[]} */ (
-			this.dependencies.concat(this.blocks.map(b => b.dependencies[0]))
-		);
+		const allDeps =
+			this.dependencies.length > 0
+				? /** @type {ContextElementDependency[]} */ (this.dependencies).slice()
+				: [];
+		for (const block of this.blocks)
+			for (const dep of block.dependencies)
+				allDeps.push(/** @type {ContextElementDependency} */ (dep));
 		set.add(RuntimeGlobals.module);
 		set.add(RuntimeGlobals.hasOwnProperty);
 		if (allDeps.length > 0) {

package/lib/ContextModuleFactory.js

@@ -128,7 +128,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 					loadersPrefix = "";
 				const idx = request.lastIndexOf("!");
 				if (idx >= 0) {
-					let loadersRequest = request.substr(0, idx + 1);
+					let loadersRequest = request.slice(0, idx + 1);
 					let i;
 					for (
 						i = 0;
@@ -138,7 +138,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 						loadersPrefix += "!";
 					}
 					loadersRequest = loadersRequest
-						.substr(i)
+						.slice(i)
 						.replace(/!+$/, "")
 						.replace(/!!+/g, "!");
 					if (loadersRequest === "") {
@@ -146,7 +146,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 					} else {
 						loaders = loadersRequest.split("!");
 					}
-					resource = request.substr(idx + 1);
+					resource = request.slice(idx + 1);
 				} else {
 					loaders = [];
 					resource = request;
@@ -292,7 +292,6 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 		} = options;
 		if (!regExp || !resource) return callback(null, []);
 
-		let severalContexts = false;
 		const addDirectoryChecked = (ctx, directory, visited, callback) => {
 			fs.realpath(directory, (err, realPath) => {
 				if (err) return callback(err);
@@ -348,7 +347,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 									const obj = {
 										context: ctx,
 										request:
-											"." + subResource.substr(ctx.length).replace(/\\/g, "/")
+											"." + subResource.slice(ctx.length).replace(/\\/g, "/")
 									};
 
 									this.hooks.alternativeRequests.callAsync(
@@ -359,15 +358,13 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 											alternatives = alternatives
 												.filter(obj => regExp.test(obj.request))
 												.map(obj => {
-													const request = severalContexts
-														? join(fs, obj.context, obj.request)
-														: obj.request;
 													const dep = new ContextElementDependency(
-														request + resourceQuery + resourceFragment,
+														`${obj.request}${resourceQuery}${resourceFragment}`,
 														obj.request,
 														typePrefix,
 														category,
-														referencedExports
+														referencedExports,
+														obj.context
 													);
 													dep.optional = true;
 													return dep;
@@ -414,7 +411,6 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 		if (typeof resource === "string") {
 			visitResource(resource, callback);
 		} else {
-			severalContexts = true;
 			asyncLib.map(resource, visitResource, (err, result) => {
 				if (err) return callback(err);
 

package/lib/DelegatedModuleFactoryPlugin.js

@@ -29,7 +29,7 @@ class DelegatedModuleFactoryPlugin {
 					const [dependency] = data.dependencies;
 					const { request } = dependency;
 					if (request && request.startsWith(`${scope}/`)) {
-						const innerRequest = "." + request.substr(scope.length);
+						const innerRequest = "." + request.slice(scope.length);
 						let resolved;
 						if (innerRequest in this.options.content) {
 							resolved = this.options.content[innerRequest];

package/lib/Dependency.js

@@ -182,6 +182,13 @@ class Dependency {
 		this._loc = undefined;
 	}
 
+	/**
+	 * @returns {string | undefined} a request context
+	 */
+	getContext() {
+		return undefined;
+	}
+
 	/**
 	 * @returns {string | null} an identifier to merge equal requests
 	 */

package/lib/ErrorHelpers.js

@@ -43,8 +43,8 @@ exports.cutOffMessage = (stack, message) => {
 	if (nextLine === -1) {
 		return stack === message ? "" : stack;
 	} else {
-		const firstLine = stack.substr(0, nextLine);
-		return firstLine === message ? stack.substr(nextLine + 1) : stack;
+		const firstLine = stack.slice(0, nextLine);
+		return firstLine === message ? stack.slice(nextLine + 1) : stack;
 	}
 };
 

package/lib/ExternalModuleFactoryPlugin.js

@@ -89,8 +89,8 @@ class ExternalModuleFactoryPlugin {
 							UNSPECIFIED_EXTERNAL_TYPE_REGEXP.test(externalConfig)
 						) {
 							const idx = externalConfig.indexOf(" ");
-							type = externalConfig.substr(0, idx);
-							externalConfig = externalConfig.substr(idx + 1);
+							type = externalConfig.slice(0, idx);
+							externalConfig = externalConfig.slice(idx + 1);
 						} else if (
 							Array.isArray(externalConfig) &&
 							externalConfig.length > 0 &&
@@ -98,9 +98,9 @@ class ExternalModuleFactoryPlugin {
 						) {
 							const firstItem = externalConfig[0];
 							const idx = firstItem.indexOf(" ");
-							type = firstItem.substr(0, idx);
+							type = firstItem.slice(0, idx);
 							externalConfig = [
-								firstItem.substr(idx + 1),
+								firstItem.slice(idx + 1),
 								...externalConfig.slice(1)
 							];
 						}

package/lib/FileSystemInfo.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const { create: createResolver } = require("enhanced-resolve");
+const nodeModule = require("module");
 const asyncLib = require("neo-async");
 const AsyncQueue = require("./util/AsyncQueue");
 const StackedCacheMap = require("./util/StackedCacheMap");
@@ -22,6 +23,8 @@ const processAsyncTree = require("./util/processAsyncTree");
 
 const supportsEsm = +process.versions.modules >= 83;
 
+const builtinModules = new Set(nodeModule.builtinModules);
+
 let FS_ACCURACY = 2000;
 
 const EMPTY_SET = new Set();
@@ -1673,6 +1676,11 @@ class FileSystemInfo {
 													// e.g. import.meta
 													continue;
 												}
+
+												// we should not track Node.js build dependencies
+												if (dependency.startsWith("node:")) continue;
+												if (builtinModules.has(dependency)) continue;
+
 												push({
 													type: RBDT_RESOLVE_ESM_FILE,
 													context,

package/lib/LoaderOptionsPlugin.js

@@ -52,7 +52,7 @@ class LoaderOptionsPlugin {
 					if (
 						ModuleFilenameHelpers.matchObject(
 							options,
-							i < 0 ? resource : resource.substr(0, i)
+							i < 0 ? resource : resource.slice(0, i)
 						)
 					) {
 						for (const key of Object.keys(options)) {

package/lib/Module.js

@@ -49,6 +49,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {string=} type the type of source that should be generated
  */
 
+// TODO webpack 6: compilation will be required in CodeGenerationContext
 /**
  * @typedef {Object} CodeGenerationContext
  * @property {DependencyTemplates} dependencyTemplates the dependency templates
@@ -58,6 +59,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {RuntimeSpec} runtime the runtimes code should be generated for
  * @property {ConcatenationScope=} concatenationScope when in concatenated module, information about other concatenated modules
  * @property {CodeGenerationResults} codeGenerationResults code generation results of other modules (need to have a codeGenerationDependency to use that)
+ * @property {Compilation=} compilation the compilation
  */
 
 /**

package/lib/ModuleFilenameHelpers.js

@@ -47,7 +47,7 @@ const getAfter = (strFn, token) => {
 	return () => {
 		const str = strFn();
 		const idx = str.indexOf(token);
-		return idx < 0 ? "" : str.substr(idx);
+		return idx < 0 ? "" : str.slice(idx);
 	};
 };
 
@@ -55,7 +55,7 @@ const getBefore = (strFn, token) => {
 	return () => {
 		const str = strFn();
 		const idx = str.lastIndexOf(token);
-		return idx < 0 ? "" : str.substr(0, idx);
+		return idx < 0 ? "" : str.slice(0, idx);
 	};
 };
 
@@ -64,7 +64,7 @@ const getHash = (strFn, hashFunction) => {
 		const hash = createHash(hashFunction);
 		hash.update(strFn());
 		const digest = /** @type {string} */ (hash.digest("hex"));
-		return digest.substr(0, 4);
+		return digest.slice(0, 4);
 	};
 };
 

package/lib/NormalModule.js

@@ -375,7 +375,7 @@ class NormalModule extends Module {
 	nameForCondition() {
 		const resource = this.matchResource || this.resource;
 		const idx = resource.indexOf("?");
-		if (idx >= 0) return resource.substr(0, idx);
+		if (idx >= 0) return resource.slice(0, idx);
 		return resource;
 	}
 
@@ -558,7 +558,7 @@ class NormalModule extends Module {
 				let { options } = loader;
 
 				if (typeof options === "string") {
-					if (options.substr(0, 1) === "{" && options.substr(-1) === "}") {
+					if (options.startsWith("{") && options.endsWith("}")) {
 						try {
 							options = parseJson(options);
 						} catch (e) {

package/lib/NormalModuleFactory.js

@@ -379,7 +379,7 @@ class NormalModuleFactory extends ModuleFactory {
 							resource: matchResource,
 							...cacheParseResource(matchResource)
 						};
-						requestWithoutMatchResource = request.substr(
+						requestWithoutMatchResource = request.slice(
 							matchResourceMatch[0].length
 						);
 					}
@@ -437,7 +437,7 @@ class NormalModuleFactory extends ModuleFactory {
 					try {
 						for (const item of loaders) {
 							if (typeof item.options === "string" && item.options[0] === "?") {
-								const ident = item.options.substr(1);
+								const ident = item.options.slice(1);
 								if (ident === "[[missing ident]]") {
 									throw new Error(
 										"No ident is provided by referenced loader. " +

package/lib/RuntimePlugin.js

@@ -11,6 +11,7 @@ const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirement
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const AsyncModuleRuntimeModule = require("./runtime/AsyncModuleRuntimeModule");
 const AutoPublicPathRuntimeModule = require("./runtime/AutoPublicPathRuntimeModule");
+const BaseUriRuntimeModule = require("./runtime/BaseUriRuntimeModule");
 const CompatGetDefaultExportRuntimeModule = require("./runtime/CompatGetDefaultExportRuntimeModule");
 const CompatRuntimeModule = require("./runtime/CompatRuntimeModule");
 const CreateFakeNamespaceObjectRuntimeModule = require("./runtime/CreateFakeNamespaceObjectRuntimeModule");
@@ -96,6 +97,15 @@ class RuntimePlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap("RuntimePlugin", compilation => {
+			const globalChunkLoading = compilation.outputOptions.chunkLoading;
+			const isChunkLoadingDisabledForChunk = chunk => {
+				const options = chunk.getEntryOptions();
+				const chunkLoading =
+					options && options.chunkLoading !== undefined
+						? options.chunkLoading
+						: globalChunkLoading;
+				return chunkLoading === false;
+			};
 			compilation.dependencyTemplates.set(
 				RuntimeRequirementsDependency,
 				new RuntimeRequirementsDependency.Template()
@@ -413,6 +423,14 @@ class RuntimePlugin {
 					);
 					return true;
 				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.baseURI)
+				.tap("RuntimePlugin", chunk => {
+					if (isChunkLoadingDisabledForChunk(chunk)) {
+						compilation.addRuntimeModule(chunk, new BaseUriRuntimeModule());
+						return true;
+					}
+				});
 			// TODO webpack 6: remove CompatRuntimeModule
 			compilation.hooks.additionalTreeRuntimeRequirements.tap(
 				"RuntimePlugin",

package/lib/config/defaults.js

@@ -715,7 +715,15 @@ const applyOutputDefaults = (
 	};
 
 	F(output, "uniqueName", () => {
-		const libraryName = getLibraryName(output.library);
+		const libraryName = getLibraryName(output.library).replace(
+			/^\[(\\*[\w:]+\\*)\](\.)|(\.)\[(\\*[\w:]+\\*)\](?=\.|$)|\[(\\*[\w:]+\\*)\]/g,
+			(m, a, d1, d2, b, c) => {
+				const content = a || b || c;
+				return content.startsWith("\\") && content.endsWith("\\")
+					? `${d2 || ""}[${content.slice(1, -1)}]${d1 || ""}`
+					: "";
+			}
+		);
 		if (libraryName) return libraryName;
 		const pkgPath = path.resolve(context, "package.json");
 		try {

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -201,7 +201,7 @@ class CommonJsExportsParserPlugin {
 				if (expr.arguments[1].type === "SpreadElement") return;
 				if (expr.arguments[2].type === "SpreadElement") return;
 				const exportsArg = parser.evaluateExpression(expr.arguments[0]);
-				if (!exportsArg || !exportsArg.isIdentifier()) return;
+				if (!exportsArg.isIdentifier()) return;
 				if (
 					exportsArg.identifier !== "exports" &&
 					exportsArg.identifier !== "module.exports" &&
@@ -210,7 +210,6 @@ class CommonJsExportsParserPlugin {
 					return;
 				}
 				const propertyArg = parser.evaluateExpression(expr.arguments[1]);
-				if (!propertyArg) return;
 				const property = propertyArg.asString();
 				if (typeof property !== "string") return;
 				enableStructuredExports();

package/lib/dependencies/ContextDependencyHelpers.js

@@ -28,8 +28,8 @@ const splitContextFromPrefix = prefix => {
 	const idx = prefix.lastIndexOf("/");
 	let context = ".";
 	if (idx >= 0) {
-		context = prefix.substr(0, idx);
-		prefix = `.${prefix.substr(idx)}`;
+		context = prefix.slice(0, idx);
+		prefix = `.${prefix.slice(idx)}`;
 	}
 	return {
 		context,

package/lib/dependencies/ContextElementDependency.js

@@ -14,11 +14,27 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class ContextElementDependency extends ModuleDependency {
-	constructor(request, userRequest, typePrefix, category, referencedExports) {
+	/**
+	 * @param {string} request request
+	 * @param {string|undefined} userRequest user request
+	 * @param {string} typePrefix type prefix
+	 * @param {string} category category
+	 * @param {string[][]=} referencedExports referenced exports
+	 * @param {string=} context context
+	 */
+	constructor(
+		request,
+		userRequest,
+		typePrefix,
+		category,
+		referencedExports,
+		context
+	) {
 		super(request);
 		this.referencedExports = referencedExports;
 		this._typePrefix = typePrefix;
 		this._category = category;
+		this._context = context || undefined;
 
 		if (userRequest) {
 			this.userRequest = userRequest;
@@ -33,6 +49,20 @@ class ContextElementDependency extends ModuleDependency {
 		return "context element";
 	}
 
+	/**
+	 * @returns {string | undefined} a request context
+	 */
+	getContext() {
+		return this._context;
+	}
+
+	/**
+	 * @returns {string | null} an identifier to merge equal requests
+	 */
+	getResourceIdentifier() {
+		return `context${this._context || ""}|${super.getResourceIdentifier()}`;
+	}
+
 	get category() {
 		return this._category;
 	}
@@ -56,6 +86,7 @@ class ContextElementDependency extends ModuleDependency {
 		const { write } = context;
 		write(this._typePrefix);
 		write(this._category);
+		write(this._context);
 		write(this.referencedExports);
 		super.serialize(context);
 	}
@@ -64,6 +95,7 @@ class ContextElementDependency extends ModuleDependency {
 		const { read } = context;
 		this._typePrefix = read();
 		this._category = read();
+		this._context = read();
 		this.referencedExports = read();
 		super.deserialize(context);
 	}