webpack 5.100.2 → 5.101.1

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -62,7 +62,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 	apply(parser) {
 		parser.hooks.evaluateIdentifier
 			.for("import.meta.webpackContext")
-			.tap(PLUGIN_NAME, expr =>
+			.tap(PLUGIN_NAME, (expr) =>
 				evaluateToIdentifier(
 					"import.meta.webpackContext",
 					"import.meta",
@@ -72,7 +72,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 			);
 		parser.hooks.call
 			.for("import.meta.webpackContext")
-			.tap(PLUGIN_NAME, expr => {
+			.tap(PLUGIN_NAME, (expr) => {
 				if (expr.arguments.length < 1 || expr.arguments.length > 2) return;
 				const [directoryNode, optionsNode] = expr.arguments;
 				if (optionsNode && optionsNode.type !== "ObjectExpression") return;
@@ -178,11 +178,11 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 										/** @type {BasicEvaluatedExpression[]} */
 										(expr.items);
 									if (
-										items.every(i => {
+										items.every((i) => {
 											if (!i.isArray()) return false;
 											const innerItems =
 												/** @type {BasicEvaluatedExpression[]} */ (i.items);
-											return innerItems.every(i => i.isString());
+											return innerItems.every((i) => i.isString());
 										})
 									) {
 										exports = [];

package/lib/dependencies/ImportMetaPlugin.js

@@ -49,7 +49,7 @@ class ImportMetaPlugin {
 				 * @param {NormalModule} module module
 				 * @returns {string} file url
 				 */
-				const getUrl = module => pathToFileURL(module.resource).toString();
+				const getUrl = (module) => pathToFileURL(module.resource).toString();
 				/**
 				 * @param {Parser} parser parser parser
 				 * @param {JavascriptParserOptions} parserOptions parserOptions
@@ -62,7 +62,7 @@ class ImportMetaPlugin {
 
 						parser.hooks.expression
 							.for("import.meta")
-							.tap(PLUGIN_NAME, metaProperty => {
+							.tap(PLUGIN_NAME, (metaProperty) => {
 								const dep = new ConstDependency(
 									/** @type {string} */ (importMetaName),
 									/** @type {Range} */ (metaProperty.range)
@@ -86,7 +86,7 @@ class ImportMetaPlugin {
 					 * @param {string[]} members members
 					 * @returns {string} error message
 					 */
-					const importMetaUnknownProperty = members =>
+					const importMetaUnknownProperty = (members) =>
 						`${Template.toNormalComment(
 							`unsupported import.meta.${members.join(".")}`
 						)} undefined${propertyAccess(members, 1)}`;
@@ -98,7 +98,7 @@ class ImportMetaPlugin {
 						);
 					parser.hooks.expression
 						.for("import.meta")
-						.tap(PLUGIN_NAME, metaProperty => {
+						.tap(PLUGIN_NAME, (metaProperty) => {
 							const referencedPropertiesInDestructuring =
 								parser.destructuringAssignmentPropertiesFor(metaProperty);
 							if (!referencedPropertiesInDestructuring) {
@@ -169,7 +169,7 @@ class ImportMetaPlugin {
 						);
 					parser.hooks.expression
 						.for("import.meta.url")
-						.tap(PLUGIN_NAME, expr => {
+						.tap(PLUGIN_NAME, (expr) => {
 							const dep = new ConstDependency(
 								importMetaUrl(),
 								/** @type {Range} */ (expr.range)
@@ -183,7 +183,7 @@ class ImportMetaPlugin {
 						.tap(PLUGIN_NAME, evaluateToString("string"));
 					parser.hooks.evaluateIdentifier
 						.for("import.meta.url")
-						.tap(PLUGIN_NAME, expr =>
+						.tap(PLUGIN_NAME, (expr) =>
 							new BasicEvaluatedExpression()
 								.setString(getUrl(parser.state.module))
 								.setRange(/** @type {Range} */ (expr.range))
@@ -223,7 +223,7 @@ class ImportMetaPlugin {
 						});
 					parser.hooks.evaluate
 						.for("MemberExpression")
-						.tap(PLUGIN_NAME, expression => {
+						.tap(PLUGIN_NAME, (expression) => {
 							const expr = /** @type {MemberExpression} */ (expression);
 							if (
 								expr.object.type === "MetaProperty" &&

package/lib/dependencies/ImportParserPlugin.js

@@ -44,9 +44,9 @@ class ImportParserPlugin {
 		 * @param {Iterable<T>} enumerable enumerable
 		 * @returns {T[][]} array of array
 		 */
-		const exportsFromEnumerable = enumerable =>
-			Array.from(enumerable, e => [e]);
-		parser.hooks.importCall.tap(PLUGIN_NAME, expr => {
+		const exportsFromEnumerable = (enumerable) =>
+			Array.from(enumerable, (e) => [e]);
+		parser.hooks.importCall.tap(PLUGIN_NAME, (expr) => {
 			const param = parser.evaluateExpression(expr.source);
 
 			let chunkName = null;
@@ -240,7 +240,7 @@ class ImportParserPlugin {
 							typeof importOptions.webpackExports === "string" ||
 							(Array.isArray(importOptions.webpackExports) &&
 								/** @type {string[]} */ (importOptions.webpackExports).every(
-									item => typeof item === "string"
+									(item) => typeof item === "string"
 								))
 						)
 					) {

package/lib/dependencies/JsonExportsDependency.js

@@ -30,7 +30,7 @@ const NullDependency = require("./NullDependency");
  * @param {number} exportsDepth exportsDepth
  * @returns {GetExportsFromDataFn} value
  */
-const getExportsWithDepth = exportsDepth =>
+const getExportsWithDepth = (exportsDepth) =>
 	/** @type {GetExportsFromDataFn} */
 	function getExportsFromData(data, curDepth = 1) {
 		if (curDepth > exportsDepth) {
@@ -55,7 +55,12 @@ const getExportsWithDepth = exportsDepth =>
 				exports.push({
 					name: key,
 					canMangle: true,
-					exports: getExportsFromData(data[key], curDepth + 1) || undefined
+					exports:
+						getExportsFromData(
+							/** @type {JsonValue} */
+							(data[key]),
+							curDepth + 1
+						) || undefined
 				});
 			}
 

package/lib/dependencies/LoaderPlugin.js

@@ -54,11 +54,11 @@ class LoaderPlugin {
 			}
 		);
 
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const moduleGraph = compilation.moduleGraph;
 			NormalModule.getCompilationHooks(compilation).loader.tap(
 				PLUGIN_NAME,
-				loaderContext => {
+				(loaderContext) => {
 					loaderContext.loadModule = (request, callback) => {
 						const dep = new LoaderDependency(request);
 						dep.loc = {
@@ -91,7 +91,7 @@ class LoaderPlugin {
 								context: loaderContext.context,
 								recursive: false
 							},
-							err => {
+							(err) => {
 								compilation.factorizeQueue.setContext(oldFactorizeQueueContext);
 								compilation.addModuleQueue.setContext(oldAddModuleQueueContext);
 								compilation.buildQueue.decreaseParallelism();
@@ -196,7 +196,7 @@ class LoaderPlugin {
 								connectOrigin: false,
 								checkCycle: true
 							},
-							err => {
+							(err) => {
 								compilation.factorizeQueue.setContext(oldFactorizeQueueContext);
 								compilation.addModuleQueue.setContext(oldAddModuleQueueContext);
 								compilation.buildQueue.decreaseParallelism();

package/lib/dependencies/ModuleDependency.js

@@ -7,7 +7,6 @@
 
 const Dependency = require("../Dependency");
 const DependencyTemplate = require("../DependencyTemplate");
-const RawModule = require("../RawModule");
 
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../Module")} Module */
@@ -61,6 +60,8 @@ class ModuleDependency extends Dependency {
 	 * @returns {Module} ignored module
 	 */
 	createIgnoredModule(context) {
+		const RawModule = require("../RawModule");
+
 		const module = new RawModule(
 			"/* (ignored) */",
 			`ignored|${context}|${this.request}`,

package/lib/dependencies/ProvidedDependency.js

@@ -29,9 +29,9 @@ const ModuleDependency = require("./ModuleDependency");
  * @param {string[]|null} path the property path array
  * @returns {string} the converted path
  */
-const pathToString = path =>
+const pathToString = (path) =>
 	path !== null && path.length > 0
-		? path.map(part => `[${JSON.stringify(part)}]`).join("")
+		? path.map((part) => `[${JSON.stringify(part)}]`).join("")
 		: "";
 
 class ProvidedDependency extends ModuleDependency {

package/lib/dependencies/PureExpressionDependency.js

@@ -47,7 +47,7 @@ class PureExpressionDependency extends NullDependency {
 				/** @type {Module} */
 				(moduleGraph.getParentModule(this));
 			const exportsInfo = moduleGraph.getExportsInfo(selfModule);
-			const runtimeCondition = filterRuntime(runtime, runtime => {
+			const runtimeCondition = filterRuntime(runtime, (runtime) => {
 				for (const exportName of usedByExports) {
 					if (exportsInfo.getUsed(exportName, runtime) !== UsageState.Unused) {
 						return true;

package/lib/dependencies/RequireContextDependencyParserPlugin.js

@@ -20,7 +20,7 @@ module.exports = class RequireContextDependencyParserPlugin {
 	 * @returns {void}
 	 */
 	apply(parser) {
-		parser.hooks.call.for("require.context").tap(PLUGIN_NAME, expr => {
+		parser.hooks.call.for("require.context").tap(PLUGIN_NAME, (expr) => {
 			let regExp = /^\.\/.*$/;
 			let recursive = true;
 			/** @type {ContextMode} */

package/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js

@@ -25,7 +25,7 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 	 * @returns {void}
 	 */
 	apply(parser) {
-		parser.hooks.call.for("require.ensure").tap(PLUGIN_NAME, expr => {
+		parser.hooks.call.for("require.ensure").tap(PLUGIN_NAME, (expr) => {
 			/** @type {string | GroupOptions | null} */
 			let chunkName = null;
 			let errorExpressionArg = null;

package/lib/dependencies/RequireIncludeDependencyParserPlugin.js

@@ -33,7 +33,7 @@ module.exports = class RequireIncludeDependencyParserPlugin {
 	 */
 	apply(parser) {
 		const { warn } = this;
-		parser.hooks.call.for("require.include").tap(PLUGIN_NAME, expr => {
+		parser.hooks.call.for("require.include").tap(PLUGIN_NAME, (expr) => {
 			if (expr.arguments.length !== 1) return;
 			const param = parser.evaluateExpression(expr.arguments[0]);
 			if (!param.isString()) return;
@@ -57,7 +57,7 @@ module.exports = class RequireIncludeDependencyParserPlugin {
 		});
 		parser.hooks.evaluateTypeof
 			.for("require.include")
-			.tap(PLUGIN_NAME, expr => {
+			.tap(PLUGIN_NAME, (expr) => {
 				if (warn) {
 					parser.state.module.addWarning(
 						new RequireIncludeDeprecationWarning(
@@ -67,7 +67,7 @@ module.exports = class RequireIncludeDependencyParserPlugin {
 				}
 				return evaluateToString("function")(expr);
 			});
-		parser.hooks.typeof.for("require.include").tap(PLUGIN_NAME, expr => {
+		parser.hooks.typeof.for("require.include").tap(PLUGIN_NAME, (expr) => {
 			if (warn) {
 				parser.state.module.addWarning(
 					new RequireIncludeDeprecationWarning(

package/lib/dependencies/SystemPlugin.js

@@ -63,7 +63,7 @@ class SystemPlugin {
 					/**
 					 * @param {string} name name
 					 */
-					const setNotSupported = name => {
+					const setNotSupported = (name) => {
 						parser.hooks.evaluateTypeof
 							.for(name)
 							.tap(PLUGIN_NAME, evaluateToString("undefined"));
@@ -101,7 +101,7 @@ class SystemPlugin {
 					setNotSupported("System.get");
 					setNotSupported("System.register");
 
-					parser.hooks.expression.for("System").tap(PLUGIN_NAME, expr => {
+					parser.hooks.expression.for("System").tap(PLUGIN_NAME, (expr) => {
 						const dep = new ConstDependency(
 							RuntimeGlobals.system,
 							/** @type {Range} */ (expr.range),
@@ -112,7 +112,7 @@ class SystemPlugin {
 						return true;
 					});
 
-					parser.hooks.call.for("System.import").tap(PLUGIN_NAME, expr => {
+					parser.hooks.call.for("System.import").tap(PLUGIN_NAME, (expr) => {
 						parser.state.module.addWarning(
 							new SystemImportDeprecationWarning(
 								/** @type {DependencyLocation} */ (expr.loc)

package/lib/dependencies/WorkerPlugin.js

@@ -54,7 +54,7 @@ const WorkerDependency = require("./WorkerDependency");
  * @param {NormalModule} module module
  * @returns {string} url
  */
-const getUrl = module => pathToFileURL(module.resource).toString();
+const getUrl = (module) => pathToFileURL(module.resource).toString();
 
 const WorkerSpecifierTag = Symbol("worker specifier tag");
 
@@ -253,7 +253,7 @@ class WorkerPlugin {
 					 * @param {CallExpression} expr expression
 					 * @returns {boolean | void} true when handled
 					 */
-					const handleNewWorker = expr => {
+					const handleNewWorker = (expr) => {
 						if (expr.arguments.length === 0 || expr.arguments.length > 2) {
 							return;
 						}
@@ -483,7 +483,7 @@ class WorkerPlugin {
 					/**
 					 * @param {string} item item
 					 */
-					const processItem = item => {
+					const processItem = (item) => {
 						if (
 							item.startsWith("*") &&
 							item.includes(".") &&
@@ -505,7 +505,7 @@ class WorkerPlugin {
 									}
 								}
 							);
-							parser.hooks.pattern.for(pattern).tap(PLUGIN_NAME, pattern => {
+							parser.hooks.pattern.for(pattern).tap(PLUGIN_NAME, (pattern) => {
 								parser.tagVariable(pattern.name, WorkerSpecifierTag);
 								return true;
 							});
@@ -530,7 +530,7 @@ class WorkerPlugin {
 								const source = match[3];
 								(call ? parser.hooks.call : parser.hooks.new)
 									.for(harmonySpecifierTag)
-									.tap(PLUGIN_NAME, expr => {
+									.tap(PLUGIN_NAME, (expr) => {
 										const settings = /** @type {HarmonySettings} */ (
 											parser.currentTagData
 										);

package/lib/dependencies/getFunctionExpression.js

@@ -14,7 +14,7 @@
  * @param {Expression | SpreadElement} expr expressions
  * @returns {{fn: FunctionExpression | ArrowFunctionExpression, expressions: (Expression | SpreadElement)[], needThis: boolean | undefined } | undefined} function expression with additional information
  */
-module.exports = expr => {
+module.exports = (expr) => {
 	// <FunctionExpression>
 	if (
 		expr.type === "FunctionExpression" ||

package/lib/esm/ExportWebpackRequireRuntimeModule.js

@@ -6,6 +6,10 @@
 
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
+const Template = require("../Template");
+
+// CompatibilityPlugin renames `__webpack_require__` but doesn’t account for `export { __webpack_require__ }`, so we create a temporary variable to handle it.
+const EXPORT_TEMP_NAME = "__webpack_require_temp__";
 
 class ExportWebpackRequireRuntimeModule extends RuntimeModule {
 	constructor() {
@@ -23,7 +27,10 @@ class ExportWebpackRequireRuntimeModule extends RuntimeModule {
 	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		return `export default ${RuntimeGlobals.require};`;
+		return Template.asString([
+			`var ${EXPORT_TEMP_NAME} = ${RuntimeGlobals.require};`,
+			`export { ${EXPORT_TEMP_NAME} as ${RuntimeGlobals.require} };`
+		]);
 	}
 }
 

package/lib/esm/ModuleChunkFormatPlugin.js

@@ -8,13 +8,16 @@
 const { ConcatSource } = require("webpack-sources");
 const { HotUpdateChunk, RuntimeGlobals } = require("..");
 const Template = require("../Template");
+const {
+	createChunkHashHandler,
+	getChunkInfo
+} = require("../javascript/ChunkFormatHelpers");
 const { getAllChunks } = require("../javascript/ChunkHelpers");
 const {
 	chunkHasJs,
 	getChunkFilenameTemplate,
 	getCompilationHooks
 } = require("../javascript/JavascriptModulesPlugin");
-const { updateHashForEntryStartup } = require("../javascript/StartupHelpers");
 const { getUndoPath } = require("../util/identifier");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -27,28 +30,6 @@ const { getUndoPath } = require("../util/identifier");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
 
-/**
- * Gets information about a chunk including its entries and runtime chunk
- * @param {Chunk} chunk The chunk to get information for
- * @param {ChunkGraph} chunkGraph The chunk graph containing the chunk
- * @returns {{entries: Array<[Module, Entrypoint | undefined]>, runtimeChunk: Chunk|null}} Object containing chunk entries and runtime chunk
- */
-function getChunkInfo(chunk, chunkGraph) {
-	const entries = [
-		...chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
-	];
-	const runtimeChunk =
-		entries.length > 0
-			? /** @type {Entrypoint[][]} */
-				(entries)[0][1].getRuntimeChunk()
-			: null;
-
-	return {
-		entries,
-		runtimeChunk
-	};
-}
-
 /**
  * @param {Compilation} compilation the compilation instance
  * @param {Chunk} chunk the chunk
@@ -97,7 +78,7 @@ const getRelativePath = (compilation, chunk, runtimeChunk) => {
  * @returns {string} the import source
  */
 function renderChunkImport(compilation, chunk, namedImport, runtimeChunk) {
-	return `import ${namedImport ? `* as ${namedImport}` : RuntimeGlobals.require} from ${JSON.stringify(
+	return `import ${namedImport ? `* as ${namedImport}` : `{ ${RuntimeGlobals.require} }`} from ${JSON.stringify(
 		getRelativePath(compilation, chunk, runtimeChunk || chunk)
 	)};\n`;
 }
@@ -119,7 +100,7 @@ class ModuleChunkFormatPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.hooks.additionalChunkRuntimeRequirements.tap(
 				PLUGIN_NAME,
 				(chunk, set) => {
@@ -168,27 +149,30 @@ class ModuleChunkFormatPlugin {
 				PLUGIN_NAME,
 				(modules, _lastModule, renderContext) => {
 					const { chunk, chunkGraph } = renderContext;
-					if (!chunk.hasRuntime()) {
-						return modules;
-					}
-					const entryDependentChunks =
-						chunkGraph.getChunkEntryDependentChunksIterable(chunk);
-					const sourceWithDependentChunks = withDependentChunks(
-						/** @type {Set<Chunk>} */ (entryDependentChunks),
-						chunkGraph,
-						chunk
-					);
-					if (!sourceWithDependentChunks) {
-						return modules;
-					}
-					if (modules.size() === 0) {
-						return sourceWithDependentChunks;
+					if (
+						chunkGraph.getNumberOfEntryModules(chunk) > 0 &&
+						chunk.hasRuntime()
+					) {
+						const entryDependentChunks =
+							chunkGraph.getChunkEntryDependentChunksIterable(chunk);
+						const sourceWithDependentChunks = withDependentChunks(
+							/** @type {Set<Chunk>} */ (entryDependentChunks),
+							chunkGraph,
+							chunk
+						);
+						if (!sourceWithDependentChunks) {
+							return modules;
+						}
+						if (modules.size() === 0) {
+							return sourceWithDependentChunks;
+						}
+						const source = new ConcatSource();
+						source.add(sourceWithDependentChunks);
+						source.add("\n");
+						source.add(modules);
+						return source;
 					}
-					const source = new ConcatSource();
-					source.add(sourceWithDependentChunks);
-					source.add("\n");
-					source.add(modules);
-					return source;
+					return modules;
 				}
 			);
 			hooks.renderChunk.tap(PLUGIN_NAME, (modules, renderContext) => {
@@ -196,17 +180,17 @@ class ModuleChunkFormatPlugin {
 				const hotUpdateChunk = chunk instanceof HotUpdateChunk ? chunk : null;
 				const source = new ConcatSource();
 				source.add(
-					`export const __webpack_id__ = ${JSON.stringify(chunk.id)};\n`
+					`export const ${RuntimeGlobals.esmId} = ${JSON.stringify(chunk.id)};\n`
 				);
 				source.add(
-					`export const __webpack_ids__ = ${JSON.stringify(chunk.ids)};\n`
+					`export const ${RuntimeGlobals.esmIds} = ${JSON.stringify(chunk.ids)};\n`
 				);
-				source.add("export const __webpack_modules__ = ");
+				source.add(`export const ${RuntimeGlobals.esmModules} = `);
 				source.add(modules);
 				source.add(";\n");
 				const runtimeModules = chunkGraph.getChunkRuntimeModulesInOrder(chunk);
 				if (runtimeModules.length > 0) {
-					source.add("export const __webpack_runtime__ =\n");
+					source.add(`export const ${RuntimeGlobals.esmRuntime} =\n`);
 					source.add(
 						Template.renderChunkRuntimeModules(runtimeModules, renderContext)
 					);
@@ -238,9 +222,6 @@ class ModuleChunkFormatPlugin {
 						}
 						const final = i + 1 === entries.length;
 						const moduleId = chunkGraph.getModuleId(module);
-						const entryDependentChunks = /** @type {Set<Chunk>} */ (
-							chunkGraph.getChunkEntryDependentChunksIterable(chunk)
-						);
 						const chunks = getAllChunks(
 							/** @type {Entrypoint} */ (entrypoint),
 							/** @type {Chunk} */ (runtimeChunk),
@@ -248,10 +229,7 @@ class ModuleChunkFormatPlugin {
 						);
 						const processChunks = new Set();
 						for (const _chunk of chunks) {
-							if (
-								loadedChunks.has(_chunk) ||
-								entryDependentChunks.has(_chunk)
-							) {
+							if (loadedChunks.has(_chunk)) {
 								continue;
 							}
 							loadedChunks.add(_chunk);
@@ -287,19 +265,7 @@ class ModuleChunkFormatPlugin {
 				}
 				return source;
 			});
-			hooks.chunkHash.tap(PLUGIN_NAME, (chunk, hash, { chunkGraph }) => {
-				if (chunk.hasRuntime()) return;
-				const { entries, runtimeChunk } = getChunkInfo(chunk, chunkGraph);
-				hash.update(PLUGIN_NAME);
-				hash.update("1");
-				if (runtimeChunk && runtimeChunk.hash) {
-					// Any change to runtimeChunk should trigger a hash update,
-					// we shouldn't depend on or inspect its internal implementation.
-					// import __webpack_require__ from "./runtime-main.e9400aee33633a3973bd.js";
-					hash.update(runtimeChunk.hash);
-				}
-				updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
-			});
+			hooks.chunkHash.tap(PLUGIN_NAME, createChunkHashHandler(PLUGIN_NAME));
 		});
 	}
 }

package/lib/esm/ModuleChunkLoadingPlugin.js

@@ -21,13 +21,13 @@ class ModuleChunkLoadingPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			const globalChunkLoading = compilation.outputOptions.chunkLoading;
 			/**
 			 * @param {Chunk} chunk chunk to check
 			 * @returns {boolean} true, when the plugin is enabled for the chunk
 			 */
-			const isEnabledForChunk = chunk => {
+			const isEnabledForChunk = (chunk) => {
 				const options = chunk.getEntryOptions();
 				const chunkLoading =
 					options && options.chunkLoading !== undefined
@@ -71,11 +71,8 @@ class ModuleChunkLoadingPlugin {
 				.tap(PLUGIN_NAME, handler);
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.externalInstallChunk)
-				.tap(PLUGIN_NAME, (chunk, set, { chunkGraph }) => {
+				.tap(PLUGIN_NAME, (chunk) => {
 					if (!isEnabledForChunk(chunk)) return;
-					// If a chunk contains an entryModule, all exports are determined by the entryModule.
-					// The ExportWebpackRequireRuntimeModule is for internal use only and not exposed to users.
-					if (chunkGraph.getNumberOfEntryModules(chunk) > 0) return;
 					compilation.addRuntimeModule(
 						chunk,
 						new ExportWebpackRequireRuntimeModule()

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -159,7 +159,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
 			}{`,
 			Template.indent(
-				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 0`).join(
+				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
 					",\n"
 				)
 			),
@@ -168,29 +168,33 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 			withLoading || withExternalInstallChunk
 				? `var installChunk = ${runtimeTemplate.basicFunction("data", [
 						runtimeTemplate.destructureObject(
-							["__webpack_ids__", "__webpack_modules__", "__webpack_runtime__"],
+							[
+								RuntimeGlobals.esmIds,
+								RuntimeGlobals.esmModules,
+								RuntimeGlobals.esmRuntime
+							],
 							"data"
 						),
 						'// add "modules" to the modules object,',
 						'// then flag all "ids" as loaded and fire callback',
 						"var moduleId, chunkId, i = 0;",
-						"for(moduleId in __webpack_modules__) {",
+						`for(moduleId in ${RuntimeGlobals.esmModules}) {`,
 						Template.indent([
-							`if(${RuntimeGlobals.hasOwnProperty}(__webpack_modules__, moduleId)) {`,
+							`if(${RuntimeGlobals.hasOwnProperty}(${RuntimeGlobals.esmModules}, moduleId)) {`,
 							Template.indent(
-								`${RuntimeGlobals.moduleFactories}[moduleId] = __webpack_modules__[moduleId];`
+								`${RuntimeGlobals.moduleFactories}[moduleId] = ${RuntimeGlobals.esmModules}[moduleId];`
 							),
 							"}"
 						]),
 						"}",
-						`if(__webpack_runtime__) __webpack_runtime__(${RuntimeGlobals.require});`,
-						"for(;i < __webpack_ids__.length; i++) {",
+						`if(${RuntimeGlobals.esmRuntime}) ${RuntimeGlobals.esmRuntime}(${RuntimeGlobals.require});`,
+						`for(;i < ${RuntimeGlobals.esmIds}.length; i++) {`,
 						Template.indent([
-							"chunkId = __webpack_ids__[i];",
+							`chunkId = ${RuntimeGlobals.esmIds}[i];`,
 							`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) && installedChunks[chunkId]) {`,
 							Template.indent("installedChunks[chunkId][0]();"),
 							"}",
-							"installedChunks[__webpack_ids__[i]] = 0;"
+							`installedChunks[${RuntimeGlobals.esmIds}[i]] = 0;`
 						]),
 						"}",
 						withOnChunkLoad ? `${RuntimeGlobals.onChunksLoaded}();` : ""
@@ -365,8 +369,8 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 									"// start update chunk loading",
 									`var url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId);`,
 									`var onResolve = ${runtimeTemplate.basicFunction("obj", [
-										"var updatedModules = obj.__webpack_modules__;",
-										"var updatedRuntime = obj.__webpack_runtime__;",
+										`var updatedModules = obj.${RuntimeGlobals.esmModules};`,
+										`var updatedRuntime = obj.${RuntimeGlobals.esmRuntime};`,
 										"if(updatedRuntime) currentUpdateRuntime.push(updatedRuntime);",
 										"for(var moduleId in updatedModules) {",
 										Template.indent([

package/lib/formatLocation.js

@@ -12,7 +12,7 @@
  * @param {SourcePosition} pos position
  * @returns {string} formatted position
  */
-const formatPosition = pos => {
+const formatPosition = (pos) => {
 	if (pos && typeof pos === "object") {
 		if ("line" in pos && "column" in pos) {
 			return `${pos.line}:${pos.column}`;
@@ -27,7 +27,7 @@ const formatPosition = pos => {
  * @param {DependencyLocation} loc location
  * @returns {string} formatted location
  */
-const formatLocation = loc => {
+const formatLocation = (loc) => {
 	if (loc && typeof loc === "object") {
 		if ("start" in loc && loc.start && "end" in loc && loc.end) {
 			if (