webpack 5.59.0 → 5.76.0

package/lib/optimize/ConcatenatedModule.js

@@ -21,7 +21,7 @@ const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency
 const JavascriptParser = require("../javascript/JavascriptParser");
 const { equals } = require("../util/ArrayHelpers");
 const LazySet = require("../util/LazySet");
-const { concatComparators, keepOriginalOrder } = require("../util/comparators");
+const { concatComparators } = require("../util/comparators");
 const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const makeSerializable = require("../util/makeSerializable");
@@ -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 */
@@ -184,23 +185,25 @@ const RESERVED_NAMES = new Set(
 		.split(",")
 );
 
-const bySourceOrder = (a, b) => {
-	const aOrder = a.sourceOrder;
-	const bOrder = b.sourceOrder;
-	if (isNaN(aOrder)) {
-		if (!isNaN(bOrder)) {
+const createComparator = (property, comparator) => (a, b) =>
+	comparator(a[property], b[property]);
+const compareNumbers = (a, b) => {
+	if (isNaN(a)) {
+		if (!isNaN(b)) {
 			return 1;
 		}
 	} else {
-		if (isNaN(bOrder)) {
+		if (isNaN(b)) {
 			return -1;
 		}
-		if (aOrder !== bOrder) {
-			return aOrder < bOrder ? -1 : 1;
+		if (a !== b) {
+			return a < b ? -1 : 1;
 		}
 	}
 	return 0;
 };
+const bySourceOrder = createComparator("sourceOrder", compareNumbers);
+const byRangeStart = createComparator("rangeStart", compareNumbers);
 
 const joinIterableWithComma = iterable => {
 	// This is more performant than Array.from().join(", ")
@@ -821,10 +824,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);
 					}
 				}
@@ -888,6 +887,9 @@ class ConcatenatedModule extends Module {
 				for (const c of moduleGraph.getOutgoingConnections(this))
 					connections.push(c);
 			}
+			/**
+			 * @type {Array<{ connection: ModuleGraphConnection, sourceOrder: number, rangeStart: number }>}
+			 */
 			const references = connections
 				.filter(connection => {
 					if (!(connection.dependency instanceof HarmonyImportDependency))
@@ -899,15 +901,33 @@ class ConcatenatedModule extends Module {
 						connection.isTargetActive(runtime)
 					);
 				})
-				.map(connection => ({
-					connection,
-					sourceOrder: /** @type {HarmonyImportDependency} */ (
+				.map(connection => {
+					const dep = /** @type {HarmonyImportDependency} */ (
 						connection.dependency
-					).sourceOrder
-				}));
-			references.sort(
-				concatComparators(bySourceOrder, keepOriginalOrder(references))
-			);
+					);
+					return {
+						connection,
+						sourceOrder: dep.sourceOrder,
+						rangeStart: dep.range && dep.range[0]
+					};
+				});
+			/**
+			 * bySourceOrder
+			 * @example
+			 * import a from "a"; // sourceOrder=1
+			 * import b from "b"; // sourceOrder=2
+			 *
+			 * byRangeStart
+			 * @example
+			 * import {a, b} from "a"; // sourceOrder=1
+			 * a.a(); // first range
+			 * b.b(); // second range
+			 *
+			 * If there is no reexport, we have the same source.
+			 * If there is reexport, but module has side effects, this will lead to reexport module only.
+			 * If there is side-effects-free reexport, we can get simple deterministic result with range start comparison.
+			 */
+			references.sort(concatComparators(bySourceOrder, byRangeStart));
 			/** @type {Map<Module, { connection: ModuleGraphConnection, runtimeCondition: RuntimeSpec | true }>} */
 			const referencesMap = new Map();
 			for (const { connection } of references) {
@@ -1077,7 +1097,8 @@ class ConcatenatedModule extends Module {
 		runtimeTemplate,
 		moduleGraph,
 		chunkGraph,
-		runtime: generationRuntime
+		runtime: generationRuntime,
+		codeGenerationResults
 	}) {
 		/** @type {Set<string>} */
 		const runtimeRequirements = new Set();
@@ -1104,12 +1125,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 +1278,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 +1305,7 @@ class ConcatenatedModule extends Module {
 						} else {
 							allUsedNames.add(name);
 							info.internalNames.set(name, name);
+							topLevelDeclarations.add(name);
 						}
 					}
 					let namespaceObjectName;
@@ -1297,6 +1323,7 @@ class ConcatenatedModule extends Module {
 						allUsedNames.add(namespaceObjectName);
 					}
 					info.namespaceObjectName = namespaceObjectName;
+					topLevelDeclarations.add(namespaceObjectName);
 					break;
 				}
 				case "external": {
@@ -1308,6 +1335,7 @@ class ConcatenatedModule extends Module {
 					);
 					allUsedNames.add(externalName);
 					info.name = externalName;
+					topLevelDeclarations.add(externalName);
 					break;
 				}
 			}
@@ -1320,6 +1348,7 @@ class ConcatenatedModule extends Module {
 				);
 				allUsedNames.add(externalNameInterop);
 				info.interopNamespaceObjectName = externalNameInterop;
+				topLevelDeclarations.add(externalNameInterop);
 			}
 			if (
 				info.module.buildMeta.exportsType === "default" &&
@@ -1333,6 +1362,7 @@ class ConcatenatedModule extends Module {
 				);
 				allUsedNames.add(externalNameInterop);
 				info.interopNamespaceObject2Name = externalNameInterop;
+				topLevelDeclarations.add(externalNameInterop);
 			}
 			if (
 				info.module.buildMeta.exportsType === "dynamic" ||
@@ -1346,6 +1376,7 @@ class ConcatenatedModule extends Module {
 				);
 				allUsedNames.add(externalNameInterop);
 				info.interopDefaultAccessName = externalNameInterop;
+				topLevelDeclarations.add(externalNameInterop);
 			}
 		}
 
@@ -1615,6 +1646,7 @@ ${defineGetters}`
 		const data = new Map();
 		if (chunkInitFragments.length > 0)
 			data.set("chunkInitFragments", chunkInitFragments);
+		data.set("topLevelDeclarations", topLevelDeclarations);
 
 		/** @type {CodeGenerationResult} */
 		const resultEntry = {
@@ -1634,6 +1666,7 @@ ${defineGetters}`
 	 * @param {ModuleGraph} moduleGraph moduleGraph
 	 * @param {ChunkGraph} chunkGraph chunkGraph
 	 * @param {RuntimeSpec} runtime runtime
+	 * @param {CodeGenerationResults} codeGenerationResults codeGenerationResults
 	 */
 	_analyseModule(
 		modulesMap,
@@ -1642,7 +1675,8 @@ ${defineGetters}`
 		runtimeTemplate,
 		moduleGraph,
 		chunkGraph,
-		runtime
+		runtime,
+		codeGenerationResults
 	) {
 		if (info.type === "concatenated") {
 			const m = info.module;
@@ -1657,7 +1691,9 @@ ${defineGetters}`
 					moduleGraph,
 					chunkGraph,
 					runtime,
-					concatenationScope
+					concatenationScope,
+					codeGenerationResults,
+					sourceTypes: TYPES
 				});
 				const source = codeGenResult.sources.get("javascript");
 				const data = codeGenResult.data;
@@ -1702,7 +1738,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/optimize/ModuleConcatenationPlugin.js

@@ -56,7 +56,13 @@ class ModuleConcatenationPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		const { _backCompat: backCompat } = compiler;
 		compiler.hooks.compilation.tap("ModuleConcatenationPlugin", compilation => {
+			if (compilation.moduleMemCaches) {
+				throw new Error(
+					"optimization.concatenateModules can't be used with cacheUnaffected as module concatenation is a global effect"
+				);
+			}
 			const moduleGraph = compilation.moduleGraph;
 			const bailoutReasonMap = new Map();
 
@@ -389,8 +395,10 @@ class ModuleConcatenationPlugin {
 							};
 
 							const integrate = () => {
-								ChunkGraph.setChunkGraphForModule(newModule, chunkGraph);
-								ModuleGraph.setModuleGraphForModule(newModule, moduleGraph);
+								if (backCompat) {
+									ChunkGraph.setChunkGraphForModule(newModule, chunkGraph);
+									ModuleGraph.setModuleGraphForModule(newModule, moduleGraph);
+								}
 
 								for (const warning of concatConfiguration.getWarningsSorted()) {
 									moduleGraph
@@ -422,7 +430,21 @@ class ModuleConcatenationPlugin {
 										for (const chunk of chunkGraph.getModuleChunksIterable(
 											rootModule
 										)) {
-											chunkGraph.disconnectChunkAndModule(chunk, m);
+											const sourceTypes = chunkGraph.getChunkModuleSourceTypes(
+												chunk,
+												m
+											);
+											if (sourceTypes.size === 1) {
+												chunkGraph.disconnectChunkAndModule(chunk, m);
+											} else {
+												const newSourceTypes = new Set(sourceTypes);
+												newSourceTypes.delete("javascript");
+												chunkGraph.setChunkModuleSourceTypes(
+													chunk,
+													m,
+													newSourceTypes
+												);
+											}
 										}
 									}
 								}
@@ -584,7 +606,7 @@ class ModuleConcatenationPlugin {
 				incomingConnectionsFromNonModules.filter(connection => {
 					// We are not interested in inactive connections
 					// or connections without dependency
-					return connection.isActive(runtime) || connection.dependency;
+					return connection.isActive(runtime);
 				});
 			if (activeNonModulesConnections.length > 0) {
 				const problem = requestShortener => {

package/lib/optimize/RealContentHashPlugin.js

@@ -178,10 +178,43 @@ class RealContentHashPlugin {
 						}
 					}
 					if (hashToAssets.size === 0) return;
-					const hashRegExp = new RegExp(
-						Array.from(hashToAssets.keys(), quoteMeta).join("|"),
-						"g"
+					const hashRegExps = Array.from(hashToAssets.keys(), quoteMeta).map(
+						hash => new RegExp(hash, "g")
 					);
+
+					/**
+					 * @param {string} str string to be matched against all hashRegExps
+					 * @returns {string[] | null} matches found
+					 */
+					const hashMatch = str => {
+						/** @type {string[]} */
+						const results = [];
+						for (const hashRegExp of hashRegExps) {
+							const matches = str.match(hashRegExp);
+							if (matches) {
+								matches.forEach(match => results.push(match));
+							}
+						}
+						if (results.length) {
+							return results;
+						} else {
+							return null;
+						}
+					};
+
+					/**
+					 * @param {string} str string to be replaced with all hashRegExps
+					 * @param {function(string): string} fn replacement function to use when a hash is found
+					 * @returns {string} replaced content
+					 */
+					const hashReplace = (str, fn) => {
+						let result = str;
+						for (const hashRegExp of hashRegExps) {
+							result = result.replace(hashRegExp, fn);
+						}
+						return result;
+					};
+
 					await Promise.all(
 						assetsWithInfo.map(async asset => {
 							const { name, source, content, hashes } = asset;
@@ -198,7 +231,7 @@ class RealContentHashPlugin {
 								await cacheAnalyse.providePromise(name, etag, () => {
 									const referencedHashes = new Set();
 									let ownHashes = new Set();
-									const inContent = content.match(hashRegExp);
+									const inContent = hashMatch(content);
 									if (inContent) {
 										for (const hash of inContent) {
 											if (hashes.has(hash)) {
@@ -298,7 +331,7 @@ ${referencingAssets
 									identifier,
 									etag,
 									() => {
-										const newContent = asset.content.replace(hashRegExp, hash =>
+										const newContent = hashReplace(asset.content, hash =>
 											hashToNewHash.get(hash)
 										);
 										return new RawSource(newContent);
@@ -323,15 +356,12 @@ ${referencingAssets
 									identifier,
 									etag,
 									() => {
-										const newContent = asset.content.replace(
-											hashRegExp,
-											hash => {
-												if (asset.ownHashes.has(hash)) {
-													return "";
-												}
-												return hashToNewHash.get(hash);
+										const newContent = hashReplace(asset.content, hash => {
+											if (asset.ownHashes.has(hash)) {
+												return "";
 											}
-										);
+											return hashToNewHash.get(hash);
+										});
 										return new RawSource(newContent);
 									}
 								);
@@ -342,7 +372,6 @@ ${referencingAssets
 					for (const oldHash of hashesInOrder) {
 						const assets = hashToAssets.get(oldHash);
 						assets.sort(comparator);
-						const hash = createHash(this._hashFunction);
 						await Promise.all(
 							assets.map(asset =>
 								asset.ownHashes.has(oldHash)
@@ -363,6 +392,7 @@ ${referencingAssets
 						});
 						let newHash = hooks.updateHash.call(assetsContent, oldHash);
 						if (!newHash) {
+							const hash = createHash(this._hashFunction);
 							for (const content of assetsContent) {
 								hash.update(content);
 							}
@@ -374,7 +404,7 @@ ${referencingAssets
 					await Promise.all(
 						assetsWithInfo.map(async asset => {
 							await computeNewContent(asset);
-							const newName = asset.name.replace(hashRegExp, hash =>
+							const newName = hashReplace(asset.name, hash =>
 								hashToNewHash.get(hash)
 							);
 

package/lib/optimize/SplitChunksPlugin.js

@@ -102,6 +102,7 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
 
 /**
  * @typedef {Object} FallbackCacheGroup
+ * @property {ChunkFilterFunction} chunksFilter
  * @property {SplitChunksSizes} minSize
  * @property {SplitChunksSizes} maxAsyncSize
  * @property {SplitChunksSizes} maxInitialSize
@@ -658,6 +659,9 @@ module.exports = class SplitChunksPlugin {
 			automaticNameDelimiter: options.automaticNameDelimiter,
 			usedExports: options.usedExports,
 			fallbackCacheGroup: {
+				chunksFilter: normalizeChunksFilter(
+					fallbackCacheGroup.chunks || options.chunks || "all"
+				),
 				minSize: mergeSizes(
 					normalizeSizes(fallbackCacheGroup.minSize, defaultSizeTypes),
 					minSize
@@ -1598,6 +1602,7 @@ module.exports = class SplitChunksPlugin {
 					const { outputOptions } = compilation;
 
 					// Make sure that maxSize is fulfilled
+					const { fallbackCacheGroup } = this.options;
 					for (const chunk of Array.from(compilation.chunks)) {
 						const chunkConfig = maxSizeQueueMap.get(chunk);
 						const {
@@ -1605,7 +1610,9 @@ module.exports = class SplitChunksPlugin {
 							maxAsyncSize,
 							maxInitialSize,
 							automaticNameDelimiter
-						} = chunkConfig || this.options.fallbackCacheGroup;
+						} = chunkConfig || fallbackCacheGroup;
+						if (!chunkConfig && !fallbackCacheGroup.chunksFilter(chunk))
+							continue;
 						/** @type {SplitChunksSizes} */
 						let maxSize;
 						if (chunk.isOnlyInitial()) {

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -20,11 +20,13 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 		const { runtimeTemplate } = this.compilation;
 		const fn = RuntimeGlobals.asyncModule;
 		return Template.asString([
-			'var webpackThen = typeof Symbol === "function" ? Symbol("webpack then") : "__webpack_then__";',
+			'var webpackQueues = typeof Symbol === "function" ? Symbol("webpack queues") : "__webpack_queues__";',
 			'var webpackExports = typeof Symbol === "function" ? Symbol("webpack exports") : "__webpack_exports__";',
-			`var completeQueue = ${runtimeTemplate.basicFunction("queue", [
-				"if(queue) {",
+			'var webpackError = typeof Symbol === "function" ? Symbol("webpack error") : "__webpack_error__";',
+			`var resolveQueue = ${runtimeTemplate.basicFunction("queue", [
+				"if(queue && !queue.d) {",
 				Template.indent([
+					"queue.d = 1;",
 					`queue.forEach(${runtimeTemplate.expressionFunction(
 						"fn.r--",
 						"fn"
@@ -36,108 +38,90 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 				]),
 				"}"
 			])}`,
-			`var completeFunction = ${runtimeTemplate.expressionFunction(
-				"!--fn.r && fn()",
-				"fn"
-			)};`,
-			`var queueFunction = ${runtimeTemplate.expressionFunction(
-				"queue ? queue.push(fn) : completeFunction(fn)",
-				"queue, fn"
-			)};`,
 			`var wrapDeps = ${runtimeTemplate.returningFunction(
 				`deps.map(${runtimeTemplate.basicFunction("dep", [
 					'if(dep !== null && typeof dep === "object") {',
 					Template.indent([
-						"if(dep[webpackThen]) return dep;",
+						"if(dep[webpackQueues]) return dep;",
 						"if(dep.then) {",
 						Template.indent([
 							"var queue = [];",
+							"queue.d = 0;",
 							`dep.then(${runtimeTemplate.basicFunction("r", [
 								"obj[webpackExports] = r;",
-								"completeQueue(queue);",
-								"queue = 0;"
+								"resolveQueue(queue);"
+							])}, ${runtimeTemplate.basicFunction("e", [
+								"obj[webpackError] = e;",
+								"resolveQueue(queue);"
 							])});`,
-							`var obj = {};
-							obj[webpackThen] = ${runtimeTemplate.expressionFunction(
-								"queueFunction(queue, fn), dep.catch(reject)",
-								"fn, reject"
+							"var obj = {};",
+							`obj[webpackQueues] = ${runtimeTemplate.expressionFunction(
+								`fn(queue)`,
+								"fn"
 							)};`,
 							"return obj;"
 						]),
 						"}"
 					]),
 					"}",
-					`var ret = {};
-					ret[webpackThen] = ${runtimeTemplate.expressionFunction(
-						"completeFunction(fn)",
-						"fn"
-					)};
-					ret[webpackExports] = dep;
-					return ret;`
+					"var ret = {};",
+					`ret[webpackQueues] = ${runtimeTemplate.emptyFunction()};`,
+					"ret[webpackExports] = dep;",
+					"return ret;"
 				])})`,
 				"deps"
 			)};`,
 			`${fn} = ${runtimeTemplate.basicFunction("module, body, hasAwait", [
-				"var queue = hasAwait && [];",
+				"var queue;",
+				"hasAwait && ((queue = []).d = 1);",
+				"var depQueues = new Set();",
 				"var exports = module.exports;",
 				"var currentDeps;",
 				"var outerResolve;",
 				"var reject;",
-				"var isEvaluating = true;",
-				"var nested = false;",
-				`var whenAll = ${runtimeTemplate.basicFunction(
-					"deps, onResolve, onReject",
-					[
-						"if (nested) return;",
-						"nested = true;",
-						"onResolve.r += deps.length;",
-						`deps.map(${runtimeTemplate.expressionFunction(
-							"dep[webpackThen](onResolve, onReject)",
-							"dep, i"
-						)});`,
-						"nested = false;"
-					]
-				)};`,
 				`var promise = new Promise(${runtimeTemplate.basicFunction(
 					"resolve, rej",
-					[
-						"reject = rej;",
-						`outerResolve = ${runtimeTemplate.expressionFunction(
-							"resolve(exports), completeQueue(queue), queue = 0"
-						)};`
-					]
+					["reject = rej;", "outerResolve = resolve;"]
 				)});`,
 				"promise[webpackExports] = exports;",
-				`promise[webpackThen] = ${runtimeTemplate.basicFunction(
-					"fn, rejectFn",
-					[
-						"if (isEvaluating) { return completeFunction(fn); }",
-						"if (currentDeps) whenAll(currentDeps, fn, rejectFn);",
-						"queueFunction(queue, fn);",
-						"promise.catch(rejectFn);"
-					]
+				`promise[webpackQueues] = ${runtimeTemplate.expressionFunction(
+					`queue && fn(queue), depQueues.forEach(fn), promise["catch"](${runtimeTemplate.emptyFunction()})`,
+					"fn"
 				)};`,
 				"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",
+						"resolve",
 						[
 							`fn = ${runtimeTemplate.expressionFunction(
-								`resolve(result = currentDeps.map(${runtimeTemplate.returningFunction(
-									"d[webpackExports]",
-									"d"
-								)}))`
+								"resolve(getResult)",
+								""
 							)};`,
 							"fn.r = 0;",
-							"whenAll(currentDeps, fn, reject);"
+							`var fnQueue = ${runtimeTemplate.expressionFunction(
+								"q !== queue && !depQueues.has(q) && (depQueues.add(q), q && !q.d && (fn.r++, q.push(fn)))",
+								"q"
+							)};`,
+							`currentDeps.map(${runtimeTemplate.expressionFunction(
+								"dep[webpackQueues](fnQueue)",
+								"dep"
+							)});`
 						]
 					)});`,
-					"return fn.r ? promise : result;"
-				])}).then(outerResolve, reject);`,
-				"isEvaluating = false;"
+					"return fn.r ? promise : getResult();"
+				])}, ${runtimeTemplate.expressionFunction(
+					"(err ? reject(promise[webpackError] = err) : outerResolve(exports)), resolveQueue(queue)",
+					"err"
+				)});`,
+				"queue && (queue.d = 0);"
 			])};`
 		]);
 	}

package/lib/runtime/BaseUriRuntimeModule.js

@@ -0,0 +1,31 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Ivan Kopeykin @vankop
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeModule = require("../RuntimeModule");
+
+class BaseUriRuntimeModule extends RuntimeModule {
+	constructor() {
+		super("base uri", RuntimeModule.STAGE_ATTACH);
+	}
+
+	/**
+	 * @returns {string} runtime code
+	 */
+	generate() {
+		const { chunk } = this;
+
+		const options = chunk.getEntryOptions();
+		return `${RuntimeGlobals.baseURI} = ${
+			options.baseUri === undefined
+				? "undefined"
+				: JSON.stringify(options.baseUri)
+		};`;
+	}
+}
+
+module.exports = BaseUriRuntimeModule;

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;