webpack 5.36.2 → 5.38.1

package/lib/SourceMapDevToolPlugin.js

@@ -16,7 +16,6 @@ const createHash = require("./util/createHash");
 const { relative, dirname } = require("./util/fs");
 const { absolutify } = require("./util/identifier");
 
-/** @typedef {import("source-map").RawSourceMap} SourceMap */
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
@@ -26,6 +25,7 @@ const { absolutify } = require("./util/identifier");
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module")} Module */
+/** @typedef {import("./NormalModule").SourceMap} SourceMap */
 /** @typedef {import("./util/Hash")} Hash */
 
 const validate = createSchemaValidation(
@@ -430,19 +430,20 @@ class SourceMapDevToolPlugin {
 										currentSourceMappingURLComment !== false &&
 										/\.css($|\?)/i.test(file)
 									) {
-										currentSourceMappingURLComment = currentSourceMappingURLComment.replace(
-											/^\n\/\/(.*)$/,
-											"\n/*$1*/"
-										);
+										currentSourceMappingURLComment =
+											currentSourceMappingURLComment.replace(
+												/^\n\/\/(.*)$/,
+												"\n/*$1*/"
+											);
 									}
 									const sourceMapString = JSON.stringify(sourceMap);
 									if (sourceMapFilename) {
 										let filename = file;
 										const sourceMapContentHash =
 											usesContentHash &&
-											/** @type {string} */ (createHash("md4")
-												.update(sourceMapString)
-												.digest("hex"));
+											/** @type {string} */ (
+												createHash("md4").update(sourceMapString).digest("hex")
+											);
 										const pathParams = {
 											chunk,
 											filename: options.fileContext
@@ -454,13 +455,11 @@ class SourceMapDevToolPlugin {
 												: filename,
 											contentHash: sourceMapContentHash
 										};
-										const {
-											path: sourceMapFile,
-											info: sourceMapInfo
-										} = compilation.getPathWithInfo(
-											sourceMapFilename,
-											pathParams
-										);
+										const { path: sourceMapFile, info: sourceMapInfo } =
+											compilation.getPathWithInfo(
+												sourceMapFilename,
+												pathParams
+											);
 										const sourceMapUrl = options.publicPath
 											? options.publicPath + sourceMapFile
 											: relative(

package/lib/Template.js

@@ -413,5 +413,7 @@ class Template {
 }
 
 module.exports = Template;
-module.exports.NUMBER_OF_IDENTIFIER_START_CHARS = NUMBER_OF_IDENTIFIER_START_CHARS;
-module.exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS = NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS;
+module.exports.NUMBER_OF_IDENTIFIER_START_CHARS =
+	NUMBER_OF_IDENTIFIER_START_CHARS;
+module.exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS =
+	NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS;

package/lib/Watching.js

@@ -57,16 +57,70 @@ class Watching {
 		this._needRecords = true;
 		this.watcher = undefined;
 		this.pausedWatcher = undefined;
+		/** @type {Set<string>} */
+		this._collectedChangedFiles = undefined;
+		/** @type {Set<string>} */
+		this._collectedRemovedFiles = undefined;
 		this._done = this._done.bind(this);
 		process.nextTick(() => {
 			if (this._initial) this._invalidate();
 		});
 	}
 
-	_go() {
+	_mergeWithCollected(changedFiles, removedFiles) {
+		if (!changedFiles) return;
+		if (!this._collectedChangedFiles) {
+			this._collectedChangedFiles = new Set(changedFiles);
+			this._collectedRemovedFiles = new Set(removedFiles);
+		} else {
+			for (const file of changedFiles) {
+				this._collectedChangedFiles.add(file);
+				this._collectedRemovedFiles.delete(file);
+			}
+			for (const file of removedFiles) {
+				this._collectedChangedFiles.delete(file);
+				this._collectedRemovedFiles.add(file);
+			}
+		}
+	}
+
+	_go(fileTimeInfoEntries, contextTimeInfoEntries, changedFiles, removedFiles) {
 		this._initial = false;
 		this.startTime = Date.now();
 		this.running = true;
+		if (this.watcher) {
+			this.pausedWatcher = this.watcher;
+			this.lastWatcherStartTime = Date.now();
+			this.watcher.pause();
+			this.watcher = null;
+		} else if (!this.lastWatcherStartTime) {
+			this.lastWatcherStartTime = Date.now();
+		}
+		this.compiler.fsStartTime = Date.now();
+		this._mergeWithCollected(
+			changedFiles ||
+				(this.pausedWatcher &&
+					this.pausedWatcher.getAggregatedChanges &&
+					this.pausedWatcher.getAggregatedChanges()),
+			(this.compiler.removedFiles =
+				removedFiles ||
+				(this.pausedWatcher &&
+					this.pausedWatcher.getAggregatedRemovals &&
+					this.pausedWatcher.getAggregatedRemovals()))
+		);
+
+		this.compiler.modifiedFiles = this._collectedChangedFiles;
+		this._collectedChangedFiles = undefined;
+		this.compiler.removedFiles = this._collectedRemovedFiles;
+		this._collectedRemovedFiles = undefined;
+
+		this.compiler.fileTimestamps =
+			fileTimeInfoEntries ||
+			(this.pausedWatcher && this.pausedWatcher.getFileTimeInfoEntries());
+		this.compiler.contextTimestamps =
+			contextTimeInfoEntries ||
+			(this.pausedWatcher && this.pausedWatcher.getContextTimeInfoEntries());
+
 		const run = () => {
 			if (this.compiler.idle) {
 				return this.compiler.cache.endIdle(err => {
@@ -159,13 +213,16 @@ class Watching {
 
 		let stats = null;
 
-		const handleError = err => {
+		const handleError = (err, cbs) => {
 			this.compiler.hooks.failed.call(err);
 			this.compiler.cache.beginIdle();
 			this.compiler.idle = true;
 			this.handler(err, stats);
-			for (const cb of this.callbacks) cb();
-			this.callbacks.length = 0;
+			if (!cbs) {
+				cbs = this.callbacks;
+				this.callbacks = [];
+			}
+			for (const cb of cbs) cb(err);
 		};
 
 		if (
@@ -197,17 +254,19 @@ class Watching {
 		}
 		if (err) return handleError(err);
 
+		const cbs = this.callbacks;
+		this.callbacks = [];
 		logger.time("done hook");
 		this.compiler.hooks.done.callAsync(stats, err => {
 			logger.timeEnd("done hook");
-			if (err) return handleError(err);
+			if (err) return handleError(err, cbs);
 			this.handler(null, stats);
 			logger.time("storeBuildDependencies");
 			this.compiler.cache.storeBuildDependencies(
 				compilation.buildDependencies,
 				err => {
 					logger.timeEnd("storeBuildDependencies");
-					if (err) return handleError(err);
+					if (err) return handleError(err, cbs);
 					logger.time("beginIdle");
 					this.compiler.cache.beginIdle();
 					this.compiler.idle = true;
@@ -221,8 +280,7 @@ class Watching {
 							);
 						}
 					});
-					for (const cb of this.callbacks) cb();
-					this.callbacks.length = 0;
+					for (const cb of cbs) cb(null);
 					this.compiler.hooks.afterDone.call(stats);
 				}
 			);
@@ -241,7 +299,7 @@ class Watching {
 			files,
 			dirs,
 			missing,
-			this.startTime,
+			this.lastWatcherStartTime,
 			this.watchOptions,
 			(
 				err,
@@ -250,25 +308,20 @@ class Watching {
 				changedFiles,
 				removedFiles
 			) => {
-				this.pausedWatcher = this.watcher;
-				this.watcher = null;
 				if (err) {
 					this.compiler.modifiedFiles = undefined;
 					this.compiler.removedFiles = undefined;
 					this.compiler.fileTimestamps = undefined;
 					this.compiler.contextTimestamps = undefined;
+					this.compiler.fsStartTime = undefined;
 					return this.handler(err);
 				}
-				this.compiler.fileTimestamps = fileTimeInfoEntries;
-				this.compiler.contextTimestamps = contextTimeInfoEntries;
-				this.compiler.removedFiles = removedFiles;
-				this.compiler.modifiedFiles = changedFiles;
-				if (this.watcher) {
-					this.pausedWatcher = this.watcher;
-					this.watcher.pause();
-					this.watcher = null;
-				}
-				this._invalidate();
+				this._invalidate(
+					fileTimeInfoEntries,
+					contextTimeInfoEntries,
+					changedFiles,
+					removedFiles
+				);
 				this._onChange();
 			},
 			(fileName, changeTime) => {
@@ -293,33 +346,31 @@ class Watching {
 			this._invalidReported = true;
 			this.compiler.hooks.invalid.call(null, Date.now());
 		}
+		this._onChange();
 		this._invalidate();
 	}
 
-	_invalidate() {
-		if (this.suspended) return;
-		if (this._isBlocked()) {
-			this.blocked = true;
+	_invalidate(
+		fileTimeInfoEntries,
+		contextTimeInfoEntries,
+		changedFiles,
+		removedFiles
+	) {
+		if (this.suspended || (this._isBlocked() && (this.blocked = true))) {
+			this._mergeWithCollected(changedFiles, removedFiles);
 			return;
 		}
-		if (this.watcher) {
-			this.compiler.modifiedFiles =
-				this.watcher.getAggregatedChanges &&
-				this.watcher.getAggregatedChanges();
-			this.compiler.removedFiles =
-				this.watcher.getAggregatedRemovals &&
-				this.watcher.getAggregatedRemovals();
-			this.compiler.fileTimestamps = this.watcher.getFileTimeInfoEntries();
-			this.compiler.contextTimestamps = this.watcher.getContextTimeInfoEntries();
-			this.pausedWatcher = this.watcher;
-			this.watcher.pause();
-			this.watcher = null;
-		}
 
 		if (this.running) {
+			this._mergeWithCollected(changedFiles, removedFiles);
 			this.invalid = true;
 		} else {
-			this._go();
+			this._go(
+				fileTimeInfoEntries,
+				contextTimeInfoEntries,
+				changedFiles,
+				removedFiles
+			);
 		}
 	}
 
@@ -334,14 +385,6 @@ class Watching {
 		}
 	}
 
-	_checkUnblocked() {
-		if (this.blocked && !this._isBlocked()) {
-			this.blocked = false;
-			this._needWatcherInfo = true;
-			this._invalidate();
-		}
-	}
-
 	/**
 	 * @param {Callback<void>} callback signals when the watcher is closed
 	 * @returns {void}
@@ -362,6 +405,7 @@ class Watching {
 			this.compiler.removedFiles = undefined;
 			this.compiler.fileTimestamps = undefined;
 			this.compiler.contextTimestamps = undefined;
+			this.compiler.fsStartTime = undefined;
 			const shutdown = () => {
 				this.compiler.cache.shutdown(err => {
 					this.compiler.hooks.watchClose.call();

package/lib/asset/AssetGenerator.js

@@ -120,12 +120,33 @@ class AssetGenerator extends Generator {
 							}
 						);
 					} else {
-						const encoding = this.dataUrlOptions.encoding;
-						const ext = path.extname(module.nameForCondition());
-						const mimeType =
-							this.dataUrlOptions.mimetype || mimeTypes.lookup(ext);
-
-						if (!mimeType) {
+						/** @type {string | false | undefined} */
+						let encoding = this.dataUrlOptions.encoding;
+						if (encoding === undefined) {
+							if (
+								module.resourceResolveData &&
+								module.resourceResolveData.encoding !== undefined
+							) {
+								encoding = module.resourceResolveData.encoding;
+							}
+						}
+						if (encoding === undefined) {
+							encoding = "base64";
+						}
+						let ext;
+						let mimeType = this.dataUrlOptions.mimetype;
+						if (mimeType === undefined) {
+							ext = path.extname(module.nameForCondition());
+							if (
+								module.resourceResolveData &&
+								module.resourceResolveData.mimetype !== undefined
+							) {
+								mimeType = module.resourceResolveData.mimetype;
+							} else if (ext) {
+								mimeType = mimeTypes.lookup(ext);
+							}
+						}
+						if (typeof mimeType !== "string") {
 							throw new Error(
 								"DataUrl can't be generated automatically, " +
 									`because there is no mimetype for "${ext}" in mimetype database. ` +
@@ -170,9 +191,9 @@ class AssetGenerator extends Generator {
 						hash.update(runtimeTemplate.outputOptions.hashSalt);
 					}
 					hash.update(originalSource.buffer());
-					const fullHash = /** @type {string} */ (hash.digest(
-						runtimeTemplate.outputOptions.hashDigest
-					));
+					const fullHash = /** @type {string} */ (
+						hash.digest(runtimeTemplate.outputOptions.hashDigest)
+					);
 					const contentHash = fullHash.slice(
 						0,
 						runtimeTemplate.outputOptions.hashDigestLength
@@ -183,26 +204,9 @@ class AssetGenerator extends Generator {
 						module.matchResource || module.resource,
 						runtimeTemplate.compilation.compiler.root
 					).replace(/^\.\//, "");
-					let {
-						path: filename,
-						info: assetInfo
-					} = runtimeTemplate.compilation.getAssetPathWithInfo(
-						assetModuleFilename,
-						{
-							module,
-							runtime,
-							filename: sourceFilename,
-							chunkGraph,
-							contentHash
-						}
-					);
-					let publicPath;
-					if (this.publicPath) {
-						const {
-							path,
-							info
-						} = runtimeTemplate.compilation.getAssetPathWithInfo(
-							this.publicPath,
+					let { path: filename, info: assetInfo } =
+						runtimeTemplate.compilation.getAssetPathWithInfo(
+							assetModuleFilename,
 							{
 								module,
 								runtime,
@@ -211,6 +215,19 @@ class AssetGenerator extends Generator {
 								contentHash
 							}
 						);
+					let publicPath;
+					if (this.publicPath) {
+						const { path, info } =
+							runtimeTemplate.compilation.getAssetPathWithInfo(
+								this.publicPath,
+								{
+									module,
+									runtime,
+									filename: sourceFilename,
+									chunkGraph,
+									contentHash
+								}
+							);
 						publicPath = JSON.stringify(path);
 						assetInfo = mergeAssetInfo(assetInfo, info);
 					} else {

package/lib/asset/AssetModulesPlugin.js

@@ -129,7 +129,7 @@ class AssetModulesPlugin {
 								dataUrl = generatorOptions.dataUrl;
 								if (!dataUrl || typeof dataUrl === "object") {
 									dataUrl = {
-										encoding: "base64",
+										encoding: undefined,
 										mimetype: undefined,
 										...dataUrl
 									};

package/lib/buildChunkGraph.js

@@ -519,7 +519,8 @@ const visitModules = (
 			if (skipConnectionBuffer.length > 0) {
 				let { skippedModuleConnections } = chunkGroupInfo;
 				if (skippedModuleConnections === undefined) {
-					chunkGroupInfo.skippedModuleConnections = skippedModuleConnections = new Set();
+					chunkGroupInfo.skippedModuleConnections = skippedModuleConnections =
+						new Set();
 				}
 				for (let i = skipConnectionBuffer.length - 1; i >= 0; i--) {
 					skippedModuleConnections.add(skipConnectionBuffer[i]);
@@ -695,7 +696,8 @@ const visitModules = (
 		let resultingAvailableModules;
 		if (minAvailableModules.size > minAvailableModules.plus.size) {
 			// resultingAvailableModules = (modules of chunk) + (minAvailableModules + minAvailableModules.plus)
-			resultingAvailableModules = /** @type {Set<Module> & {plus: Set<Module>}} */ (new Set());
+			resultingAvailableModules =
+				/** @type {Set<Module> & {plus: Set<Module>}} */ (new Set());
 			for (const module of minAvailableModules.plus)
 				minAvailableModules.add(module);
 			minAvailableModules.plus = EMPTY_SET;
@@ -703,9 +705,10 @@ const visitModules = (
 			chunkGroupInfo.minAvailableModulesOwned = false;
 		} else {
 			// resultingAvailableModules = (minAvailableModules + modules of chunk) + (minAvailableModules.plus)
-			resultingAvailableModules = /** @type {Set<Module> & {plus: Set<Module>}} */ (new Set(
-				minAvailableModules
-			));
+			resultingAvailableModules =
+				/** @type {Set<Module> & {plus: Set<Module>}} */ (
+					new Set(minAvailableModules)
+				);
 			resultingAvailableModules.plus = minAvailableModules.plus;
 		}
 
@@ -715,7 +718,8 @@ const visitModules = (
 				resultingAvailableModules.add(m);
 			}
 		}
-		return (chunkGroupInfo.resultingAvailableModules = resultingAvailableModules);
+		return (chunkGroupInfo.resultingAvailableModules =
+			resultingAvailableModules);
 	};
 
 	const processConnectQueue = () => {
@@ -732,9 +736,8 @@ const visitModules = (
 			}
 
 			// 2. Calculate resulting available modules
-			const resultingAvailableModules = calculateResultingAvailableModules(
-				chunkGroupInfo
-			);
+			const resultingAvailableModules =
+				calculateResultingAvailableModules(chunkGroupInfo);
 
 			const runtime = chunkGroupInfo.runtime;
 
@@ -800,9 +803,8 @@ const visitModules = (
 								if (!availableModules.has(m) && !availableModules.plus.has(m)) {
 									// We can't remove modules from the plus part
 									// so we need to merge plus into the normal part to allow modifying it
-									const iterator = cachedMinAvailableModules.plus[
-										Symbol.iterator
-									]();
+									const iterator =
+										cachedMinAvailableModules.plus[Symbol.iterator]();
 									// fast forward add all modules until m
 									/** @type {IteratorResult<Module>} */
 									let it;
@@ -951,13 +953,12 @@ const visitModules = (
 								statForkedMergedModulesCountPlus += availableModules.plus.size;
 								// construct a new Set as intersection of cachedMinAvailableModules and availableModules
 								// we already know that all modules directly from cachedMinAvailableModules are in availableModules too
-								const newSet = /** @type {ModuleSetPlus} */ (new Set(
-									cachedMinAvailableModules
-								));
+								const newSet = /** @type {ModuleSetPlus} */ (
+									new Set(cachedMinAvailableModules)
+								);
 								newSet.plus = EMPTY_SET;
-								const iterator = cachedMinAvailableModules.plus[
-									Symbol.iterator
-								]();
+								const iterator =
+									cachedMinAvailableModules.plus[Symbol.iterator]();
 								// fast forward add all modules until m
 								/** @type {IteratorResult<Module>} */
 								let it;
@@ -1018,9 +1019,8 @@ const visitModules = (
 			};
 			// combine minAvailableModules from all resultingAvailableModules
 			for (const source of info.availableSources) {
-				const resultingAvailableModules = calculateResultingAvailableModules(
-					source
-				);
+				const resultingAvailableModules =
+					calculateResultingAvailableModules(source);
 				mergeSet(resultingAvailableModules);
 				mergeSet(resultingAvailableModules.plus);
 			}

package/lib/cache/PackFileCacheStrategy.js

@@ -1041,7 +1041,8 @@ class PackFileCacheStrategy {
 					if (newBuildDependencies)
 						this.newBuildDependencies.addAll(newBuildDependencies);
 					this.resolveResults = resolveResults;
-					this.resolveBuildDependenciesSnapshot = resolveBuildDependenciesSnapshot;
+					this.resolveBuildDependenciesSnapshot =
+						resolveBuildDependenciesSnapshot;
 					return pack;
 				}
 				return new Pack(logger, this.maxAge);
@@ -1163,10 +1164,11 @@ class PackFileCacheStrategy {
 											);
 										}
 										if (this.resolveBuildDependenciesSnapshot) {
-											this.resolveBuildDependenciesSnapshot = this.fileSystemInfo.mergeSnapshots(
-												this.resolveBuildDependenciesSnapshot,
-												snapshot
-											);
+											this.resolveBuildDependenciesSnapshot =
+												this.fileSystemInfo.mergeSnapshots(
+													this.resolveBuildDependenciesSnapshot,
+													snapshot
+												);
 										} else {
 											this.resolveBuildDependenciesSnapshot = snapshot;
 										}
@@ -1194,10 +1196,11 @@ class PackFileCacheStrategy {
 												this.logger.debug("Captured build dependencies");
 
 												if (this.buildSnapshot) {
-													this.buildSnapshot = this.fileSystemInfo.mergeSnapshots(
-														this.buildSnapshot,
-														snapshot
-													);
+													this.buildSnapshot =
+														this.fileSystemInfo.mergeSnapshots(
+															this.buildSnapshot,
+															snapshot
+														);
 												} else {
 													this.buildSnapshot = snapshot;
 												}

package/lib/config/defaults.js

@@ -318,9 +318,10 @@ const applyCacheDefaults = (cache, { name, mode, development }) => {
 const applySnapshotDefaults = (snapshot, { production }) => {
 	A(snapshot, "managedPaths", () => {
 		if (process.versions.pnp === "3") {
-			const match = /^(.+?)[\\/]cache[\\/]watchpack-npm-[^\\/]+\.zip[\\/]node_modules[\\/]/.exec(
-				require.resolve("watchpack")
-			);
+			const match =
+				/^(.+?)[\\/]cache[\\/]watchpack-npm-[^\\/]+\.zip[\\/]node_modules[\\/]/.exec(
+					require.resolve("watchpack")
+				);
 			if (match) {
 				return [path.resolve(match[1], "unplugged")];
 			}
@@ -337,16 +338,18 @@ const applySnapshotDefaults = (snapshot, { production }) => {
 	});
 	A(snapshot, "immutablePaths", () => {
 		if (process.versions.pnp === "1") {
-			const match = /^(.+?[\\/]v4)[\\/]npm-watchpack-[^\\/]+-[\da-f]{40}[\\/]node_modules[\\/]/.exec(
-				require.resolve("watchpack")
-			);
+			const match =
+				/^(.+?[\\/]v4)[\\/]npm-watchpack-[^\\/]+-[\da-f]{40}[\\/]node_modules[\\/]/.exec(
+					require.resolve("watchpack")
+				);
 			if (match) {
 				return [match[1]];
 			}
 		} else if (process.versions.pnp === "3") {
-			const match = /^(.+?)[\\/]watchpack-npm-[^\\/]+\.zip[\\/]node_modules[\\/]/.exec(
-				require.resolve("watchpack")
-			);
+			const match =
+				/^(.+?)[\\/]watchpack-npm-[^\\/]+\.zip[\\/]node_modules[\\/]/.exec(
+					require.resolve("watchpack")
+				);
 			if (match) {
 				return [match[1]];
 			}
@@ -475,7 +478,15 @@ const applyModuleDefaults = (
 			},
 			{
 				dependency: "url",
-				type: "asset/resource"
+				oneOf: [
+					{
+						scheme: /^data$/,
+						type: "asset/inline"
+					},
+					{
+						type: "asset/resource"
+					}
+				]
 			}
 		];
 		if (asyncWebAssembly) {
@@ -732,6 +743,16 @@ const applyOutputDefaults = (
 	F(output.environment, "dynamicImport", () => tp && tp.dynamicImport);
 	F(output.environment, "module", () => tp && tp.module);
 
+	const { trustedTypes } = output;
+	if (trustedTypes) {
+		F(
+			trustedTypes,
+			"policyName",
+			() =>
+				output.uniqueName.replace(/[^a-zA-Z0-9\-#=_/@.%]+/g, "_") || "webpack"
+		);
+	}
+
 	/**
 	 * @param {function(EntryDescription): void} fn iterator
 	 * @returns {void}

package/lib/config/normalization.js

@@ -92,9 +92,9 @@ const keyedNestedConfig = (value, fn, customKeys) => {
 			? {}
 			: Object.keys(value).reduce(
 					(obj, key) => (
-						(obj[key] = (customKeys && key in customKeys
-							? customKeys[key]
-							: fn)(value[key])),
+						(obj[key] = (
+							customKeys && key in customKeys ? customKeys[key] : fn
+						)(value[key])),
 						obj
 					),
 					/** @type {Record<string, R>} */ ({})
@@ -163,10 +163,10 @@ const getNormalizedWebpackOptions = config => {
 			config.entry === undefined
 				? { main: {} }
 				: typeof config.entry === "function"
-				? (fn => () =>
-						Promise.resolve().then(fn).then(getNormalizedEntryStatic))(
-						config.entry
-				  )
+				? (
+						fn => () =>
+							Promise.resolve().then(fn).then(getNormalizedEntryStatic)
+				  )(config.entry)
 				: getNormalizedEntryStatic(config.entry),
 		experiments: cloneObject(config.experiments),
 		externals: config.externals,
@@ -338,6 +338,15 @@ const getNormalizedWebpackOptions = config => {
 				sourceMapFilename: output.sourceMapFilename,
 				sourcePrefix: output.sourcePrefix,
 				strictModuleExceptionHandling: output.strictModuleExceptionHandling,
+				trustedTypes: optionalNestedConfig(
+					output.trustedTypes,
+					trustedTypes => {
+						if (trustedTypes === true) return {};
+						if (typeof trustedTypes === "string")
+							return { policyName: trustedTypes };
+						return { ...trustedTypes };
+					}
+				),
 				uniqueName: output.uniqueName,
 				wasmLoading: output.wasmLoading,
 				webassemblyModuleFilename: output.webassemblyModuleFilename,