webpack 5.36.2 → 5.38.1

package/lib/FlagDependencyExportsPlugin.js

@@ -225,7 +225,8 @@ class FlagDependencyExportsPlugin {
 												}
 
 												if (exports) {
-													const nestedExportsInfo = exportInfo.createNestedExportsInfo();
+													const nestedExportsInfo =
+														exportInfo.createNestedExportsInfo();
 													mergeExports(nestedExportsInfo, exports);
 												}
 
@@ -247,12 +248,12 @@ class FlagDependencyExportsPlugin {
 												const target = exportInfo.getTarget(moduleGraph);
 												let targetExportsInfo = undefined;
 												if (target) {
-													const targetModuleExportsInfo = moduleGraph.getExportsInfo(
-														target.module
-													);
-													targetExportsInfo = targetModuleExportsInfo.getNestedExportsInfo(
-														target.export
-													);
+													const targetModuleExportsInfo =
+														moduleGraph.getExportsInfo(target.module);
+													targetExportsInfo =
+														targetModuleExportsInfo.getNestedExportsInfo(
+															target.export
+														);
 													// add dependency for this module
 													const set = dependencies.get(target.module);
 													if (set === undefined) {

package/lib/FlagDependencyUsagePlugin.js

@@ -201,10 +201,8 @@ class FlagDependencyUsagePlugin {
 								if (oldReferencedExports === EXPORTS_OBJECT_REFERENCED) {
 									continue;
 								}
-								const referencedExports = compilation.getDependencyReferencedExports(
-									dep,
-									runtime
-								);
+								const referencedExports =
+									compilation.getDependencyReferencedExports(dep, runtime);
 								if (
 									oldReferencedExports === undefined ||
 									oldReferencedExports === NO_EXPORTS_REFERENCED ||

package/lib/HotModuleReplacementPlugin.js

@@ -31,7 +31,8 @@ const {
 	keyToRuntime,
 	forEachRuntime,
 	mergeRuntimeOwned,
-	subtractRuntime
+	subtractRuntime,
+	intersectRuntime
 } = require("./util/runtime");
 
 /** @typedef {import("./Chunk")} Chunk */
@@ -87,10 +88,8 @@ class HotModuleReplacementPlugin {
 		const runtimeRequirements = [RuntimeGlobals.module];
 
 		const createAcceptHandler = (parser, ParamDependency) => {
-			const {
-				hotAcceptCallback,
-				hotAcceptWithoutCallback
-			} = HotModuleReplacementPlugin.getParserHooks(parser);
+			const { hotAcceptCallback, hotAcceptWithoutCallback } =
+				HotModuleReplacementPlugin.getParserHooks(parser);
 
 			return expr => {
 				const module = parser.state.module;
@@ -306,9 +305,7 @@ class HotModuleReplacementPlugin {
 						}
 						records.chunkModuleIds = {};
 						for (const chunk of compilation.chunks) {
-							records.chunkModuleIds[
-								chunk.id
-							] = Array.from(
+							records.chunkModuleIds[chunk.id] = Array.from(
 								chunkGraph.getOrderedChunkModulesIterable(
 									chunk,
 									compareModulesById(chunkGraph)
@@ -341,9 +338,8 @@ class HotModuleReplacementPlugin {
 								return chunkGraph.getModuleHash(module, chunk.runtime);
 							}
 						};
-						const fullHashModulesInThisChunk = chunkGraph.getChunkFullHashModulesSet(
-							chunk
-						);
+						const fullHashModulesInThisChunk =
+							chunkGraph.getChunkFullHashModulesSet(chunk);
 						if (fullHashModulesInThisChunk !== undefined) {
 							for (const module of fullHashModulesInThisChunk) {
 								fullHashModules.add(module, chunk);
@@ -451,16 +447,14 @@ class HotModuleReplacementPlugin {
 							allOldRuntime = mergeRuntimeOwned(allOldRuntime, runtime);
 						}
 						forEachRuntime(allOldRuntime, runtime => {
-							const {
-								path: filename,
-								info: assetInfo
-							} = compilation.getPathWithInfo(
-								compilation.outputOptions.hotUpdateMainFilename,
-								{
-									hash: records.hash,
-									runtime
-								}
-							);
+							const { path: filename, info: assetInfo } =
+								compilation.getPathWithInfo(
+									compilation.outputOptions.hotUpdateMainFilename,
+									{
+										hash: records.hash,
+										runtime
+									}
+								);
 							hotUpdateMainContentByRuntime.set(runtime, {
 								updatedChunkIds: new Set(),
 								removedChunkIds: new Set(),
@@ -509,16 +503,19 @@ class HotModuleReplacementPlugin {
 							);
 							if (currentChunk) {
 								chunkId = currentChunk.id;
-								newRuntime = currentChunk.runtime;
+								newRuntime = intersectRuntime(
+									currentChunk.runtime,
+									allOldRuntime
+								);
+								if (newRuntime === undefined) continue;
 								newModules = chunkGraph
 									.getChunkModules(currentChunk)
 									.filter(module => updatedModules.has(module, currentChunk));
 								newRuntimeModules = Array.from(
 									chunkGraph.getChunkRuntimeModulesIterable(currentChunk)
 								).filter(module => updatedModules.has(module, currentChunk));
-								const fullHashModules = chunkGraph.getChunkFullHashModulesIterable(
-									currentChunk
-								);
+								const fullHashModules =
+									chunkGraph.getChunkFullHashModulesIterable(currentChunk);
 								newFullHashModules =
 									fullHashModules &&
 									Array.from(fullHashModules).filter(module =>
@@ -631,13 +628,11 @@ class HotModuleReplacementPlugin {
 										filename = entry.filename;
 										assetInfo = entry.info;
 									} else {
-										({
-											path: filename,
-											info: assetInfo
-										} = compilation.getPathWithInfo(
-											entry.filenameTemplate,
-											entry.pathOptions
-										));
+										({ path: filename, info: assetInfo } =
+											compilation.getPathWithInfo(
+												entry.filenameTemplate,
+												entry.pathOptions
+											));
 									}
 									const source = entry.render();
 									compilation.additionalChunkAssets.push(filename);

package/lib/JavascriptMetaInfoPlugin.js

@@ -34,7 +34,8 @@ class JavascriptMetaInfoPlugin {
 						let topLevelDeclarations =
 							parser.state.module.buildInfo.topLevelDeclarations;
 						if (topLevelDeclarations === undefined) {
-							topLevelDeclarations = parser.state.module.buildInfo.topLevelDeclarations = new Set();
+							topLevelDeclarations =
+								parser.state.module.buildInfo.topLevelDeclarations = new Set();
 						}
 						for (const name of parser.scope.definitions.asSet()) {
 							const freeInfo = parser.getFreeInfoFromVariable(name);

package/lib/MainTemplate.js

@@ -239,9 +239,8 @@ class MainTemplate {
 				"chunkIdExpression"
 			]),
 			get jsonpScript() {
-				const hooks = getLoadScriptRuntimeModule().getCompilationHooks(
-					compilation
-				);
+				const hooks =
+					getLoadScriptRuntimeModule().getCompilationHooks(compilation);
 				return hooks.createScript;
 			},
 			get linkPrefetch() {

package/lib/ModuleFilenameHelpers.js

@@ -12,14 +12,16 @@ const ModuleFilenameHelpers = exports;
 
 // TODO webpack 6: consider removing these
 ModuleFilenameHelpers.ALL_LOADERS_RESOURCE = "[all-loaders][resource]";
-ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE = /\[all-?loaders\]\[resource\]/gi;
+ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE =
+	/\[all-?loaders\]\[resource\]/gi;
 ModuleFilenameHelpers.LOADERS_RESOURCE = "[loaders][resource]";
 ModuleFilenameHelpers.REGEXP_LOADERS_RESOURCE = /\[loaders\]\[resource\]/gi;
 ModuleFilenameHelpers.RESOURCE = "[resource]";
 ModuleFilenameHelpers.REGEXP_RESOURCE = /\[resource\]/gi;
 ModuleFilenameHelpers.ABSOLUTE_RESOURCE_PATH = "[absolute-resource-path]";
 // cSpell:words olute
-ModuleFilenameHelpers.REGEXP_ABSOLUTE_RESOURCE_PATH = /\[abs(olute)?-?resource-?path\]/gi;
+ModuleFilenameHelpers.REGEXP_ABSOLUTE_RESOURCE_PATH =
+	/\[abs(olute)?-?resource-?path\]/gi;
 ModuleFilenameHelpers.RESOURCE_PATH = "[resource-path]";
 ModuleFilenameHelpers.REGEXP_RESOURCE_PATH = /\[resource-?path\]/gi;
 ModuleFilenameHelpers.ALL_LOADERS = "[all-loaders]";

package/lib/ModuleGraphConnection.js

@@ -183,5 +183,9 @@ class ModuleGraphConnection {
 
 module.exports = ModuleGraphConnection;
 module.exports.addConnectionStates = addConnectionStates;
-module.exports.TRANSITIVE_ONLY = /** @type {typeof TRANSITIVE_ONLY} */ (TRANSITIVE_ONLY);
-module.exports.CIRCULAR_CONNECTION = /** @type {typeof CIRCULAR_CONNECTION} */ (CIRCULAR_CONNECTION);
+module.exports.TRANSITIVE_ONLY = /** @type {typeof TRANSITIVE_ONLY} */ (
+	TRANSITIVE_ONLY
+);
+module.exports.CIRCULAR_CONNECTION = /** @type {typeof CIRCULAR_CONNECTION} */ (
+	CIRCULAR_CONNECTION
+);

package/lib/ModuleInfoHeaderPlugin.js

@@ -222,9 +222,8 @@ class ModuleInfoHeaderPlugin {
 								)}`
 							) + "\n"
 						);
-						const optimizationBailout = moduleGraph.getOptimizationBailout(
-							module
-						);
+						const optimizationBailout =
+							moduleGraph.getOptimizationBailout(module);
 						if (optimizationBailout) {
 							for (const text of optimizationBailout) {
 								let code;

package/lib/MultiCompiler.js

@@ -318,16 +318,17 @@ module.exports = class MultiCompiler {
 	 * @returns {SetupResult[]} result of setup
 	 */
 	_runGraph(setup, run, callback) {
-		/** @typedef {{ compiler: Compiler, result: Stats, state: "pending" | "blocked" | "queued" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
+		/** @typedef {{ compiler: Compiler, result: Stats, state: "pending" | "blocked" | "queued" | "starting" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
 
 		// State transitions for nodes:
 		// -> blocked (initial)
-		// blocked -> queued [add to queue] (when all parents done)
-		// queued -> running [running++] (when processing the queue)
+		// blocked -> starting [running++] (when all parents done)
+		// queued -> starting [running++] (when processing the queue)
+		// starting -> running (when run has been called)
 		// running -> done [running--] (when compilation is done)
 		// done -> pending (when invalidated from file change)
-		// pending -> blocked (when invalidated from aggregated changes)
-		// done -> blocked (when invalidated, from parent invalidation)
+		// pending -> blocked [add to queue] (when invalidated from aggregated changes)
+		// done -> blocked [add to queue] (when invalidated, from parent invalidation)
 		// running -> running-outdated (when invalidated, either from change or parent invalidation)
 		// running-outdated -> blocked [running--] (when compilation is done)
 
@@ -351,6 +352,7 @@ module.exports = class MultiCompiler {
 				parent.children.push(node);
 			}
 		}
+		/** @type {ArrayQueue<Node>} */
 		const queue = new ArrayQueue();
 		for (const node of nodes) {
 			if (node.parents.length === 0) {
@@ -388,13 +390,13 @@ module.exports = class MultiCompiler {
 			if (node.state === "running") {
 				node.state = "done";
 				for (const child of node.children) {
-					checkUnblocked(child);
+					if (child.state === "blocked") queue.enqueue(child);
 				}
 			} else if (node.state === "running-outdated") {
 				node.state = "blocked";
-				checkUnblocked(node);
+				queue.enqueue(node);
 			}
-			process.nextTick(processQueue);
+			processQueue();
 		};
 		/**
 		 * @param {Node} node node
@@ -433,20 +435,9 @@ module.exports = class MultiCompiler {
 			if (node.state === "pending") {
 				node.state = "blocked";
 			}
-			checkUnblocked(node);
-			processQueue();
-		};
-		/**
-		 * @param {Node} node node
-		 * @returns {void}
-		 */
-		const checkUnblocked = node => {
-			if (
-				node.state === "blocked" &&
-				node.parents.every(p => p.state === "done")
-			) {
-				node.state = "queued";
+			if (node.state === "blocked") {
 				queue.enqueue(node);
+				processQueue();
 			}
 		};
 
@@ -457,20 +448,33 @@ module.exports = class MultiCompiler {
 					node.compiler,
 					i,
 					nodeDone.bind(null, node),
-					() => node.state !== "done" && node.state !== "running",
+					() => node.state !== "starting" && node.state !== "running",
 					() => nodeChange(node),
 					() => nodeInvalid(node)
 				)
 			);
 		});
+		let processing = true;
 		const processQueue = () => {
+			if (processing) return;
+			processing = true;
+			process.nextTick(processQueueWorker);
+		};
+		const processQueueWorker = () => {
 			while (running < parallelism && queue.length > 0 && !errored) {
 				const node = queue.dequeue();
-				if (node.state !== "queued") continue;
-				running++;
-				node.state = "running";
-				run(node.compiler, nodeDone.bind(null, node));
+				if (
+					node.state === "queued" ||
+					(node.state === "blocked" &&
+						node.parents.every(p => p.state === "done"))
+				) {
+					running++;
+					node.state = "starting";
+					run(node.compiler, nodeDone.bind(null, node));
+					node.state = "running";
+				}
 			}
+			processing = false;
 			if (
 				!errored &&
 				running === 0 &&
@@ -489,7 +493,7 @@ module.exports = class MultiCompiler {
 				}
 			}
 		};
-		processQueue();
+		processQueueWorker();
 		return setupResults;
 	}
 

package/lib/NormalModule.js

@@ -41,10 +41,12 @@ const { contextify, absolutify } = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
 
-/** @typedef {import("source-map").RawSourceMap} SourceMap */
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../declarations/LoaderContext").NormalModuleLoaderContext} NormalModuleLoaderContext */
+/** @typedef {import("../declarations/WebpackOptions").Mode} Mode */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
+/** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Generator")} Generator */
@@ -60,10 +62,22 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("./logging/Logger").Logger} WebpackLogger */
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
+/**
+ * @typedef {Object} SourceMap
+ * @property {number} version
+ * @property {string[]} sources
+ * @property {string} mappings
+ * @property {string=} file
+ * @property {string=} sourceRoot
+ * @property {string[]=} sourcesContent
+ * @property {string[]=} names
+ */
+
 const getInvalidDependenciesModuleWarning = memoize(() =>
 	require("./InvalidDependenciesModuleWarning")
 );
@@ -205,6 +219,7 @@ class NormalModule extends Module {
 	 * @param {string} options.rawRequest request without resolving
 	 * @param {LoaderItem[]} options.loaders list of loaders
 	 * @param {string} options.resource path + query of the real resource
+	 * @param {Record<string, any>=} options.resourceResolveData resource resolve data
 	 * @param {string | undefined} options.matchResource path + query of the matched resource (virtual)
 	 * @param {Parser} options.parser the parser used
 	 * @param {object} options.parserOptions the options of the parser used
@@ -220,6 +235,7 @@ class NormalModule extends Module {
 		rawRequest,
 		loaders,
 		resource,
+		resourceResolveData,
 		matchResource,
 		parser,
 		parserOptions,
@@ -246,6 +262,7 @@ class NormalModule extends Module {
 		this.generatorOptions = generatorOptions;
 		/** @type {string} */
 		this.resource = resource;
+		this.resourceResolveData = resourceResolveData;
 		/** @type {string | undefined} */
 		this.matchResource = matchResource;
 		/** @type {LoaderItem[]} */
@@ -262,6 +279,8 @@ class NormalModule extends Module {
 		this._source = null;
 		/** @private @type {Map<string, number> | undefined} **/
 		this._sourceSizes = undefined;
+		/** @private @type {Set<string>} */
+		this._sourceTypes = undefined;
 
 		// Cache
 		this._lastSuccessfulBuildMeta = {};
@@ -333,12 +352,19 @@ class NormalModule extends Module {
 		this.resource = m.resource;
 		this.matchResource = m.matchResource;
 		this.loaders = m.loaders;
+		this._sourceTypes = m._sourceTypes;
+		this._sourceSizes = m._sourceSizes;
 	}
 
 	/**
 	 * Assuming this module is in the cache. Remove internal references to allow freeing some memory.
 	 */
 	cleanupForCache() {
+		// Make sure to cache types and sizes before cleanup
+		if (this._sourceTypes === undefined) this.getSourceTypes();
+		for (const type of this._sourceTypes) {
+			this.size(type);
+		}
 		super.cleanupForCache();
 		this.parser = undefined;
 		this.parserOptions = undefined;
@@ -376,6 +402,7 @@ class NormalModule extends Module {
 			this.type,
 			this.generatorOptions
 		);
+		// we assume the generator behaves identically and keep cached sourceTypes/Sizes
 	}
 
 	/**
@@ -421,7 +448,7 @@ class NormalModule extends Module {
 	 * @param {WebpackOptions} options webpack options
 	 * @param {Compilation} compilation the compilation
 	 * @param {InputFileSystem} fs file system from reading
-	 * @returns {any} loader context
+	 * @returns {NormalModuleLoaderContext} loader context
 	 */
 	createLoaderContext(resolver, options, compilation, fs) {
 		const { requestShortener } = compilation.runtimeTemplate;
@@ -751,7 +778,11 @@ class NormalModule extends Module {
 			},
 			(err, result) => {
 				// Cleanup loaderContext to avoid leaking memory in ICs
-				loaderContext._compilation = loaderContext._compiler = loaderContext._module = loaderContext.fs = undefined;
+				loaderContext._compilation =
+					loaderContext._compiler =
+					loaderContext._module =
+					loaderContext.fs =
+						undefined;
 
 				if (!result) {
 					return processResult(
@@ -855,6 +886,7 @@ class NormalModule extends Module {
 		this._forceBuild = false;
 		this._source = null;
 		if (this._sourceSizes !== undefined) this._sourceSizes.clear();
+		this._sourceTypes = undefined;
 		this._ast = null;
 		this.error = null;
 		this.clearWarningsAndErrors();
@@ -873,7 +905,7 @@ class NormalModule extends Module {
 			assetsInfo: undefined
 		};
 
-		const startTime = Date.now();
+		const startTime = compilation.compiler.fsStartTime || Date.now();
 
 		return this.doBuild(options, compilation, resolver, fs, err => {
 			// if we have an error mark module as failed and exit
@@ -944,7 +976,8 @@ class NormalModule extends Module {
 				checkDependencies(this.buildInfo.missingDependencies);
 				checkDependencies(this.buildInfo.contextDependencies);
 				if (nonAbsoluteDependencies !== undefined) {
-					const InvalidDependenciesModuleWarning = getInvalidDependenciesModuleWarning();
+					const InvalidDependenciesModuleWarning =
+						getInvalidDependenciesModuleWarning();
 					this.addWarning(
 						new InvalidDependenciesModuleWarning(this, nonAbsoluteDependencies)
 					);
@@ -1056,7 +1089,10 @@ class NormalModule extends Module {
 	 * @returns {Set<string>} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return this.generator.getTypes(this);
+		if (this._sourceTypes === undefined) {
+			this._sourceTypes = this.generator.getTypes(this);
+		}
+		return this._sourceTypes;
 	}
 
 	/**
@@ -1245,7 +1281,6 @@ class NormalModule extends Module {
 		const { write } = context;
 		// deserialize
 		write(this._source);
-		write(this._sourceSizes);
 		write(this.error);
 		write(this._lastSuccessfulBuildMeta);
 		write(this._forceBuild);
@@ -1277,7 +1312,6 @@ class NormalModule extends Module {
 	deserialize(context) {
 		const { read } = context;
 		this._source = read();
-		this._sourceSizes = read();
 		this.error = read();
 		this._lastSuccessfulBuildMeta = read();
 		this._forceBuild = read();

package/lib/NormalModuleFactory.js

@@ -168,6 +168,7 @@ const unsafeCacheData = new WeakMap();
 
 const ruleSetCompiler = new RuleSetCompiler([
 	new BasicMatcherRulePlugin("test", "resource"),
+	new BasicMatcherRulePlugin("scheme"),
 	new BasicMatcherRulePlugin("mimetype"),
 	new BasicMatcherRulePlugin("dependency"),
 	new BasicMatcherRulePlugin("include", "resource"),
@@ -443,6 +444,7 @@ class NormalModuleFactory extends ModuleFactory {
 						realResource: resourceData.path,
 						resourceQuery: resourceDataForRules.query,
 						resourceFragment: resourceDataForRules.fragment,
+						scheme,
 						mimetype: matchResourceData ? "" : resourceData.data.mimetype || "",
 						dependency: dependencyType,
 						descriptionData: matchResourceData

package/lib/RecordIdsPlugin.js

@@ -48,10 +48,11 @@ class RecordIdsPlugin {
 	apply(compiler) {
 		const portableIds = this.options.portableIds;
 
-		const makePathsRelative = identifierUtils.makePathsRelative.bindContextCache(
-			compiler.context,
-			compiler.root
-		);
+		const makePathsRelative =
+			identifierUtils.makePathsRelative.bindContextCache(
+				compiler.context,
+				compiler.root
+			);
 
 		/**
 		 * @param {Module} module the module

package/lib/ResolverFactory.js

@@ -42,9 +42,9 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 		...remaining,
 		plugins:
 			plugins &&
-			/** @type {ResolvePluginInstance[]} */ (plugins.filter(
-				item => item !== "..."
-			))
+			/** @type {ResolvePluginInstance[]} */ (
+				plugins.filter(item => item !== "...")
+			)
 	};
 
 	if (!partialOptions.fileSystem) {
@@ -53,7 +53,10 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 		);
 	}
 	// These weird types validate that we checked all non-optional properties
-	const options = /** @type {Partial<ResolveOptions> & Pick<ResolveOptions, "fileSystem">} */ (partialOptions);
+	const options =
+		/** @type {Partial<ResolveOptions> & Pick<ResolveOptions, "fileSystem">} */ (
+			partialOptions
+		);
 
 	return removeOperations(
 		resolveByProperty(options, "byDependency", dependencyType)
@@ -124,9 +127,9 @@ module.exports = class ResolverFactory {
 		const resolveOptions = convertToResolveOptions(
 			this.hooks.resolveOptions.for(type).call(resolveOptionsWithDepType)
 		);
-		const resolver = /** @type {ResolverWithOptions} */ (Factory.createResolver(
-			resolveOptions
-		));
+		const resolver = /** @type {ResolverWithOptions} */ (
+			Factory.createResolver(resolveOptions)
+		);
 		if (!resolver) {
 			throw new Error("No resolver created");
 		}

package/lib/RuntimeGlobals.js

@@ -168,6 +168,13 @@ exports.scriptNonce = "__webpack_require__.nc";
  */
 exports.loadScript = "__webpack_require__.l";
 
+/**
+ * function to promote a string to a TrustedScriptURL using webpack's Trusted
+ * Types policy
+ * Arguments: (url: string) => TrustedScriptURL
+ */
+exports.createScriptUrl = "__webpack_require__.tu";
+
 /**
  * the chunk name of the chunk with the runtime
  */

package/lib/RuntimePlugin.js

@@ -13,6 +13,7 @@ const AutoPublicPathRuntimeModule = require("./runtime/AutoPublicPathRuntimeModu
 const CompatGetDefaultExportRuntimeModule = require("./runtime/CompatGetDefaultExportRuntimeModule");
 const CompatRuntimeModule = require("./runtime/CompatRuntimeModule");
 const CreateFakeNamespaceObjectRuntimeModule = require("./runtime/CreateFakeNamespaceObjectRuntimeModule");
+const CreateScriptUrlRuntimeModule = require("./runtime/CreateScriptUrlRuntimeModule");
 const DefinePropertyGettersRuntimeModule = require("./runtime/DefinePropertyGettersRuntimeModule");
 const EnsureChunkRuntimeModule = require("./runtime/EnsureChunkRuntimeModule");
 const GetChunkFilenameRuntimeModule = require("./runtime/GetChunkFilenameRuntimeModule");
@@ -38,6 +39,7 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.runtimeId,
 	RuntimeGlobals.compatGetDefaultExport,
 	RuntimeGlobals.createFakeNamespaceObject,
+	RuntimeGlobals.createScriptUrl,
 	RuntimeGlobals.definePropertyGetters,
 	RuntimeGlobals.ensureChunk,
 	RuntimeGlobals.entryModuleId,
@@ -319,7 +321,23 @@ class RuntimePlugin {
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.loadScript)
 				.tap("RuntimePlugin", (chunk, set) => {
-					compilation.addRuntimeModule(chunk, new LoadScriptRuntimeModule());
+					const withCreateScriptUrl = !!compilation.outputOptions.trustedTypes;
+					if (withCreateScriptUrl) {
+						set.add(RuntimeGlobals.createScriptUrl);
+					}
+					compilation.addRuntimeModule(
+						chunk,
+						new LoadScriptRuntimeModule(withCreateScriptUrl)
+					);
+					return true;
+				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.createScriptUrl)
+				.tap("RuntimePlugin", (chunk, set) => {
+					compilation.addRuntimeModule(
+						chunk,
+						new CreateScriptUrlRuntimeModule()
+					);
 					return true;
 				});
 			compilation.hooks.runtimeRequirementInTree