webpack 5.65.0 → 5.69.0

package/lib/index.js

@@ -11,6 +11,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").Entry} Entry */
 /** @typedef {import("../declarations/WebpackOptions").EntryNormalized} EntryNormalized */
 /** @typedef {import("../declarations/WebpackOptions").EntryObject} EntryObject */
+/** @typedef {import("../declarations/WebpackOptions").FileCacheOptions} FileCacheOptions */
 /** @typedef {import("../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../declarations/WebpackOptions").ModuleOptions} ModuleOptions */
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
@@ -26,11 +27,15 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginInstance} WebpackPluginInstance */
 /** @typedef {import("./Compilation").Asset} Asset */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
+/** @typedef {import("./Compilation").EntryOptions} EntryOptions */
+/** @typedef {import("./Compiler").AssetEmittedInfo} AssetEmittedInfo */
 /** @typedef {import("./MultiStats")} MultiStats */
 /** @typedef {import("./Parser").ParserState} ParserState */
 /** @typedef {import("./ResolverFactory").ResolvePluginInstance} ResolvePluginInstance */
 /** @typedef {import("./ResolverFactory").Resolver} Resolver */
 /** @typedef {import("./Watching")} Watching */
+/** @typedef {import("./cli").Argument} Argument */
+/** @typedef {import("./cli").Problem} Problem */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsAsset} StatsAsset */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsChunk} StatsChunk */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsChunkGroup} StatsChunkGroup */
@@ -564,6 +569,11 @@ module.exports = mergeExports(fn, {
 			get HttpUriPlugin() {
 				return require("./schemes/HttpUriPlugin");
 			}
+		},
+		ids: {
+			get SyncModuleIdsPlugin() {
+				return require("./ids/SyncModuleIdsPlugin");
+			}
 		}
 	}
 });

package/lib/javascript/JavascriptGenerator.js

@@ -199,6 +199,7 @@ class JavascriptGenerator extends Generator {
 			runtime: generateContext.runtime,
 			runtimeRequirements: generateContext.runtimeRequirements,
 			concatenationScope: generateContext.concatenationScope,
+			codeGenerationResults: generateContext.codeGenerationResults,
 			initFragments
 		};
 

package/lib/javascript/JavascriptModulesPlugin.js

@@ -24,6 +24,7 @@ const { last, someInIterable } = require("../util/IterableHelpers");
 const StringXor = require("../util/StringXor");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const createHash = require("../util/createHash");
+const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 const { intersectRuntime } = require("../util/runtime");
 const JavascriptGenerator = require("./JavascriptGenerator");
 const JavascriptParser = require("./JavascriptParser");
@@ -102,6 +103,7 @@ const printGeneratedCodeForStack = (module, code) => {
 /**
  * @typedef {Object} RenderBootstrapContext
  * @property {Chunk} chunk the chunk
+ * @property {CodeGenerationResults} codeGenerationResults results of code generation
  * @property {RuntimeTemplate} runtimeTemplate the runtime template
  * @property {ModuleGraph} moduleGraph the module graph
  * @property {ChunkGraph} chunkGraph the chunk graph
@@ -331,6 +333,7 @@ class JavascriptModulesPlugin {
 								{
 									hash: "0000",
 									chunk,
+									codeGenerationResults: context.codeGenerationResults,
 									chunkGraph: context.chunkGraph,
 									moduleGraph: context.moduleGraph,
 									runtimeTemplate: context.runtimeTemplate
@@ -343,6 +346,7 @@ class JavascriptModulesPlugin {
 				compilation.hooks.contentHash.tap("JavascriptModulesPlugin", chunk => {
 					const {
 						chunkGraph,
+						codeGenerationResults,
 						moduleGraph,
 						runtimeTemplate,
 						outputOptions: {
@@ -360,6 +364,7 @@ class JavascriptModulesPlugin {
 							{
 								hash: "0000",
 								chunk,
+								codeGenerationResults,
 								chunkGraph: compilation.chunkGraph,
 								moduleGraph: compilation.moduleGraph,
 								runtimeTemplate: compilation.runtimeTemplate
@@ -372,6 +377,7 @@ class JavascriptModulesPlugin {
 					}
 					hooks.chunkHash.call(chunk, hash, {
 						chunkGraph,
+						codeGenerationResults,
 						moduleGraph,
 						runtimeTemplate
 					});
@@ -398,7 +404,10 @@ class JavascriptModulesPlugin {
 						xor.updateHash(hash);
 					}
 					const digest = /** @type {string} */ (hash.digest(hashDigest));
-					chunk.contentHash.javascript = digest.substr(0, hashDigestLength);
+					chunk.contentHash.javascript = nonNumericOnlyHash(
+						digest,
+						hashDigestLength
+					);
 				});
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
 					"JavascriptModulesPlugin",
@@ -974,7 +983,13 @@ class JavascriptModulesPlugin {
 	 * @returns {{ header: string[], beforeStartup: string[], startup: string[], afterStartup: string[], allowInlineStartup: boolean }} the generated source of the bootstrap code
 	 */
 	renderBootstrap(renderContext, hooks) {
-		const { chunkGraph, moduleGraph, chunk, runtimeTemplate } = renderContext;
+		const {
+			chunkGraph,
+			codeGenerationResults,
+			moduleGraph,
+			chunk,
+			runtimeTemplate
+		} = renderContext;
 
 		const runtimeRequirements = chunkGraph.getTreeRuntimeRequirements(chunk);
 
@@ -1098,8 +1113,18 @@ class JavascriptModulesPlugin {
 						);
 						result.allowInlineStartup = false;
 					}
+
+					let data;
+					if (codeGenerationResults.has(entryModule, chunk.runtime)) {
+						const result = codeGenerationResults.get(
+							entryModule,
+							chunk.runtime
+						);
+						data = result.data;
+					}
 					if (
 						result.allowInlineStartup &&
+						(!data || !data.get("topLevelDeclarations")) &&
 						(!entryModule.buildInfo ||
 							!entryModule.buildInfo.topLevelDeclarations)
 					) {

package/lib/javascript/StartupHelpers.js

@@ -9,12 +9,12 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const { isSubset } = require("../util/SetHelpers");
 const { getAllChunks } = require("./ChunkHelpers");
-const { chunkHasJs } = require("./JavascriptModulesPlugin");
 
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../ChunkGraph").EntryModuleWithChunkGroup} EntryModuleWithChunkGroup */
 /** @typedef {import("../ChunkGroup")} ChunkGroup */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {(string|number)[]} EntryItem */
@@ -24,7 +24,7 @@ const EXPORT_PREFIX = "var __webpack_exports__ = ";
 /**
  * @param {ChunkGraph} chunkGraph chunkGraph
  * @param {RuntimeTemplate} runtimeTemplate runtimeTemplate
- * @param {import("../ChunkGraph").EntryModuleWithChunkGroup[]} entries entries
+ * @param {EntryModuleWithChunkGroup[]} entries entries
  * @param {Chunk} chunk chunk
  * @param {boolean} passive true: passive startup with on chunks loaded
  * @returns {string} runtime code
@@ -102,7 +102,7 @@ exports.generateEntryStartup = (
 /**
  * @param {Hash} hash the hash to update
  * @param {ChunkGraph} chunkGraph chunkGraph
- * @param {import("../ChunkGraph").EntryModuleWithChunkGroup[]} entries entries
+ * @param {EntryModuleWithChunkGroup[]} entries entries
  * @param {Chunk} chunk chunk
  * @returns {void}
  */
@@ -119,12 +119,13 @@ exports.updateHashForEntryStartup = (hash, chunkGraph, entries, chunk) => {
 /**
  * @param {Chunk} chunk the chunk
  * @param {ChunkGraph} chunkGraph the chunk graph
+ * @param {function(Chunk, ChunkGraph): boolean} filterFn filter function
  * @returns {Set<number | string>} initially fulfilled chunk ids
  */
-exports.getInitialChunkIds = (chunk, chunkGraph) => {
+exports.getInitialChunkIds = (chunk, chunkGraph, filterFn) => {
 	const initialChunkIds = new Set(chunk.ids);
 	for (const c of chunk.getAllInitialChunks()) {
-		if (c === chunk || chunkHasJs(c, chunkGraph)) continue;
+		if (c === chunk || filterFn(c, chunkGraph)) continue;
 		for (const id of c.ids) initialChunkIds.add(id);
 	}
 	return initialChunkIds;

package/lib/library/AssignLibraryPlugin.js

@@ -92,7 +92,7 @@ const accessWithInit = (accessor, existingLength, initLast = false) => {
  * @property {LibraryType} type
  * @property {string[] | "global"} prefix name prefix
  * @property {string | false} declare declare name as variable
- * @property {"error"|"copy"|"assign"} unnamed behavior for unnamed library name
+ * @property {"error"|"static"|"copy"|"assign"} unnamed behavior for unnamed library name
  * @property {"copy"|"assign"=} named behavior for named library name
  */
 
@@ -222,9 +222,15 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	 * @param {LibraryContext<T>} libraryContext context
 	 * @returns {string | undefined} bailout reason
 	 */
-	embedInRuntimeBailout(module, { chunk }, { options, compilation }) {
+	embedInRuntimeBailout(
+		module,
+		{ chunk, codeGenerationResults },
+		{ options, compilation }
+	) {
+		const { data } = codeGenerationResults.get(module, chunk.runtime);
 		const topLevelDeclarations =
-			module.buildInfo && module.buildInfo.topLevelDeclarations;
+			(data && data.get("topLevelDeclarations")) ||
+			(module.buildInfo && module.buildInfo.topLevelDeclarations);
 		if (!topLevelDeclarations)
 			return "it doesn't tell about top level declarations.";
 		const fullNameResolved = this._getResolvedFullName(
@@ -261,19 +267,42 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	 * @param {LibraryContext<T>} libraryContext context
 	 * @returns {Source} source with library export
 	 */
-	renderStartup(source, module, { chunk }, { options, compilation }) {
+	renderStartup(
+		source,
+		module,
+		{ moduleGraph, chunk },
+		{ options, compilation }
+	) {
 		const fullNameResolved = this._getResolvedFullName(
 			options,
 			chunk,
 			compilation
 		);
+		const staticExports = this.unnamed === "static";
 		const exportAccess = options.export
 			? propertyAccess(
 					Array.isArray(options.export) ? options.export : [options.export]
 			  )
 			: "";
 		const result = new ConcatSource(source);
-		if (options.name ? this.named === "copy" : this.unnamed === "copy") {
+		if (staticExports) {
+			const exportsInfo = moduleGraph.getExportsInfo(module);
+			const exportTarget = accessWithInit(
+				fullNameResolved,
+				this._getPrefix(compilation).length,
+				true
+			);
+			for (const exportInfo of exportsInfo.orderedExports) {
+				if (!exportInfo.provided) continue;
+				const nameAccess = propertyAccess([exportInfo.name]);
+				result.add(
+					`${exportTarget}${nameAccess} = __webpack_exports__${exportAccess}${nameAccess};\n`
+				);
+			}
+			result.add(
+				`Object.defineProperty(${exportTarget}, "__esModule", { value: true });\n`
+			);
+		} else if (options.name ? this.named === "copy" : this.unnamed === "copy") {
 			result.add(
 				`var __webpack_export_target__ = ${accessWithInit(
 					fullNameResolved,

package/lib/library/EnableLibraryPlugin.js

@@ -167,6 +167,17 @@ class EnableLibraryPlugin {
 					}).apply(compiler);
 					break;
 				}
+				case "commonjs-static": {
+					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+					new AssignLibraryPlugin({
+						type,
+						prefix: ["exports"],
+						declare: false,
+						unnamed: "static"
+					}).apply(compiler);
+					break;
+				}
 				case "commonjs2":
 				case "commonjs-module": {
 					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697

package/lib/node/NodeTargetPlugin.js

@@ -54,6 +54,7 @@ const builtins = [
 	"tty",
 	"url",
 	"util",
+	"util/types",
 	"v8",
 	"vm",
 	"wasi",

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -46,7 +46,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const conditionMap = chunkGraph.getChunkConditionMap(chunk, chunkHasJs);
 		const hasJsMatcher = compileBooleanMatcher(conditionMap);
-		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph);
+		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph, chunkHasJs);
 
 		const outputName = this.compilation.getPath(
 			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -46,7 +46,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const conditionMap = chunkGraph.getChunkConditionMap(chunk, chunkHasJs);
 		const hasJsMatcher = compileBooleanMatcher(conditionMap);
-		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph);
+		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph, chunkHasJs);
 
 		const outputName = this.compilation.getPath(
 			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),

package/lib/optimize/ConcatenatedModule.js

@@ -39,6 +39,7 @@ const {
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
@@ -821,10 +822,6 @@ class ConcatenatedModule extends Module {
 				const topLevelDeclarations = this.buildInfo.topLevelDeclarations;
 				if (topLevelDeclarations !== undefined) {
 					for (const decl of m.buildInfo.topLevelDeclarations) {
-						// reserved names will always be renamed
-						if (RESERVED_NAMES.has(decl)) continue;
-						// TODO actually this is incorrect since with renaming there could be more
-						// We should do the renaming during build
 						topLevelDeclarations.add(decl);
 					}
 				}
@@ -1077,7 +1074,8 @@ class ConcatenatedModule extends Module {
 		runtimeTemplate,
 		moduleGraph,
 		chunkGraph,
-		runtime: generationRuntime
+		runtime: generationRuntime,
+		codeGenerationResults
 	}) {
 		/** @type {Set<string>} */
 		const runtimeRequirements = new Set();
@@ -1104,12 +1102,15 @@ class ConcatenatedModule extends Module {
 				runtimeTemplate,
 				moduleGraph,
 				chunkGraph,
-				runtime
+				runtime,
+				codeGenerationResults
 			);
 		}
 
 		// List of all used names to avoid conflicts
 		const allUsedNames = new Set(RESERVED_NAMES);
+		// Updated Top level declarations are created by renaming
+		const topLevelDeclarations = new Set();
 
 		// List of additional names in scope for module references
 		/** @type {Map<string, { usedNames: Set<string>, alreadyCheckedScopes: Set<TODO> }>} */
@@ -1254,6 +1255,7 @@ class ConcatenatedModule extends Module {
 							);
 							allUsedNames.add(newName);
 							info.internalNames.set(name, newName);
+							topLevelDeclarations.add(newName);
 							const source = info.source;
 							const allIdentifiers = new Set(
 								references.map(r => r.identifier).concat(variable.identifiers)
@@ -1280,6 +1282,7 @@ class ConcatenatedModule extends Module {
 						} else {
 							allUsedNames.add(name);
 							info.internalNames.set(name, name);
+							topLevelDeclarations.add(name);
 						}
 					}
 					let namespaceObjectName;
@@ -1297,6 +1300,7 @@ class ConcatenatedModule extends Module {
 						allUsedNames.add(namespaceObjectName);
 					}
 					info.namespaceObjectName = namespaceObjectName;
+					topLevelDeclarations.add(namespaceObjectName);
 					break;
 				}
 				case "external": {
@@ -1308,6 +1312,7 @@ class ConcatenatedModule extends Module {
 					);
 					allUsedNames.add(externalName);
 					info.name = externalName;
+					topLevelDeclarations.add(externalName);
 					break;
 				}
 			}
@@ -1320,6 +1325,7 @@ class ConcatenatedModule extends Module {
 				);
 				allUsedNames.add(externalNameInterop);
 				info.interopNamespaceObjectName = externalNameInterop;
+				topLevelDeclarations.add(externalNameInterop);
 			}
 			if (
 				info.module.buildMeta.exportsType === "default" &&
@@ -1333,6 +1339,7 @@ class ConcatenatedModule extends Module {
 				);
 				allUsedNames.add(externalNameInterop);
 				info.interopNamespaceObject2Name = externalNameInterop;
+				topLevelDeclarations.add(externalNameInterop);
 			}
 			if (
 				info.module.buildMeta.exportsType === "dynamic" ||
@@ -1346,6 +1353,7 @@ class ConcatenatedModule extends Module {
 				);
 				allUsedNames.add(externalNameInterop);
 				info.interopDefaultAccessName = externalNameInterop;
+				topLevelDeclarations.add(externalNameInterop);
 			}
 		}
 
@@ -1615,6 +1623,7 @@ ${defineGetters}`
 		const data = new Map();
 		if (chunkInitFragments.length > 0)
 			data.set("chunkInitFragments", chunkInitFragments);
+		data.set("topLevelDeclarations", topLevelDeclarations);
 
 		/** @type {CodeGenerationResult} */
 		const resultEntry = {
@@ -1634,6 +1643,7 @@ ${defineGetters}`
 	 * @param {ModuleGraph} moduleGraph moduleGraph
 	 * @param {ChunkGraph} chunkGraph chunkGraph
 	 * @param {RuntimeSpec} runtime runtime
+	 * @param {CodeGenerationResults} codeGenerationResults codeGenerationResults
 	 */
 	_analyseModule(
 		modulesMap,
@@ -1642,7 +1652,8 @@ ${defineGetters}`
 		runtimeTemplate,
 		moduleGraph,
 		chunkGraph,
-		runtime
+		runtime,
+		codeGenerationResults
 	) {
 		if (info.type === "concatenated") {
 			const m = info.module;
@@ -1657,7 +1668,8 @@ ${defineGetters}`
 					moduleGraph,
 					chunkGraph,
 					runtime,
-					concatenationScope
+					concatenationScope,
+					codeGenerationResults
 				});
 				const source = codeGenResult.sources.get("javascript");
 				const data = codeGenResult.data;
@@ -1702,7 +1714,7 @@ ${defineGetters}`
 				info.globalScope = globalScope;
 				info.moduleScope = moduleScope;
 			} catch (err) {
-				err.message += `\nwhile analysing module ${m.identifier()} for concatenation`;
+				err.message += `\nwhile analyzing module ${m.identifier()} for concatenation`;
 				throw err;
 			}
 		}

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -22,6 +22,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 		return Template.asString([
 			'var webpackThen = typeof Symbol === "function" ? Symbol("webpack then") : "__webpack_then__";',
 			'var webpackExports = typeof Symbol === "function" ? Symbol("webpack exports") : "__webpack_exports__";',
+			'var webpackError = typeof Symbol === "function" ? Symbol("webpack error") : "__webpack_error__";',
 			`var completeQueue = ${runtimeTemplate.basicFunction("queue", [
 				"if(queue) {",
 				Template.indent([
@@ -56,9 +57,13 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 								"obj[webpackExports] = r;",
 								"completeQueue(queue);",
 								"queue = 0;"
+							])}, ${runtimeTemplate.basicFunction("e", [
+								"obj[webpackError] = e;",
+								"completeQueue(queue);",
+								"queue = 0;"
 							])});`,
-							`var obj = {};
-							obj[webpackThen] = ${runtimeTemplate.expressionFunction(
+							"var obj = {};",
+							`obj[webpackThen] = ${runtimeTemplate.expressionFunction(
 								"queueFunction(queue, fn), dep['catch'](reject)",
 								"fn, reject"
 							)};`,
@@ -67,13 +72,13 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 						"}"
 					]),
 					"}",
-					`var ret = {};
-					ret[webpackThen] = ${runtimeTemplate.expressionFunction(
+					"var ret = {};",
+					`ret[webpackThen] = ${runtimeTemplate.expressionFunction(
 						"completeFunction(fn)",
 						"fn"
-					)};
-					ret[webpackExports] = dep;
-					return ret;`
+					)};`,
+					"ret[webpackExports] = dep;",
+					"return ret;"
 				])})`,
 				"deps"
 			)};`,
@@ -119,24 +124,29 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 				)};`,
 				"module.exports = promise;",
 				`body(${runtimeTemplate.basicFunction("deps", [
-					"if(!deps) return outerResolve();",
 					"currentDeps = wrapDeps(deps);",
-					"var fn, result;",
+					"var fn;",
+					`var getResult = ${runtimeTemplate.returningFunction(
+						`currentDeps.map(${runtimeTemplate.basicFunction("d", [
+							"if(d[webpackError]) throw d[webpackError];",
+							"return d[webpackExports];"
+						])})`
+					)}`,
 					`var promise = new Promise(${runtimeTemplate.basicFunction(
 						"resolve, reject",
 						[
 							`fn = ${runtimeTemplate.expressionFunction(
-								`resolve(result = currentDeps.map(${runtimeTemplate.returningFunction(
-									"d[webpackExports]",
-									"d"
-								)}))`
+								"resolve(getResult)"
 							)};`,
 							"fn.r = 0;",
 							"whenAll(currentDeps, fn, reject);"
 						]
 					)});`,
-					"return fn.r ? promise : result;"
-				])}).then(outerResolve, reject);`,
+					"return fn.r ? promise : getResult();"
+				])}, ${runtimeTemplate.expressionFunction(
+					"err && reject(promise[webpackError] = err), outerResolve()",
+					"err"
+				)});`,
 				"isEvaluating = false;"
 			])};`
 		]);

package/lib/runtime/CreateScriptRuntimeModule.js

@@ -0,0 +1,36 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
+const HelperRuntimeModule = require("./HelperRuntimeModule");
+
+class CreateScriptRuntimeModule extends HelperRuntimeModule {
+	constructor() {
+		super("trusted types script");
+	}
+
+	/**
+	 * @returns {string} runtime code
+	 */
+	generate() {
+		const { compilation } = this;
+		const { runtimeTemplate, outputOptions } = compilation;
+		const { trustedTypes } = outputOptions;
+		const fn = RuntimeGlobals.createScript;
+
+		return Template.asString(
+			`${fn} = ${runtimeTemplate.returningFunction(
+				trustedTypes
+					? `${RuntimeGlobals.getTrustedTypesPolicy}().createScript(script)`
+					: "script",
+				"script"
+			)};`
+		);
+	}
+}
+
+module.exports = CreateScriptRuntimeModule;

package/lib/runtime/CreateScriptUrlRuntimeModule.js

@@ -10,7 +10,7 @@ const HelperRuntimeModule = require("./HelperRuntimeModule");
 
 class CreateScriptUrlRuntimeModule extends HelperRuntimeModule {
 	constructor() {
-		super("trusted types");
+		super("trusted types script url");
 	}
 
 	/**
@@ -22,39 +22,14 @@ class CreateScriptUrlRuntimeModule extends HelperRuntimeModule {
 		const { trustedTypes } = outputOptions;
 		const fn = RuntimeGlobals.createScriptUrl;
 
-		if (!trustedTypes) {
-			// Skip Trusted Types logic.
-			return Template.asString([
-				`${fn} = ${runtimeTemplate.returningFunction("url", "url")};`
-			]);
-		}
-
-		return Template.asString([
-			"var policy;",
-			`${fn} = ${runtimeTemplate.basicFunction("url", [
-				"// Create Trusted Type policy if Trusted Types are available and the policy doesn't exist yet.",
-				"if (policy === undefined) {",
-				Template.indent([
-					"policy = {",
-					Template.indent([
-						`createScriptURL: ${runtimeTemplate.returningFunction(
-							"url",
-							"url"
-						)}`
-					]),
-					"};",
-					'if (typeof trustedTypes !== "undefined" && trustedTypes.createPolicy) {',
-					Template.indent([
-						`policy = trustedTypes.createPolicy(${JSON.stringify(
-							trustedTypes.policyName
-						)}, policy);`
-					]),
-					"}"
-				]),
-				"}",
-				"return policy.createScriptURL(url);"
-			])};`
-		]);
+		return Template.asString(
+			`${fn} = ${runtimeTemplate.returningFunction(
+				trustedTypes
+					? `${RuntimeGlobals.getTrustedTypesPolicy}().createScriptURL(url)`
+					: "url",
+				"url"
+			)};`
+		);
 	}
 }