webpack 5.36.0 → 5.37.1

package/lib/dependencies/HarmonyExportInitFragment.js

@@ -48,6 +48,53 @@ class HarmonyExportInitFragment extends InitFragment {
 		this.unusedExports = unusedExports;
 	}
 
+	/**
+	 * @param {HarmonyExportInitFragment[]} fragments all fragments to merge
+	 * @returns {HarmonyExportInitFragment} merged fragment
+	 */
+	mergeAll(fragments) {
+		let exportMap;
+		let exportMapOwned = false;
+		let unusedExports;
+		let unusedExportsOwned = false;
+
+		for (const fragment of fragments) {
+			if (fragment.exportMap.size !== 0) {
+				if (exportMap === undefined) {
+					exportMap = fragment.exportMap;
+					exportMapOwned = false;
+				} else {
+					if (!exportMapOwned) {
+						exportMap = new Map(exportMap);
+						exportMapOwned = true;
+					}
+					for (const [key, value] of fragment.exportMap) {
+						if (!exportMap.has(key)) exportMap.set(key, value);
+					}
+				}
+			}
+			if (fragment.unusedExports.size !== 0) {
+				if (unusedExports === undefined) {
+					unusedExports = fragment.unusedExports;
+					unusedExportsOwned = false;
+				} else {
+					if (!unusedExportsOwned) {
+						unusedExports = new Set(unusedExports);
+						unusedExportsOwned = true;
+					}
+					for (const value of fragment.unusedExports) {
+						unusedExports.add(value);
+					}
+				}
+			}
+		}
+		return new HarmonyExportInitFragment(
+			this.exportsArgument,
+			exportMap,
+			unusedExports
+		);
+	}
+
 	merge(other) {
 		let exportMap;
 		if (this.exportMap.size === 0) {

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -152,10 +152,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				InnerGraph.onUsage(parser.state, e => (dep.usedByExports = e));
 				return true;
 			});
-		const {
-			hotAcceptCallback,
-			hotAcceptWithoutCallback
-		} = HotModuleReplacementPlugin.getParserHooks(parser);
+		const { hotAcceptCallback, hotAcceptWithoutCallback } =
+			HotModuleReplacementPlugin.getParserHooks(parser);
 		hotAcceptCallback.tap(
 			"HarmonyImportDependencyParserPlugin",
 			(expr, requests) => {

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -243,12 +243,8 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 	 */
 	apply(dependency, source, templateContext) {
 		const dep = /** @type {HarmonyImportSpecifierDependency} */ (dependency);
-		const {
-			moduleGraph,
-			module,
-			runtime,
-			concatenationScope
-		} = templateContext;
+		const { moduleGraph, module, runtime, concatenationScope } =
+			templateContext;
 		const connection = moduleGraph.getConnection(dep);
 		// Skip rendering depending when dependency is conditional
 		if (connection && !connection.isTargetActive(runtime)) return;
@@ -287,11 +283,8 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 		} else {
 			super.apply(dependency, source, templateContext);
 
-			const {
-				runtimeTemplate,
-				initFragments,
-				runtimeRequirements
-			} = templateContext;
+			const { runtimeTemplate, initFragments, runtimeRequirements } =
+				templateContext;
 
 			exportExpr = runtimeTemplate.exportFromImport({
 				moduleGraph,

package/lib/dependencies/ImportDependency.js

@@ -81,9 +81,9 @@ ImportDependency.Template = class ImportDependencyTemplate extends (
 		{ runtimeTemplate, module, moduleGraph, chunkGraph, runtimeRequirements }
 	) {
 		const dep = /** @type {ImportDependency} */ (dependency);
-		const block = /** @type {AsyncDependenciesBlock} */ (moduleGraph.getParentBlock(
-			dep
-		));
+		const block = /** @type {AsyncDependenciesBlock} */ (
+			moduleGraph.getParentBlock(dep)
+		);
 		const content = runtimeTemplate.moduleNamespacePromise({
 			chunkGraph,
 			block: block,

package/lib/dependencies/ImportParserPlugin.js

@@ -36,10 +36,8 @@ class ImportParserPlugin {
 			/** @type {RawChunkGroupOptions} */
 			const groupOptions = {};
 
-			const {
-				options: importOptions,
-				errors: commentErrors
-			} = parser.parseCommentOptions(expr.range);
+			const { options: importOptions, errors: commentErrors } =
+				parser.parseCommentOptions(expr.range);
 
 			if (commentErrors) {
 				for (const e of commentErrors) {

package/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js

@@ -46,9 +46,8 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 							? dependenciesExpr.items
 							: [dependenciesExpr];
 						const successExpressionArg = expr.arguments[1];
-						const successExpression = getFunctionExpression(
-							successExpressionArg
-						);
+						const successExpression =
+							getFunctionExpression(successExpressionArg);
 
 						if (successExpression) {
 							parser.walkExpressions(successExpression.expressions);

package/lib/dependencies/RequireEnsureDependency.js

@@ -68,9 +68,9 @@ RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends
 		{ runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements }
 	) {
 		const dep = /** @type {RequireEnsureDependency} */ (dependency);
-		const depBlock = /** @type {AsyncDependenciesBlock} */ (moduleGraph.getParentBlock(
-			dep
-		));
+		const depBlock = /** @type {AsyncDependenciesBlock} */ (
+			moduleGraph.getParentBlock(dep)
+		);
 		const promise = runtimeTemplate.blockPromise({
 			chunkGraph,
 			block: depBlock,

package/lib/dependencies/WorkerDependency.js

@@ -62,12 +62,12 @@ WorkerDependency.Template = class WorkerDependencyTemplate extends (
 	apply(dependency, source, templateContext) {
 		const { chunkGraph, moduleGraph, runtimeRequirements } = templateContext;
 		const dep = /** @type {WorkerDependency} */ (dependency);
-		const block = /** @type {AsyncDependenciesBlock} */ (moduleGraph.getParentBlock(
-			dependency
-		));
-		const entrypoint = /** @type {Entrypoint} */ (chunkGraph.getBlockChunkGroup(
-			block
-		));
+		const block = /** @type {AsyncDependenciesBlock} */ (
+			moduleGraph.getParentBlock(dependency)
+		);
+		const entrypoint = /** @type {Entrypoint} */ (
+			chunkGraph.getBlockChunkGroup(block)
+		);
 		const chunk = entrypoint.getEntrypointChunk();
 
 		runtimeRequirements.add(RuntimeGlobals.publicPath);

package/lib/dependencies/WorkerPlugin.js

@@ -9,12 +9,13 @@ const { pathToFileURL } = require("url");
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const CommentCompilationWarning = require("../CommentCompilationWarning");
 const UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
-const formatLocation = require("../formatLocation");
 const EnableChunkLoadingPlugin = require("../javascript/EnableChunkLoadingPlugin");
 const { equals } = require("../util/ArrayHelpers");
+const createHash = require("../util/createHash");
 const { contextify } = require("../util/identifier");
 const EnableWasmLoadingPlugin = require("../wasm/EnableWasmLoadingPlugin");
 const ConstDependency = require("./ConstDependency");
+const CreateScriptUrlDependency = require("./CreateScriptUrlDependency");
 const {
 	harmonySpecifierTag
 } = require("./HarmonyImportDependencyParserPlugin");
@@ -27,6 +28,7 @@ const WorkerDependency = require("./WorkerDependency");
 /** @typedef {import("estree").SpreadElement} SpreadElement */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Entrypoint").EntryOptions} EntryOptions */
+/** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("./HarmonyImportDependencyParserPlugin").HarmonySettings} HarmonySettings */
@@ -42,6 +44,9 @@ const DEFAULT_SYNTAX = [
 	"Worker from worker_threads"
 ];
 
+/** @type {WeakMap<ParserState, number>} */
+const workerIndexMap = new WeakMap();
+
 class WorkerPlugin {
 	constructor(chunkLoading, wasmLoading) {
 		this._chunkLoading = chunkLoading;
@@ -74,6 +79,10 @@ class WorkerPlugin {
 					WorkerDependency,
 					new WorkerDependency.Template()
 				);
+				compilation.dependencyTemplates.set(
+					CreateScriptUrlDependency,
+					new CreateScriptUrlDependency.Template()
+				);
 
 				/**
 				 * @param {JavascriptParser} parser the parser
@@ -177,21 +186,18 @@ class WorkerPlugin {
 							spread: hasSpreadInOptions,
 							insertType,
 							insertLocation
-						} =
-							arg2 && arg2.type === "ObjectExpression"
-								? parseObjectExpression(parser, arg2)
-								: {
-										expressions: {},
-										otherElements: [],
-										values: {},
-										spread: false,
-										insertType: arg2 ? "spread" : "argument",
-										insertLocation: arg2 ? arg2.range : arg1.range[1]
-								  };
-						const {
-							options: importOptions,
-							errors: commentErrors
-						} = parser.parseCommentOptions(expr.range);
+						} = arg2 && arg2.type === "ObjectExpression"
+							? parseObjectExpression(parser, arg2)
+							: {
+									expressions: {},
+									otherElements: [],
+									values: {},
+									spread: false,
+									insertType: arg2 ? "spread" : "argument",
+									insertLocation: arg2 ? arg2.range : arg1.range[1]
+							  };
+						const { options: importOptions, errors: commentErrors } =
+							parser.parseCommentOptions(expr.range);
 
 						if (commentErrors) {
 							for (const e of commentErrors) {
@@ -264,9 +270,20 @@ class WorkerPlugin {
 						}
 
 						if (!entryOptions.runtime) {
-							entryOptions.runtime = `${cachedContextify(
+							let i = workerIndexMap.get(parser.state) || 0;
+							workerIndexMap.set(parser.state, i + 1);
+							let name = `${cachedContextify(
 								parser.state.module.identifier()
-							)}|${formatLocation(expr.loc)}`;
+							)}|${i}`;
+							const hash = createHash(compilation.outputOptions.hashFunction);
+							hash.update(name);
+							const digest = /** @type {string} */ (
+								hash.digest(compilation.outputOptions.hashDigest)
+							);
+							entryOptions.runtime = digest.slice(
+								0,
+								compilation.outputOptions.hashDigestLength
+							);
 						}
 
 						const block = new AsyncDependenciesBlock({
@@ -282,7 +299,14 @@ class WorkerPlugin {
 						dep.loc = expr.loc;
 						block.addDependency(dep);
 						parser.state.module.addBlock(block);
-						parser.walkExpression(expr.callee);
+
+						if (compilation.outputOptions.trustedTypes) {
+							const dep = new CreateScriptUrlDependency(
+								expr.arguments[0].range
+							);
+							dep.loc = expr.loc;
+							parser.state.module.addDependency(dep);
+						}
 
 						if (expressions.type) {
 							const expr = expressions.type;
@@ -314,6 +338,7 @@ class WorkerPlugin {
 							parser.state.module.addPresentationalDependency(dep2);
 						}
 
+						parser.walkExpression(expr.callee);
 						for (const key of Object.keys(expressions)) {
 							if (expressions[key]) parser.walkExpression(expressions[key]);
 						}
@@ -340,7 +365,9 @@ class WorkerPlugin {
 								(call ? parser.hooks.call : parser.hooks.new)
 									.for(harmonySpecifierTag)
 									.tap("WorkerPlugin", expr => {
-										const settings = /** @type {HarmonySettings} */ (parser.currentTagData);
+										const settings = /** @type {HarmonySettings} */ (
+											parser.currentTagData
+										);
 										if (
 											!settings ||
 											settings.source !== source ||

package/lib/hmr/LazyCompilationPlugin.js

@@ -196,8 +196,9 @@ class LazyCompilationProxyModule extends Module {
 		const sources = new Map();
 		const runtimeRequirements = new Set();
 		runtimeRequirements.add(RuntimeGlobals.module);
-		const clientDep = /** @type {CommonJsRequireDependency} */ (this
-			.dependencies[0]);
+		const clientDep = /** @type {CommonJsRequireDependency} */ (
+			this.dependencies[0]
+		);
 		const clientModule = moduleGraph.getModule(clientDep);
 		const block = this.blocks[0];
 		const client = Template.asString([
@@ -290,8 +291,9 @@ class LazyCompilationDependencyFactory extends ModuleFactory {
 	 * @returns {void}
 	 */
 	create(data, callback) {
-		const dependency = /** @type {LazyCompilationDependency} */ (data
-			.dependencies[0]);
+		const dependency = /** @type {LazyCompilationDependency} */ (
+			data.dependencies[0]
+		);
 		callback(null, {
 			module: dependency.proxyModule.originalModule
 		});

package/lib/ids/HashedModuleIdsPlugin.js

@@ -63,9 +63,9 @@ class HashedModuleIdsPlugin {
 					const ident = getFullModuleName(module, context, compiler.root);
 					const hash = createHash(options.hashFunction);
 					hash.update(ident || "");
-					const hashId = /** @type {string} */ (hash.digest(
-						options.hashDigest
-					));
+					const hashId = /** @type {string} */ (
+						hash.digest(options.hashDigest)
+					);
 					let len = options.hashDigestLength;
 					while (usedIds.has(hashId.substr(0, len))) len++;
 					const moduleId = hashId.substr(0, len);

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -98,9 +98,8 @@ class OccurrenceModuleIdsPlugin {
 						connections
 					] of moduleGraph.getIncomingConnectionsByOriginModule(module)) {
 						if (!originModule) continue;
-						const chunkModules = chunkGraph.getNumberOfModuleChunks(
-							originModule
-						);
+						const chunkModules =
+							chunkGraph.getNumberOfModuleChunks(originModule);
 						for (const c of connections) {
 							if (!c.isTargetActive(undefined)) continue;
 							if (!c.dependency) continue;

package/lib/index.js

@@ -50,9 +50,11 @@ const memoize = require("./util/memoize");
  */
 const lazyFunction = factory => {
 	const fac = memoize(factory);
-	const f = /** @type {any} */ ((...args) => {
-		return fac()(...args);
-	});
+	const f = /** @type {any} */ (
+		(...args) => {
+			return fac()(...args);
+		}
+	);
 	return /** @type {T} */ (f);
 };
 

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -47,9 +47,8 @@ class ArrayPushCallbackChunkFormatPlugin {
 							chunk instanceof HotUpdateChunk ? chunk : null;
 						const globalObject = runtimeTemplate.outputOptions.globalObject;
 						const source = new ConcatSource();
-						const runtimeModules = chunkGraph.getChunkRuntimeModulesInOrder(
-							chunk
-						);
+						const runtimeModules =
+							chunkGraph.getChunkRuntimeModulesInOrder(chunk);
 						if (hotUpdateChunk) {
 							const hotUpdateGlobal =
 								runtimeTemplate.outputOptions.hotUpdateGlobal;
@@ -83,9 +82,8 @@ class ArrayPushCallbackChunkFormatPlugin {
 								chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
 							);
 							if (runtimeModules.length > 0 || entries.length > 0) {
-								const strictBailout = hooks.strictRuntimeBailout.call(
-									renderContext
-								);
+								const strictBailout =
+									hooks.strictRuntimeBailout.call(renderContext);
 								const runtime = new ConcatSource(
 									(runtimeTemplate.supportsArrowFunction()
 										? "__webpack_require__ =>"

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -51,9 +51,8 @@ class CommonJsChunkFormatPlugin {
 						source.add(`exports.modules = `);
 						source.add(modules);
 						source.add(";\n");
-						const runtimeModules = chunkGraph.getChunkRuntimeModulesInOrder(
-							chunk
-						);
+						const runtimeModules =
+							chunkGraph.getChunkRuntimeModulesInOrder(chunk);
 						if (runtimeModules.length > 0) {
 							source.add("exports.runtime =\n");
 							source.add(

package/lib/javascript/JavascriptGenerator.js

@@ -180,7 +180,9 @@ class JavascriptGenerator extends Generator {
 	 * @returns {void}
 	 */
 	sourceDependency(module, dependency, initFragments, source, generateContext) {
-		const constructor = /** @type {new (...args: any[]) => Dependency} */ (dependency.constructor);
+		const constructor = /** @type {new (...args: any[]) => Dependency} */ (
+			dependency.constructor
+		);
 		const template = generateContext.dependencyTemplates.get(constructor);
 		if (!template) {
 			throw new Error(

package/lib/javascript/JavascriptModulesPlugin.js

@@ -228,10 +228,11 @@ class JavascriptModulesPlugin {
 							chunk instanceof HotUpdateChunk ? chunk : null;
 
 						let render;
-						const filenameTemplate = JavascriptModulesPlugin.getChunkFilenameTemplate(
-							chunk,
-							outputOptions
-						);
+						const filenameTemplate =
+							JavascriptModulesPlugin.getChunkFilenameTemplate(
+								chunk,
+								outputOptions
+							);
 						if (hotUpdateChunk) {
 							render = () =>
 								this.renderChunk(
@@ -394,9 +395,8 @@ class JavascriptModulesPlugin {
 				compilation.hooks.executeModule.tap(
 					"JavascriptModulesPlugin",
 					(options, context) => {
-						const source = options.codeGenerationResult.sources.get(
-							"javascript"
-						);
+						const source =
+							options.codeGenerationResult.sources.get("javascript");
 						if (source === undefined) return;
 						const { module, moduleObject } = options;
 						const code = source.source();
@@ -468,12 +468,8 @@ class JavascriptModulesPlugin {
 	 * @returns {Source} the newly generated source from rendering
 	 */
 	renderModule(module, renderContext, hooks, factory) {
-		const {
-			chunk,
-			chunkGraph,
-			runtimeTemplate,
-			codeGenerationResults
-		} = renderContext;
+		const { chunk, chunkGraph, runtimeTemplate, codeGenerationResults } =
+			renderContext;
 		try {
 			const moduleSource = codeGenerationResults.getSource(
 				module,
@@ -699,9 +695,8 @@ class JavascriptModulesPlugin {
 			);
 		}
 
-		const runtimeModules = renderContext.chunkGraph.getChunkRuntimeModulesInOrder(
-			chunk
-		);
+		const runtimeModules =
+			renderContext.chunkGraph.getChunkRuntimeModulesInOrder(chunk);
 
 		if (runtimeModules.length > 0) {
 			source.add(
@@ -985,9 +980,8 @@ class JavascriptModulesPlugin {
 			if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
 				/** @type {string[]} */
 				const buf2 = [];
-				const runtimeRequirements = chunkGraph.getTreeRuntimeRequirements(
-					chunk
-				);
+				const runtimeRequirements =
+					chunkGraph.getTreeRuntimeRequirements(chunk);
 				buf2.push("// Load entry module and return exports");
 				let i = chunkGraph.getNumberOfEntryModules(chunk);
 				for (const [
@@ -1044,10 +1038,8 @@ class JavascriptModulesPlugin {
 					}
 					i--;
 					const moduleId = chunkGraph.getModuleId(entryModule);
-					const entryRuntimeRequirements = chunkGraph.getModuleRuntimeRequirements(
-						entryModule,
-						chunk.runtime
-					);
+					const entryRuntimeRequirements =
+						chunkGraph.getModuleRuntimeRequirements(entryModule, chunk.runtime);
 					let moduleIdExpr = JSON.stringify(moduleId);
 					if (runtimeRequirements.has(RuntimeGlobals.entryModuleId)) {
 						moduleIdExpr = `${RuntimeGlobals.entryModuleId} = ${moduleIdExpr}`;

package/lib/javascript/JavascriptParser.js

@@ -3336,8 +3336,10 @@ class JavascriptParser extends Parser {
 				if (expr.superClass && !this.isPure(expr.superClass, expr.range[0])) {
 					return false;
 				}
-				const items = /** @type {(MethodDefinitionNode | PropertyDefinitionNode)[]} */ (expr
-					.body.body);
+				const items =
+					/** @type {(MethodDefinitionNode | PropertyDefinitionNode)[]} */ (
+						expr.body.body
+					);
 				return items.every(
 					item =>
 						(!item.computed ||
@@ -3623,10 +3625,8 @@ class JavascriptParser extends Parser {
 				let callee = object.callee;
 				let rootMembers = EMPTY_ARRAY;
 				if (callee.type === "MemberExpression") {
-					({
-						object: callee,
-						members: rootMembers
-					} = this.extractMemberExpressionChain(callee));
+					({ object: callee, members: rootMembers } =
+						this.extractMemberExpressionChain(callee));
 				}
 				const rootName = getRootName(callee);
 				if (!rootName) return undefined;
@@ -3729,5 +3729,7 @@ class JavascriptParser extends Parser {
 
 module.exports = JavascriptParser;
 module.exports.ALLOWED_MEMBER_TYPES_ALL = ALLOWED_MEMBER_TYPES_ALL;
-module.exports.ALLOWED_MEMBER_TYPES_EXPRESSION = ALLOWED_MEMBER_TYPES_EXPRESSION;
-module.exports.ALLOWED_MEMBER_TYPES_CALL_EXPRESSION = ALLOWED_MEMBER_TYPES_CALL_EXPRESSION;
+module.exports.ALLOWED_MEMBER_TYPES_EXPRESSION =
+	ALLOWED_MEMBER_TYPES_EXPRESSION;
+module.exports.ALLOWED_MEMBER_TYPES_CALL_EXPRESSION =
+	ALLOWED_MEMBER_TYPES_CALL_EXPRESSION;

package/lib/library/AssignLibraryPlugin.js

@@ -24,8 +24,10 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../util/Hash")} Hash */
 /** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
 
-const KEYWORD_REGEX = /^(await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|super|switch|static|this|throw|try|true|typeof|var|void|while|with|yield)$/;
-const IDENTIFIER_REGEX = /^[\p{L}\p{Nl}$_][\p{L}\p{Nl}$\p{Mn}\p{Mc}\p{Nd}\p{Pc}]*$/iu;
+const KEYWORD_REGEX =
+	/^(await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|super|switch|static|this|throw|try|true|typeof|var|void|while|with|yield)$/;
+const IDENTIFIER_REGEX =
+	/^[\p{L}\p{Nl}$_][\p{L}\p{Nl}$\p{Mn}\p{Mc}\p{Nd}\p{Pc}]*$/iu;
 
 /**
  * Validates the library name by checking for keywords and valid characters

package/lib/node/NodeWatchFileSystem.js

@@ -70,11 +70,12 @@ class NodeWatchFileSystem {
 		}
 		this.watcher.once("aggregated", (changes, removals) => {
 			if (this.inputFileSystem && this.inputFileSystem.purge) {
+				const fs = this.inputFileSystem;
 				for (const item of changes) {
-					this.inputFileSystem.purge(item);
+					fs.purge(item);
 				}
 				for (const item of removals) {
-					this.inputFileSystem.purge(item);
+					fs.purge(item);
 				}
 			}
 			const times = this.watcher.getTimeInfoEntries();
@@ -99,10 +100,24 @@ class NodeWatchFileSystem {
 				}
 			},
 			getAggregatedRemovals: () => {
-				return this.watcher && this.watcher.aggregatedRemovals;
+				const items = this.watcher && this.watcher.aggregatedRemovals;
+				if (items && this.inputFileSystem && this.inputFileSystem.purge) {
+					const fs = this.inputFileSystem;
+					for (const item of items) {
+						fs.purge(item);
+					}
+				}
+				return items;
 			},
 			getAggregatedChanges: () => {
-				return this.watcher && this.watcher.aggregatedChanges;
+				const items = this.watcher && this.watcher.aggregatedChanges;
+				if (items && this.inputFileSystem && this.inputFileSystem.purge) {
+					const fs = this.inputFileSystem;
+					for (const item of items) {
+						fs.purge(item);
+					}
+				}
+				return items;
 			},
 			getFileTimeInfoEntries: () => {
 				if (this.watcher) {

package/lib/optimize/AggressiveSplittingPlugin.js

@@ -109,10 +109,11 @@ class AggressiveSplittingPlugin {
 						// Precompute stuff
 						const nameToModuleMap = new Map();
 						const moduleToNameMap = new Map();
-						const makePathsRelative = identifierUtils.makePathsRelative.bindContextCache(
-							compiler.context,
-							compiler.root
-						);
+						const makePathsRelative =
+							identifierUtils.makePathsRelative.bindContextCache(
+								compiler.context,
+								compiler.root
+							);
 						for (const m of compilation.modules) {
 							const name = makePathsRelative(m.identifier());
 							nameToModuleMap.set(name, m);