@depup/webpack 5.111.1-depup.1 → 5.112.0-depup.0

package/lib/runtime/MakeDeferredNamespaceObjectRuntime.js

@@ -4,14 +4,15 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
-/** @import { ModuleId } from "../ChunkGraph" */
-/** @import Module, { RuntimeRequirements, ExportsType } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { ModuleId } from "../graph/ChunkGraph" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
+/** @import Module, { RuntimeRequirements, ExportsType } from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 
 /**
  * @typedef {object} DeferredCycleState
@@ -39,7 +40,8 @@ function harmonyImportTargets(moduleGraph, module) {
 			dep &&
 			moduleConnections.some(
 				(c) =>
-					c.dependency instanceof HarmonyImportDependency &&
+					c.dependency !== null &&
+					isDependencyKind(c.dependency, "esm-import") &&
 					c.isTargetActive(undefined)
 			)
 		) {
@@ -220,6 +222,41 @@ function getOptimizedDeferredModule(
 	)})`;
 }
 
+/**
+ * Renders the setup a deferred namespace helper needs when a hot update delivers
+ * it, since the running bootstrap may not mark modules as evaluating.
+ * @param {RuntimeTemplate} runtimeTemplate the runtime template
+ * @param {boolean} recordErrors the bootstrap may not keep evaluation errors
+ * @returns {string} setup code, run once per runtime
+ */
+function renderHotDeferredSetup(runtimeTemplate, recordErrors) {
+	const cache = RuntimeGlobals.deferredModuleNamespaceCache;
+	return Template.asString([
+		// The namespace cache doubles as the flag that the interceptor is installed.
+		`if (!${cache}) {`,
+		Template.indent([
+			`${cache} = {};`,
+			`${RuntimeGlobals.interceptModuleExecution}.push(${runtimeTemplate.basicFunction(
+				"options",
+				[
+					`${runtimeTemplate.renderConst()} factory = options.factory;`,
+					"if (factory) options.factory = function(module) {",
+					Template.indent([
+						"module.evaluating = true;",
+						"try { return factory.apply(this, arguments); }",
+						...(recordErrors
+							? ["catch (e) { module.error = e; throw e; }"]
+							: []),
+						"finally { module.evaluating = false; }"
+					]),
+					"};"
+				]
+			)});`
+		]),
+		"}"
+	]);
+}
+
 class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 	/**
 	 * Returns true, if the runtime module should get it's own scope.
@@ -251,7 +288,15 @@ class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeMod
 		const lt = runtimeTemplate.renderLet();
 		const fn = RuntimeGlobals.makeOptimizedDeferredNamespaceObject;
 		const hasAsync = this.hasAsyncRuntime;
+		const hot = this.receivesHotUpdates();
+		const moduleCache = hot
+			? RuntimeGlobals.moduleCache
+			: "__webpack_module_cache__";
+		// Without strict error handling the running bootstrap keeps no error to rethrow.
+		const recordErrors =
+			hot && !runtimeTemplate.outputOptions.strictModuleErrorHandling;
 		return Template.asString([
+			...(hot ? [renderHotDeferredSetup(runtimeTemplate, recordErrors)] : []),
 			// Note: must be a function (not arrow), because this is used in body!
 			// `asyncDeps` keeps a fixed positional slot even without async runtime
 			// so the trailing `syncDeps` (defer-cycle closure) always lines up.
@@ -266,11 +311,16 @@ class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeMod
 						// Forcing a module that is already evaluating, a cycle reached
 						// through a deferred import, must throw rather than expose partial
 						// exports. `syncDeps` carries the closure that catches it first.
-						`${cst} cachedModule = __webpack_module_cache__[moduleId];`,
+						`${cst} cachedModule = ${moduleCache}[moduleId];`,
 						'if (cachedModule !== undefined && (cachedModule.evaluating || cachedModule.evaluatingAsync)) throw new TypeError("Cannot access a deferred module namespace while the module is being evaluated");',
+						...(recordErrors
+							? [
+									"if (cachedModule !== undefined && cachedModule.error !== undefined) throw cachedModule.error;"
+								]
+							: []),
 						"if (syncDeps) for (var i = 0; i < syncDeps.length; i++) {",
 						Template.indent([
-							`${cst} depModule = __webpack_module_cache__[syncDeps[i]];`,
+							`${cst} depModule = ${moduleCache}[syncDeps[i]];`,
 							'if (depModule !== undefined && (depModule.evaluating || depModule.evaluatingAsync)) throw new TypeError("Cannot access a deferred module namespace while a dependency is being evaluated");'
 						]),
 						"}",
@@ -293,7 +343,7 @@ class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeMod
 						`if(isAsync) obj[${RuntimeGlobals.deferredModuleAsyncTransitiveDependenciesSymbol}] = asyncDeps.filter(${runtimeTemplate.basicFunction(
 							"id",
 							[
-								`${cst} dep = __webpack_module_cache__[id];`,
+								`${cst} dep = ${moduleCache}[id];`,
 								"if (dep && dep.evaluating) return false;",
 								"r(id);",
 								"return true;"
@@ -349,7 +399,17 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 		const sealed = this.sealed;
 		const synthesized = this.synthesized;
 		const init = `${runtimeTemplate.optionalChaining("init", "()")};`;
-		return `${fn} = ${runtimeTemplate.basicFunction(
+		const hot = this.receivesHotUpdates();
+		const moduleCache = hot
+			? RuntimeGlobals.moduleCache
+			: "__webpack_module_cache__";
+		const namespaceCache = hot
+			? RuntimeGlobals.deferredModuleNamespaceCache
+			: "__webpack_module_deferred_namespace_cache__";
+		// Without strict error handling the running bootstrap keeps no error to rethrow.
+		const recordErrors =
+			hot && !runtimeTemplate.outputOptions.strictModuleErrorHandling;
+		return `${hot ? `${renderHotDeferredSetup(runtimeTemplate, recordErrors)}\n` : ""}${fn} = ${runtimeTemplate.basicFunction(
 			"moduleId, mode, exportNames",
 			[
 				// WHY: the TC39 import-defer spec makes a deferred namespace distinct
@@ -372,12 +432,10 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				sealed && synthesized
 					? "if (!(mode & 8)) exportNames = undefined;"
 					: "",
-				`${lt} byMode = __webpack_module_deferred_namespace_cache__[moduleId];`,
+				`${lt} byMode = ${namespaceCache}[moduleId];`,
 				"if (byMode && byMode[mode] !== undefined) return byMode[mode];",
-				"if (!byMode) byMode = __webpack_module_deferred_namespace_cache__[moduleId] = {};",
-				synthesized
-					? `${cst} cachedModule = __webpack_module_cache__[moduleId];`
-					: "",
+				`if (!byMode) byMode = ${namespaceCache}[moduleId] = {};`,
+				synthesized ? `${cst} cachedModule = ${moduleCache}[moduleId];` : "",
 				synthesized
 					? "if (cachedModule && cachedModule.error === undefined && !(mode & 8)) {"
 					: "",
@@ -396,8 +454,13 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 					// A deferred namespace that forces evaluation of a module that is
 					// already evaluating (a cycle) must throw rather than expose its
 					// partial exports.
-					`${cst} evaluatingModule = __webpack_module_cache__[moduleId];`,
+					`${cst} evaluatingModule = ${moduleCache}[moduleId];`,
 					'if (evaluatingModule !== undefined && (evaluatingModule.evaluating || evaluatingModule.evaluatingAsync)) throw new TypeError("Cannot access a deferred module namespace while the module is being evaluated");',
+					...(recordErrors
+						? [
+								"if (evaluatingModule !== undefined && evaluatingModule.error !== undefined) throw evaluatingModule.error;"
+							]
+						: []),
 					`ns = ${RuntimeGlobals.require}(moduleId);`,
 					hasAsync
 						? `if (${RuntimeGlobals.asyncModuleExportSymbol} in ns) ns = ns[${RuntimeGlobals.asyncModuleExportSymbol}];`

package/lib/runtime/MakeNamespaceObjectRuntimeModule.js

@@ -4,9 +4,9 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @import Compilation from "../Compilation" */
 

package/lib/runtime/NonceRuntimeModule.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
 class NonceRuntimeModule extends RuntimeModule {
 	constructor() {

package/lib/runtime/OnChunksLoadedRuntimeModule.js

@@ -4,14 +4,14 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const { getOnlyHandlerKey } = require("../util/handlerKeys");
 const { propertyAccess } = require("../util/property");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
 /** @import Compilation from "../Compilation" */
-/** @import { ReadOnlyRuntimeRequirements } from "../Module" */
+/** @import { ReadOnlyRuntimeRequirements } from "../module/Module" */
 
 class OnChunksLoadedRuntimeModule extends RuntimeModule {
 	/**

package/lib/runtime/PublicPathRuntimeModule.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
 /** @import { PublicPath } from "../../declarations/WebpackOptions" */
 /** @import Compilation from "../Compilation" */

package/lib/runtime/RelativeUrlRuntimeModule.js

@@ -4,9 +4,9 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @import Compilation from "../Compilation" */
 

package/lib/{RuntimeGlobals.js → runtime/RuntimeGlobals.js}

@@ -121,6 +121,11 @@ module.exports.deferredModuleAsyncTransitiveDependencies =
 module.exports.deferredModuleAsyncTransitiveDependenciesSymbol =
 	"__webpack_require__.zS";
 
+/**
+ * cached deferred namespaces, kept on `__webpack_require__` when hot updates can replace their helper
+ */
+module.exports.deferredModuleNamespaceCache = "__webpack_require__.zC";
+
 /**
  * the exported property define getters function
  */
@@ -157,6 +162,11 @@ module.exports.entryModuleId = "__webpack_require__.s";
  */
 module.exports.esmIds = "__webpack_esm_ids__";
 
+/**
+ * esm module decorator
+ */
+module.exports.esmModuleDecorator = "__webpack_require__.hmd";
+
 /**
  * esm modules
  */
@@ -233,7 +243,8 @@ module.exports.getWorkletBootstrap = "__webpack_require__.wb";
 module.exports.global = "__webpack_require__.g";
 
 /**
- * harmony module decorator
+ * esm module decorator
+ * @deprecated use `esmModuleDecorator` — TODO in the next major release: remove
  */
 module.exports.harmonyModuleDecorator = "__webpack_require__.hmd";
 
@@ -242,6 +253,12 @@ module.exports.harmonyModuleDecorator = "__webpack_require__.hmd";
  */
 module.exports.hasCssModules = "has css modules";
 
+/**
+ * a flag when a server render may already have put the stylesheets in the
+ * document, so the css runtime has to wait for one that has not applied yet
+ */
+module.exports.hasServerRenderedStylesheets = "has server rendered stylesheets";
+
 /**
  * a flag when a chunk has a fetch priority
  */

package/lib/runtime/RuntimeIdRuntimeModule.js

@@ -4,11 +4,11 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 
 class RuntimeIdRuntimeModule extends RuntimeModule {
 	constructor() {

package/lib/{RuntimeModule.js → runtime/RuntimeModule.js}

@@ -7,22 +7,24 @@
 
 const { RawSource } = require("webpack-sources");
 const OriginalSource = require("webpack-sources").OriginalSource;
-const Module = require("./Module");
+const Module = require("../module/Module");
 const {
 	JAVASCRIPT_TYPES,
 	RUNTIME_TYPES
-} = require("./ModuleSourceTypeConstants");
-const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	WEBPACK_MODULE_TYPE_RUNTIME
+} = require("../module/ModuleTypeConstants");
 
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
+ * } from "../config/defaults"
  */
-/** @import Chunk from "./Chunk" */
-/** @import ChunkGraph from "./ChunkGraph" */
-/** @import Compilation from "./Compilation" */
-/** @import { UpdateHashContext } from "./Dependency" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import Compilation from "../Compilation" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
 /**
  * @import {
  * 	BuildMeta,
@@ -34,13 +36,14 @@ const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
  * 	NeedBuildContext,
  * 	Sources,
  * 	BasicSourceTypes,
- * 	SourceTypes
- * } from "./Module"
+ * 	SourceTypes,
+ * 	ModuleKinds
+ * } from "../module/Module"
  */
-/** @import RequestShortener from "./RequestShortener" */
-/** @import { ResolverWithOptions } from "./ResolverFactory" */
-/** @import Hash from "./util/Hash" */
-/** @import { InputFileSystem } from "./util/fs" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import Hash from "../util/Hash" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 class RuntimeModule extends Module {
 	/**
@@ -138,12 +141,21 @@ class RuntimeModule extends Module {
 		hash.update(`${this.stage}`);
 		// A failing `generate()` propagates: hashing its message instead pins the etag
 		// of the code generation cache to a constant, which then serves stale code.
-		const code =
-			this.fullHash || this.dependentHash
-				? // Do not use getGeneratedCode here, because i. e. compilation hash might be not
-					// ready at this point. We will cache it later instead.
-					this.generate()
-				: this.getGeneratedCode();
+		/** @type {string | null} */
+		let code;
+		try {
+			code =
+				this.fullHash || this.dependentHash
+					? // Do not use getGeneratedCode here, because i. e. compilation hash might be not
+						// ready at this point. We will cache it later instead.
+						this.generate()
+					: this.getGeneratedCode();
+		} catch (err) {
+			const { toError } = require("../errors/ErrorHelpers");
+			const RuntimeModuleGenerationError = require("../errors/RuntimeModuleGenerationError");
+
+			throw new RuntimeModuleGenerationError(this, toError(err));
+		}
 		if (code !== null && code !== undefined) {
 			hash.update(code);
 		}
@@ -226,7 +238,7 @@ class RuntimeModule extends Module {
 	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -280,4 +292,7 @@ RuntimeModule.STAGE_ATTACH = 10;
  */
 RuntimeModule.STAGE_TRIGGER = 20;
 
+/** @type {Set<keyof ModuleKinds>} */
+RuntimeModule.KINDS = new Set([...Module.KINDS, "runtime"]);
+
 module.exports = RuntimeModule;

package/lib/{RuntimePlugin.js → runtime/RuntimePlugin.js}

@@ -5,133 +5,131 @@
 
 "use strict";
 
-const RuntimeGlobals = require("./RuntimeGlobals");
+const CssModulesPlugin = require("../css/CssModulesPlugin");
+const RuntimeRequirementsDependency = require("../dependencies/core/RuntimeRequirementsDependency");
+const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
 const {
 	getPresentKinds,
 	usesFullHashDigest
-} = require("./TemplatedPathPlugin");
-const CssModulesPlugin = require("./css/CssModulesPlugin");
-const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
-const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
-const StringXor = require("./util/StringXor");
-const lazyModule = require("./util/lazyModule");
+} = require("../template/TemplatedPathPlugin");
+const StringXor = require("../util/StringXor");
+const lazyModule = require("../util/lazyModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
-/** @import { LibraryOptions } from "../declarations/WebpackOptions" */
-/** @import Chunk from "./Chunk" */
-/** @import { RuntimeRequirements } from "./Module" */
-/** @import Compiler from "./Compiler" */
+/** @import { LibraryOptions } from "../../declarations/WebpackOptions.d.ts" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import { RuntimeRequirements } from "../module/Module" */
+/** @import Compiler from "../Compiler" */
 /** @import RuntimeModule from "./RuntimeModule" */
 
 // Each runtime module below is loaded by `_attachPendingRuntimeModules`, so only
 // the builds that emit one pay for it — most reach ~10 of these 30.
 const getCssServerStylesRuntimeModule = lazyModule(() =>
-	require("./css/CssServerStylesRuntimeModule")
+	require("../css/CssServerStylesRuntimeModule")
 );
 const getAsyncModuleGeneratorRuntimeModule = lazyModule(() =>
-	require("./runtime/AsyncModuleGeneratorRuntimeModule")
+	require("./AsyncModuleGeneratorRuntimeModule")
 );
 const getAsyncModuleRuntimeModule = lazyModule(() =>
-	require("./runtime/AsyncModuleRuntimeModule")
+	require("./AsyncModuleRuntimeModule")
 );
 const getAutoPublicPathRuntimeModule = lazyModule(() =>
-	require("./runtime/AutoPublicPathRuntimeModule")
+	require("./AutoPublicPathRuntimeModule")
 );
 const getBaseUriRuntimeModule = lazyModule(() =>
-	require("./runtime/BaseUriRuntimeModule")
+	require("./BaseUriRuntimeModule")
 );
 const getCompatGetDefaultExportRuntimeModule = lazyModule(() =>
-	require("./runtime/CompatGetDefaultExportRuntimeModule")
+	require("./CompatGetDefaultExportRuntimeModule")
 );
 const getCompatRuntimeModule = lazyModule(() =>
-	require("./runtime/CompatRuntimeModule")
+	require("./CompatRuntimeModule")
 );
 const getConcatenationWrapRuntimeModule = lazyModule(() =>
-	require("./runtime/ConcatenationWrapRuntimeModule")
+	require("./ConcatenationWrapRuntimeModule")
 );
 const getConstructRequireRuntimeModule = lazyModule(() =>
-	require("./runtime/ConstructRequireRuntimeModule")
+	require("./ConstructRequireRuntimeModule")
 );
 const getCreateFakeNamespaceObjectRuntimeModule = lazyModule(() =>
-	require("./runtime/CreateFakeNamespaceObjectRuntimeModule")
+	require("./CreateFakeNamespaceObjectRuntimeModule")
 );
 const getCreateScriptRuntimeModule = lazyModule(() =>
-	require("./runtime/CreateScriptRuntimeModule")
+	require("./CreateScriptRuntimeModule")
 );
 const getCreateScriptUrlRuntimeModule = lazyModule(() =>
-	require("./runtime/CreateScriptUrlRuntimeModule")
+	require("./CreateScriptUrlRuntimeModule")
 );
 const getDefinePropertyGettersRuntimeModule = lazyModule(() =>
-	require("./runtime/DefinePropertyGettersRuntimeModule")
+	require("./DefinePropertyGettersRuntimeModule")
 );
 const getEnsureChunkRuntimeModule = lazyModule(() =>
-	require("./runtime/EnsureChunkRuntimeModule")
+	require("./EnsureChunkRuntimeModule")
 );
 const getGetChunkFilenameRuntimeModule = lazyModule(() =>
-	require("./runtime/GetChunkFilenameRuntimeModule")
+	require("./GetChunkFilenameRuntimeModule")
 );
 const getGetMainFilenameRuntimeModule = lazyModule(() =>
-	require("./runtime/GetMainFilenameRuntimeModule")
+	require("./GetMainFilenameRuntimeModule")
 );
 const getGetTrustedTypesPolicyRuntimeModule = lazyModule(() =>
-	require("./runtime/GetTrustedTypesPolicyRuntimeModule")
+	require("./GetTrustedTypesPolicyRuntimeModule")
 );
 const getGetWorkletBootstrapRuntimeModule = lazyModule(() =>
-	require("./runtime/GetWorkletBootstrapRuntimeModule")
+	require("./GetWorkletBootstrapRuntimeModule")
 );
 const getGlobalRuntimeModule = lazyModule(() =>
-	require("./runtime/GlobalRuntimeModule")
+	require("./GlobalRuntimeModule")
 );
 const getSpecNamespaceObjectRuntimeModule = lazyModule(() =>
-	require("./runtime/SpecNamespaceObjectRuntimeModule")
+	require("./SpecNamespaceObjectRuntimeModule")
 );
 const getHasOwnPropertyRuntimeModule = lazyModule(() =>
-	require("./runtime/HasOwnPropertyRuntimeModule")
+	require("./HasOwnPropertyRuntimeModule")
 );
 const getLoadScriptRuntimeModule = lazyModule(() =>
-	require("./runtime/LoadScriptRuntimeModule")
+	require("./LoadScriptRuntimeModule")
 );
 const getMakeDeferredNamespaceObjectRuntimeModule = lazyModule(
 	() =>
-		require("./runtime/MakeDeferredNamespaceObjectRuntime")
+		require("./MakeDeferredNamespaceObjectRuntime")
 			.MakeDeferredNamespaceObjectRuntimeModule
 );
 const getMakeOptimizedDeferredNamespaceObjectRuntimeModule = lazyModule(
 	() =>
-		require("./runtime/MakeDeferredNamespaceObjectRuntime")
+		require("./MakeDeferredNamespaceObjectRuntime")
 			.MakeOptimizedDeferredNamespaceObjectRuntimeModule
 );
 const getMakeNamespaceObjectRuntimeModule = lazyModule(() =>
-	require("./runtime/MakeNamespaceObjectRuntimeModule")
-);
-const getNonceRuntimeModule = lazyModule(() =>
-	require("./runtime/NonceRuntimeModule")
+	require("./MakeNamespaceObjectRuntimeModule")
 );
+const getNonceRuntimeModule = lazyModule(() => require("./NonceRuntimeModule"));
 const getOnChunksLoadedRuntimeModule = lazyModule(() =>
-	require("./runtime/OnChunksLoadedRuntimeModule")
+	require("./OnChunksLoadedRuntimeModule")
 );
 const getPublicPathRuntimeModule = lazyModule(() =>
-	require("./runtime/PublicPathRuntimeModule")
+	require("./PublicPathRuntimeModule")
 );
 const getRelativeUrlRuntimeModule = lazyModule(() =>
-	require("./runtime/RelativeUrlRuntimeModule")
+	require("./RelativeUrlRuntimeModule")
 );
 const getRuntimeIdRuntimeModule = lazyModule(() =>
-	require("./runtime/RuntimeIdRuntimeModule")
+	require("./RuntimeIdRuntimeModule")
 );
 const getSetAnonymousDefaultNameRuntimeModule = lazyModule(() =>
-	require("./runtime/SetAnonymousDefaultNameRuntimeModule")
+	require("./SetAnonymousDefaultNameRuntimeModule")
 );
 const getSystemContextRuntimeModule = lazyModule(() =>
-	require("./runtime/SystemContextRuntimeModule")
+	require("./SystemContextRuntimeModule")
 );
 const getToBinaryRuntimeModule = lazyModule(() =>
-	require("./runtime/ToBinaryRuntimeModule")
+	require("./ToBinaryRuntimeModule")
 );
 const getWorkerRuntimeModule = lazyModule(() =>
-	require("./runtime/WorkerRuntimeModule")
+	require("./WorkerRuntimeModule")
 );
 const getShareRuntimeModule = lazyModule(() =>
-	require("./sharing/ShareRuntimeModule")
+	require("../sharing/ShareRuntimeModule")
 );
 
 const GLOBALS_ON_REQUIRE = [
@@ -158,7 +156,7 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.prefetchAsset,
 	RuntimeGlobals.preloadAsset,
 	RuntimeGlobals.relativeUrl,
-	// TODO webpack 6 - rename to nonce, because we use it for CSS too
+	// TODO in the next major release: rename to nonce, because we use it for CSS too
 	RuntimeGlobals.scriptNonce,
 	RuntimeGlobals.uncaughtErrorHandler,
 	RuntimeGlobals.asyncModule,
@@ -709,7 +707,7 @@ class RuntimePlugin {
 						return true;
 					}
 				});
-			// TODO webpack 6: remove CompatRuntimeModule
+			// TODO in the next major release: remove CompatRuntimeModule
 			compilation.hooks.additionalTreeRuntimeRequirements.tap(
 				PLUGIN_NAME,
 				(chunk, _set) => {

package/lib/runtime/SetAnonymousDefaultNameRuntimeModule.js

@@ -4,9 +4,9 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @import Compilation from "../Compilation" */
 

package/lib/runtime/SpecNamespaceObjectRuntimeModule.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @import Compilation from "../Compilation" */
 

package/lib/runtime/StartupChunkDependenciesPlugin.js

@@ -4,11 +4,11 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
 const lazyModule = require("../util/lazyModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @import { ChunkLoadingType } from "../../declarations/WebpackOptions" */
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 
 // only a chunk with startup dependencies emits these

package/lib/runtime/StartupChunkDependenciesRuntimeModule.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
 
 class StartupChunkDependenciesRuntimeModule extends RuntimeModule {