webpack 5.111.0 → 5.112.0

package/lib/{NormalModuleReplacementPlugin.js → resolve/NormalModuleReplacementPlugin.js}

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const { dirname, isAbsolute, join } = require("./util/fs");
+const { dirname, isAbsolute, join } = require("../fs/fs");
 
-/** @import Compiler from "./Compiler" */
-/** @import { ResolveData } from "./NormalModuleFactory" */
-/** @import { InputFileSystem } from "./util/fs" */
+/** @import Compiler from "../Compiler" */
+/** @import { ResolveData } from "../module/NormalModuleFactory" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 /** @typedef {(resolveData: ResolveData) => void} ModuleReplacer */
 

package/lib/{ResolverFactory.js → resolve/ResolverFactory.js}

@@ -11,12 +11,16 @@ const {
 	cachedCleverMerge,
 	removeOperations,
 	resolveByProperty
-} = require("./util/cleverMerge");
+} = require("../util/cleverMerge");
+const memoize = require("../util/memoize");
+const getResolveOptionsKey = require("./getResolveOptionsKey");
+
+const getGlobUtils = memoize(() => require("../util/globUtils"));
 
 /** @typedef {import("enhanced-resolve").Resolver} Resolver */
-/** @typedef {import("../declarations/WebpackOptions").ResolvePluginInstance} ResolvePluginInstance */
+/** @typedef {import("../../declarations/WebpackOptions").ResolvePluginInstance} ResolvePluginInstance */
 /** @import { ResolveOptions } from "enhanced-resolve" */
-/** @import { ResolveOptions as WebpackResolveOptions } from "../declarations/WebpackOptions" */
+/** @import { ResolveOptions as WebpackResolveOptions } from "../../declarations/WebpackOptions" */
 
 /** @typedef {WebpackResolveOptions & { dependencyType?: string, resolveToContext?: boolean }} ResolveOptionsWithDependencyType */
 /**
@@ -61,13 +65,22 @@ const convertToResolveOptions = (resolveOptionsWithDepType) => {
 			partialOptions
 		);
 
-	return /** @type {ResolveOptions} */ (
+	const resolveOptions = /** @type {ResolveOptions} */ (
 		removeOperations(
 			resolveByProperty(options, "byDependency", dependencyType),
 			// Keep the `unsafeCache` because it can be a `Proxy`
 			["unsafeCache"]
 		)
 	);
+	if (resolveOptions.restrictions) {
+		// enhanced-resolve reads a string as a directory, so a glob goes as a RegExp
+		const { compileRelativeGlobPaths, createPathGlobRegExp } = getGlobUtils();
+		resolveOptions.restrictions = compileRelativeGlobPaths(
+			resolveOptions.restrictions,
+			createPathGlobRegExp
+		);
+	}
+	return resolveOptions;
 };
 
 /**
@@ -112,7 +125,7 @@ module.exports = class ResolverFactory {
 		if (cachedResolver) {
 			return cachedResolver;
 		}
-		const ident = JSON.stringify(resolveOptions);
+		const ident = getResolveOptionsKey(resolveOptions).key;
 		const resolver = typedCaches.stringified.get(ident);
 		if (resolver) {
 			typedCaches.direct.set(resolveOptions, resolver);

package/lib/resolve/getResolveOptionsKey.js

@@ -0,0 +1,59 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+/** @import { ResolveOptionsWithDependencyType } from "./ResolverFactory" */
+
+/** @type {WeakMap<EXPECTED_OBJECT | EXPECTED_FUNCTION, number>} */
+const identities = new WeakMap();
+let nextIdentity = 0;
+
+/**
+ * Serializes resolve options into a cache key. Plain JSON values and regular expressions are keyed by content; functions, class instances and `unsafeCache` objects by identity, which holds only within this process.
+ * @param {ResolveOptionsWithDependencyType} options resolve options
+ * @returns {{ key: string, persistent: boolean }} the key, and whether it means the same in another process
+ */
+const getResolveOptionsKey = (options) => {
+	let persistent = true;
+	const key = JSON.stringify(
+		options,
+		/**
+		 * @this {Record<string, unknown>}
+		 * @param {string} name property name
+		 * @param {unknown} value value, after any `toJSON()`
+		 * @returns {unknown} value to serialize
+		 */
+		function replacer(name, value) {
+			// `toJSON()` already ran, so a plugin could pass for plain data
+			value = this[name];
+			if (
+				value === null ||
+				(typeof value !== "object" && typeof value !== "function") ||
+				Array.isArray(value)
+			) {
+				return value;
+			}
+			if (value instanceof RegExp) return { regexp: value.toString() };
+			const prototype = Object.getPrototypeOf(value);
+			if (
+				name !== "unsafeCache" &&
+				(prototype === Object.prototype || prototype === null)
+			) {
+				return value;
+			}
+			let identity = identities.get(value);
+			if (identity === undefined) {
+				identity = nextIdentity++;
+				identities.set(value, identity);
+			}
+			persistent = false;
+			return { identity };
+		}
+	);
+	return { key, persistent };
+};
+
+module.exports = getResolveOptionsKey;

package/lib/rules/RuleSetCompiler.js

@@ -6,8 +6,11 @@
 "use strict";
 
 const { SyncHook } = require("tapable");
-const { createPathGlobMatcher } = require("../util/globUtils");
-const { fileUrlToPath } = require("../util/identifier");
+const { compileGlobList } = require("../util/globUtils");
+const {
+	RELATIVE_PATH_PREFIX_REGEXP,
+	fileUrlToPath
+} = require("../util/identifier");
 
 /** @import { ResolveRequest } from "enhanced-resolve" */
 /**
@@ -16,7 +19,9 @@ const { fileUrlToPath } = require("../util/identifier");
  * 	RuleSetUseItem,
  * 	RuleSetLoaderOptions,
  * 	RuleSetRule,
- * 	RuleSetConditionAbsolute
+ * 	RuleSetConditionAbsolute,
+ * 	RuleSetGlob,
+ * 	RuleSetGlobs
  * } from "../../declarations/WebpackOptions"
  */
 
@@ -110,34 +115,11 @@ const { fileUrlToPath } = require("../util/identifier");
 
 /** @typedef {Set<string>} UnhandledProperties */
 
-/** @typedef {(str: string) => boolean} GlobMatcher */
 /** @typedef {(data: EffectData) => (RuleSetUseItem | (Falsy | RuleSetUseItem)[])} RuleSetUseFn */
 /** @typedef {(value: string) => boolean} RuleSetConditionFn */
 
 /** @typedef {{ apply: (ruleSetCompiler: RuleSetCompiler) => void }} RuleSetPlugin */
 
-/**
- * @param {GlobMatcher[]} positive patterns that select
- * @param {GlobMatcher[]} negative patterns that subtract
- * @returns {GlobMatcher} matcher
- */
-const combineGlobMatchers = (positive, negative) => {
-	/** @type {GlobMatcher} */
-	const matchPositive =
-		positive.length === 0
-			? () => true
-			: positive.length === 1
-				? positive[0]
-				: (str) => positive.some((match) => match(str));
-	if (negative.length === 0) return matchPositive;
-	/** @type {GlobMatcher} */
-	const matchNegative =
-		negative.length === 1
-			? negative[0]
-			: (str) => negative.some((match) => match(str));
-	return (str) => matchPositive(str) && !matchNegative(str);
-};
-
 class RuleSetCompiler {
 	/**
 	 * Creates an instance of RuleSetCompiler.
@@ -475,31 +457,30 @@ class RuleSetCompiler {
 		if (globs.length === 0) {
 			throw this.error(path, glob, "Expected glob pattern, but got empty list");
 		}
-		/** @type {GlobMatcher[]} */
-		const positive = [];
-		/** @type {GlobMatcher[]} */
-		const negative = [];
+		/**
+		 * @param {number} i pattern index
+		 * @returns {string} path of the pattern
+		 */
+		const patternPath = (i) => (Array.isArray(glob) ? `${path}[${i}]` : path);
 		for (let i = 0; i < globs.length; i++) {
-			const pattern = globs[i];
-			const patternPath = Array.isArray(glob) ? `${path}[${i}]` : path;
-			if (typeof pattern !== "string") {
+			if (typeof globs[i] !== "string") {
 				throw this.error(
-					patternPath,
-					pattern,
-					`Unexpected ${typeof pattern} when glob pattern was expected`
+					patternPath(i),
+					globs[i],
+					`Unexpected ${typeof globs[i]} when glob pattern was expected`
 				);
 			}
-			const negated = pattern.startsWith("!");
-			const match = createPathGlobMatcher(negated ? pattern.slice(1) : pattern);
-			if (match === null) {
-				throw this.error(patternPath, pattern, "Invalid glob pattern");
-			}
-			(negated ? negative : positive).push(match);
 		}
-		const match = combineGlobMatchers(positive, negative);
+		const match = compileGlobList(globs, (pattern, i) => {
+			throw this.error(patternPath(i), pattern, "Invalid glob pattern");
+		});
 		return {
 			matchWhenEmpty: match(""),
-			fn: (v) => typeof v === "string" && match(v)
+			// a relative value starts where its `./` and `../` end, as a relative
+			// pattern matches at any depth
+			fn: (v) =>
+				typeof v === "string" &&
+				match(v.replace(RELATIVE_PATH_PREFIX_REGEXP, ""))
 		};
 	}
 
@@ -837,7 +818,7 @@ const someSpellingContains = (pattern, probe, expandFirst) => {
 };
 
 /**
- * @param {EXPECTED_ANY} glob glob pattern(s)
+ * @param {RuleSetGlob | RuleSetGlobs | undefined} glob glob pattern(s)
  * @param {string} extension extension including the dot (e.g. `".css"`)
  * @returns {boolean} whether a pattern targets the extension
  */
@@ -861,7 +842,7 @@ const globReferencesExtension = (glob, extension) => {
  * generic sample path doesn't match its (possibly filename-scoped) pattern.
  * The extension may be spelled by an alternation (`\.(css|scss)$`) or a
  * character class (`\.[jt]sx?$`), so those are expanded before probing.
- * @param {EXPECTED_ANY} condition condition
+ * @param {RuleSetConditionAbsolute | undefined} condition condition
  * @param {string} extProbe escaped extension probe (e.g. `"\\.css"`)
  * @returns {boolean} whether a regexp in the condition targets the extension
  */

package/lib/runtime/AsyncModuleGeneratorRuntimeModule.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/AsyncModuleRuntimeModule.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" */
 
@@ -33,6 +33,9 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 		const fn = RuntimeGlobals.asyncModule;
 		const defer = this._deferInterop;
 		const strictErrors = this._strictModuleErrorHandling;
+		const moduleCache = this.receivesHotUpdates()
+			? RuntimeGlobals.moduleCache
+			: "__webpack_module_cache__";
 		const rejectCall = "reject(promise[webpackError] = err)";
 		const rejectExpression = strictErrors
 			? `(markCycle(err), ${rejectCall})`
@@ -65,7 +68,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 								Template.indent([
 									`${cst} hasUnresolvedAsyncSubgraph = asyncDeps.some((id) => {`,
 									Template.indent([
-										`${cst} cache = __webpack_module_cache__[id];`,
+										`${cst} cache = ${moduleCache}[id];`,
 										"if (!cache) return true;",
 										// A cached entry no longer means finished, and a rejected
 										// one is done but its error must still reach the importer.
@@ -223,7 +226,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 									`group && group.forEach(${runtimeTemplate.basicFunction(
 										"id",
 										[
-											`${cst} peer = __webpack_module_cache__[id];`,
+											`${cst} peer = ${moduleCache}[id];`,
 											"if (peer && peer.error === undefined) peer.error = err;"
 										]
 									)})`,
@@ -239,11 +242,9 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 						}`,
 						"err"
 					)}`,
-					// Track the async body's whole lifetime (evaluating +
-					// evaluating-async states) with a dedicated flag — the sync require
-					// wrapper clears `module.evaluating` as soon as `.a` returns, so a
-					// deferred namespace reaching this module through a cycle relies on
-					// `evaluatingAsync` to keep throwing until it is fully evaluated.
+					// The sync require wrapper clears `module.evaluating` the moment `.a`
+					// returns, so a deferred namespace reaching this module through a cycle
+					// needs `evaluatingAsync` to keep throwing until evaluation ends.
 					defer ? "module.evaluatingAsync = true;" : "",
 					"body(handle, done);",
 					`${runtimeTemplate.optionalChaining("queue", "d < 0")} && (queue.d = 0);`

package/lib/runtime/AutoPublicPathRuntimeModule.js

@@ -4,12 +4,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 AutoPublicPathRuntimeModule extends RuntimeModule {

package/lib/runtime/BaseUriRuntimeModule.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 const { renderBaseUri } = require("./baseUri");
 
 /**
@@ -14,7 +14,7 @@ const { renderBaseUri } = require("./baseUri");
  * 	EntryDescriptionNormalized as EntryDescription
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compilation from "../Compilation" */
 
 class BaseUriRuntimeModule extends RuntimeModule {

package/lib/runtime/ChunkNameRuntimeModule.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
 class ChunkNameRuntimeModule extends RuntimeModule {
 	/**

package/lib/runtime/CompatGetDefaultExportRuntimeModule.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/CompatRuntimeModule.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" */
 /** @import Compilation from "../Compilation" */
 
 class CompatRuntimeModule extends RuntimeModule {

package/lib/runtime/ConcatenationWrapRuntimeModule.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/ConstructRequireRuntimeModule.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/CreateFakeNamespaceObjectRuntimeModule.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/CreateScriptRuntimeModule.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/CreateScriptUrlRuntimeModule.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/DefinePropertyGettersRuntimeModule.js

@@ -4,12 +4,12 @@
 
 "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" */
-/** @import { ReadOnlyRuntimeRequirements } from "../Module" */
+/** @import { ReadOnlyRuntimeRequirements } from "../module/Module" */
 
 class DefinePropertyGettersRuntimeModule extends HelperRuntimeModule {
 	/**
@@ -39,12 +39,12 @@ class DefinePropertyGettersRuntimeModule extends HelperRuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.definePropertyGetters;
-		// Only webpack emits the array form, so a build emitting none cannot
-		// receive one; the object form stays either way (see the note below).
+		// Only webpack emits the array form, so a build whose emitters all stayed
+		// silent cannot receive one; the object form stays either way.
 		const withArray = this.runtimeRequirements.has(
 			RuntimeGlobals.definePropertyGettersFromArray
 		);
-		// TODO webpack 6: remove object format support. Internal code (e.g. ConcatenatedModule)
+		// TODO in the next major release: remove object format support. Internal code (e.g. ConcatenatedModule)
 		// and third-party libraries may still call __webpack_require__.d() with an object.
 		const fromObject = [
 			"for(var key in definition) {",

package/lib/runtime/EnsureChunkRuntimeModule.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 EnsureChunkRuntimeModule extends RuntimeModule {
 	/**

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -4,14 +4,14 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
-const { reEncodeDigest } = require("../TemplatedPathPlugin");
+const Template = require("../template/Template");
+const { reEncodeDigest } = require("../template/TemplatedPathPlugin");
 const { first } = require("../util/SetHelpers");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
-/** @import Chunk, { ChunkId, ChunkFilenameTemplate } from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk, { ChunkId, ChunkFilenameTemplate } from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /**
  * @import Compilation, {
  * 	HashWithLengthFunction,
@@ -105,10 +105,9 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 			return length ? hash.slice(0, length) : hash;
 		};
 
-		// `[fullhash:<digest>]`/`[hash:<digest>]` would resolve to a runtime
-		// `getFullHash()` expression that can't be re-encoded; instead this module is
-		// flagged `fullHash` and re-rendered after hashing, so we inline the
-		// re-encoded full hash here — byte-identical to the statically emitted file.
+		// A digest cannot be re-encoded from the runtime `getFullHash()` expression,
+		// so this module is flagged `fullHash` and re-rendered after hashing: the
+		// inlined value is byte-identical to the statically emitted file.
 		/** @type {HashWithDigestFunction} */
 		const fullHashWithDigest = (digest, length) => {
 			const fullHash = compilation.fullHash;

package/lib/runtime/GetFullHashRuntimeModule.js

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

package/lib/runtime/GetMainFilenameRuntimeModule.js

@@ -4,11 +4,11 @@
 
 "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 Chunk from "../graph/Chunk" */
 /** @import Compilation from "../Compilation" */
 
 class GetMainFilenameRuntimeModule extends RuntimeModule {

package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js

@@ -4,12 +4,12 @@
 
 "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" */
-/** @import { ReadOnlyRuntimeRequirements } from "../Module" */
+/** @import { ReadOnlyRuntimeRequirements } from "../module/Module" */
 
 class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 	/**

package/lib/runtime/GetWorkletBootstrapRuntimeModule.js

@@ -5,9 +5,9 @@
 
 "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 Compilation from "../Compilation" */
 

package/lib/runtime/GlobalRuntimeModule.js

@@ -4,9 +4,9 @@
 
 "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");
 
 /** @typedef {import("../Compilation")} Compilation */
 
@@ -62,10 +62,8 @@ class GlobalRuntimeModule extends RuntimeModule {
 					"if (typeof window === 'object') return window;"
 				),
 				"}"
-				// It can still be `undefined`, but nothing to do about it...
-				// We return `undefined`, instead of nothing here, so it's
-				// easier to handle this case:
-				//   if (!global) { … }
+				// It can still be `undefined`, and nothing here can help that. Returning
+				// `undefined` rather than nothing keeps `if (!global)` working.
 			]),
 			"})();"
 		]);