webpack 5.37.0 → 5.39.0

package/README.md

@@ -169,17 +169,14 @@ or are automatically applied via regex from your webpack configuration.
 
 #### Transpiling
 
-|                                                                            Name                                                                            |     Status     |  Install Size   | Description                                                                                          |
-| :--------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------: | :-------------: | :--------------------------------------------------------------------------------------------------- |
-| <a href="https://github.com/babel/babel-loader"><img width="48" height="48" title="babel-loader" src="https://worldvectorlogo.com/logos/babel-10.svg"></a> |  ![babel-npm]  |  ![babel-size]  | Loads ES2015+ code and transpiles to ES5 using <a href="https://github.com/babel/babel">Babel</a>    |
-|       <a href="https://github.com/jupl/traceur-loader"><img width="48" height="48" src="https://google.github.com/traceur-compiler/logo/tc.svg"></a>       | ![traceur-npm] | ![traceur-size] | Loads ES2015+ code and transpiles to ES5 using [Traceur](https://github.com/google/traceur-compiler) |
-|  <a href="https://github.com/TypeStrong/ts-loader"><img width="48" height="48" src="https://cdn.rawgit.com/Microsoft/TypeScript/master/doc/logo.svg"></a>  |  ![type-npm]   |  ![type-size]   | Loads TypeScript like JavaScript                                                                     |
-|    <a href="https://github.com/webpack-contrib/coffee-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>    | ![coffee-npm]  | ![coffee-size]  | Loads CoffeeScript like JavaScript                                                                   |
+|                                                                            Name                                                                            |    Status     |  Install Size  | Description                                                                                       |
+| :--------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------: | :------------: | :------------------------------------------------------------------------------------------------ |
+| <a href="https://github.com/babel/babel-loader"><img width="48" height="48" title="babel-loader" src="https://worldvectorlogo.com/logos/babel-10.svg"></a> | ![babel-npm]  | ![babel-size]  | Loads ES2015+ code and transpiles to ES5 using <a href="https://github.com/babel/babel">Babel</a> |
+|  <a href="https://github.com/TypeStrong/ts-loader"><img width="48" height="48" src="https://cdn.rawgit.com/Microsoft/TypeScript/master/doc/logo.svg"></a>  |  ![type-npm]  |  ![type-size]  | Loads TypeScript like JavaScript                                                                  |
+|    <a href="https://github.com/webpack-contrib/coffee-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>    | ![coffee-npm] | ![coffee-size] | Loads CoffeeScript like JavaScript                                                                |
 
 [babel-npm]: https://img.shields.io/npm/v/babel-loader.svg
 [babel-size]: https://packagephobia.com/badge?p=babel-loader
-[traceur-npm]: https://img.shields.io/npm/v/traceur-loader.svg
-[traceur-size]: https://packagephobia.com/badge?p=traceur-loader
 [coffee-npm]: https://img.shields.io/npm/v/coffee-loader.svg
 [coffee-size]: https://packagephobia.com/badge?p=coffee-loader
 [type-npm]: https://img.shields.io/npm/v/ts-loader.svg

package/bin/webpack.js

@@ -32,13 +32,28 @@ const runCommand = (command, args) => {
  * @returns {boolean} is the package installed?
  */
 const isInstalled = packageName => {
-	try {
-		require.resolve(packageName);
-
+	if (process.versions.pnp) {
 		return true;
-	} catch (err) {
-		return false;
 	}
+
+	const path = require("path");
+	const fs = require("graceful-fs");
+
+	let dir = __dirname;
+
+	do {
+		try {
+			if (
+				fs.statSync(path.join(dir, "node_modules", packageName)).isDirectory()
+			) {
+				return true;
+			}
+		} catch (_error) {
+			// Nothing
+		}
+	} while (dir !== (dir = path.dirname(dir)));
+
+	return false;
 };
 
 /**

package/lib/AsyncDependencyToInitialChunkError.js

@@ -25,8 +25,6 @@ class AsyncDependencyToInitialChunkError extends WebpackError {
 		this.name = "AsyncDependencyToInitialChunkError";
 		this.module = module;
 		this.loc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/CacheFacade.js

@@ -90,9 +90,9 @@ class MultiItemCache {
 	 * @returns {Promise<void>} promise signals when the value is stored
 	 */
 	storePromise(data) {
-		return Promise.all(
-			this._items.map(item => item.storePromise(data))
-		).then(() => {});
+		return Promise.all(this._items.map(item => item.storePromise(data))).then(
+			() => {}
+		);
 	}
 }
 

package/lib/CaseSensitiveModulesWarning.js

@@ -65,8 +65,6 @@ ${modulesList}`);
 
 		this.name = "CaseSensitiveModulesWarning";
 		this.module = sortedModules[0];
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/Chunk.js

@@ -547,9 +547,8 @@ class Chunk {
 			xor.add(chunkGraph.getModuleHash(m, this.runtime));
 		}
 		xor.updateHash(hash);
-		const entryModules = chunkGraph.getChunkEntryModulesWithChunkGroupIterable(
-			this
-		);
+		const entryModules =
+			chunkGraph.getChunkEntryModulesWithChunkGroupIterable(this);
 		for (const [m, chunkGroup] of entryModules) {
 			hash.update("entry");
 			hash.update(`${chunkGraph.getModuleId(m)}`);
@@ -599,8 +598,12 @@ class Chunk {
 	 */
 	getAllInitialChunks() {
 		const chunks = new Set();
-		for (const group of this.groupsIterable) {
-			for (const c of group.chunks) chunks.add(c);
+		const queue = new Set(this.groupsIterable);
+		for (const group of queue) {
+			if (group.isInitial()) {
+				for (const c of group.chunks) chunks.add(c);
+				for (const g of group.childrenIterable) queue.add(g);
+			}
 		}
 		return chunks;
 	}

package/lib/ChunkRenderError.js

@@ -25,8 +25,6 @@ class ChunkRenderError extends WebpackError {
 		this.details = error.stack;
 		this.file = file;
 		this.chunk = chunk;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/CodeGenerationError.js

@@ -23,8 +23,6 @@ class CodeGenerationError extends WebpackError {
 		this.message = error.message;
 		this.details = error.stack;
 		this.module = module;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/CommentCompilationWarning.js

@@ -22,8 +22,6 @@ class CommentCompilationWarning extends WebpackError {
 		this.name = "CommentCompilationWarning";
 
 		this.loc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/Compilation.js

@@ -510,7 +510,8 @@ class Compilation {
 		 * @returns {FakeHook<Pick<AsyncSeriesHook<T>, "tap" | "tapAsync" | "tapPromise" | "name">>} fake hook which redirects
 		 */
 		const createProcessAssetsHook = (name, stage, getArgs, code) => {
-			const errorMessage = reason => `Can't automatically convert plugin using Compilation.hooks.${name} to Compilation.hooks.processAssets because ${reason}.
+			const errorMessage =
+				reason => `Can't automatically convert plugin using Compilation.hooks.${name} to Compilation.hooks.processAssets because ${reason}.
 BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a single Compilation.hooks.processAssets hook.`;
 			const getOptions = options => {
 				if (typeof options === "string") options = { name: options };
@@ -1615,9 +1616,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 					let creatingModuleDuringBuildSet = undefined;
 					if (!recursive && this.buildQueue.isProcessing(originModule)) {
 						// Track build dependency
-						creatingModuleDuringBuildSet = this.creatingModuleDuringBuild.get(
-							originModule
-						);
+						creatingModuleDuringBuildSet =
+							this.creatingModuleDuringBuild.get(originModule);
 						if (creatingModuleDuringBuildSet === undefined) {
 							creatingModuleDuringBuildSet = new Set();
 							this.creatingModuleDuringBuild.set(
@@ -1746,11 +1746,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 							module: result
 						};
 					}
-					const {
-						fileDependencies,
-						contextDependencies,
-						missingDependencies
-					} = result;
+					const { fileDependencies, contextDependencies, missingDependencies } =
+						result;
 					if (fileDependencies) {
 						this.fileDependencies.addAll(fileDependencies);
 					}
@@ -2316,7 +2313,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 			}
 		] of this.entries) {
 			if (dependOn && runtime) {
-				const err = new WebpackError(`Entrypoint '${name}' has 'dependOn' and 'runtime' specified. This is not valid.
+				const err =
+					new WebpackError(`Entrypoint '${name}' has 'dependOn' and 'runtime' specified. This is not valid.
 Entrypoints that depend on other entrypoints do not have their own runtime.
 They will use the runtime(s) from referenced entrypoints instead.
 Remove the 'runtime' option from the entrypoint.`);
@@ -2357,11 +2355,12 @@ Remove the 'runtime' option from the entrypoint.`);
 				let chunk = this.namedChunks.get(runtime);
 				if (chunk) {
 					if (!runtimeChunks.has(chunk)) {
-						const err = new WebpackError(`Entrypoint '${name}' has a 'runtime' option which points to another entrypoint named '${runtime}'.
+						const err =
+							new WebpackError(`Entrypoint '${name}' has a 'runtime' option which points to another entrypoint named '${runtime}'.
 It's not valid to use other entrypoints as runtime chunk.
 Did you mean to use 'dependOn: ${JSON.stringify(
-							runtime
-						)}' instead to allow using entrypoint '${name}' within the runtime of entrypoint '${runtime}'? For this '${runtime}' must always be loaded when '${name}' is used.
+								runtime
+							)}' instead to allow using entrypoint '${name}' within the runtime of entrypoint '${runtime}'? For this '${runtime}' must always be loaded when '${name}' is used.
 Or do you want to use the entrypoints '${name}' and '${runtime}' independently on the same page with a shared runtime? In this case give them both the same value for the 'runtime' option. It must be a name not already used by an entrypoint.`);
 						const entryChunk = entry.getEntrypointChunk();
 						err.chunk = entryChunk;
@@ -2621,12 +2620,8 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	_runCodeGenerationJobs(jobs, callback) {
 		let statModulesFromCache = 0;
 		let statModulesGenerated = 0;
-		const {
-			chunkGraph,
-			moduleGraph,
-			dependencyTemplates,
-			runtimeTemplate
-		} = this;
+		const { chunkGraph, moduleGraph, dependencyTemplates, runtimeTemplate } =
+			this;
 		const results = this.codeGenerationResults;
 		const errors = [];
 		asyncLib.eachLimit(
@@ -2773,17 +2768,15 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		chunkGraphEntries = this._getChunkGraphEntries()
 	} = {}) {
 		const context = { chunkGraph, codeGenerationResults };
-		const additionalModuleRuntimeRequirements = this.hooks
-			.additionalModuleRuntimeRequirements;
+		const additionalModuleRuntimeRequirements =
+			this.hooks.additionalModuleRuntimeRequirements;
 		const runtimeRequirementInModule = this.hooks.runtimeRequirementInModule;
 		for (const module of modules) {
 			if (chunkGraph.getNumberOfModuleChunks(module) > 0) {
 				for (const runtime of chunkGraph.getModuleRuntimes(module)) {
 					let set;
-					const runtimeRequirements = codeGenerationResults.getRuntimeRequirements(
-						module,
-						runtime
-					);
+					const runtimeRequirements =
+						codeGenerationResults.getRuntimeRequirements(module, runtime);
 					if (runtimeRequirements && runtimeRequirements.size > 0) {
 						set = new Set(runtimeRequirements);
 					} else if (additionalModuleRuntimeRequirements.isUsed()) {
@@ -2823,9 +2816,8 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		for (const treeEntry of chunkGraphEntries) {
 			const set = new Set();
 			for (const chunk of treeEntry.getAllReferencedChunks()) {
-				const runtimeRequirements = chunkGraph.getChunkRuntimeRequirements(
-					chunk
-				);
+				const runtimeRequirements =
+					chunkGraph.getChunkRuntimeRequirements(chunk);
 				for (const r of runtimeRequirements) set.add(r);
 			}
 
@@ -3223,9 +3215,9 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 			runtime,
 			runtimeTemplate
 		});
-		const moduleHashDigest = /** @type {string} */ (moduleHash.digest(
-			hashDigest
-		));
+		const moduleHashDigest = /** @type {string} */ (
+			moduleHash.digest(hashDigest)
+		);
 		chunkGraph.setModuleHashes(
 			module,
 			runtime,
@@ -3354,10 +3346,11 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 				}
 			}
 			circularRuntimeChunkInfo.sort(compareSelect(i => i.chunk, byId));
-			const err = new WebpackError(`Circular dependency between chunks with runtime (${Array.from(
-				circularRuntimeChunkInfo,
-				c => c.chunk.name || c.chunk.id
-			).join(", ")})
+			const err =
+				new WebpackError(`Circular dependency between chunks with runtime (${Array.from(
+					circularRuntimeChunkInfo,
+					c => c.chunk.name || c.chunk.id
+				).join(", ")})
 This prevents using hashes of each other and should be avoided.`);
 			err.chunk = circularRuntimeChunkInfo[0].chunk;
 			this.warnings.push(err);
@@ -3420,15 +3413,14 @@ This prevents using hashes of each other and should be avoided.`);
 					moduleGraph: this.moduleGraph,
 					runtimeTemplate: this.runtimeTemplate
 				});
-				const chunkHashDigest = /** @type {string} */ (chunkHash.digest(
-					hashDigest
-				));
+				const chunkHashDigest = /** @type {string} */ (
+					chunkHash.digest(hashDigest)
+				);
 				hash.update(chunkHashDigest);
 				chunk.hash = chunkHashDigest;
 				chunk.renderedHash = chunk.hash.substr(0, hashDigestLength);
-				const fullHashModules = chunkGraph.getChunkFullHashModulesIterable(
-					chunk
-				);
+				const fullHashModules =
+					chunkGraph.getChunkFullHashModulesIterable(chunk);
 				if (fullHashModules) {
 					fullHashChunks.add(chunk);
 				} else {
@@ -3459,9 +3451,9 @@ This prevents using hashes of each other and should be avoided.`);
 					runtime: chunk.runtime,
 					runtimeTemplate
 				});
-				const moduleHashDigest = /** @type {string} */ (moduleHash.digest(
-					hashDigest
-				));
+				const moduleHashDigest = /** @type {string} */ (
+					moduleHash.digest(hashDigest)
+				);
 				const oldHash = chunkGraph.getModuleHash(module, chunk.runtime);
 				chunkGraph.setModuleHashes(
 					module,
@@ -3474,9 +3466,9 @@ This prevents using hashes of each other and should be avoided.`);
 			const chunkHash = createHash(hashFunction);
 			chunkHash.update(chunk.hash);
 			chunkHash.update(this.hash);
-			const chunkHashDigest = /** @type {string} */ (chunkHash.digest(
-				hashDigest
-			));
+			const chunkHashDigest = /** @type {string} */ (
+				chunkHash.digest(hashDigest)
+			);
 			chunk.hash = chunkHashDigest;
 			chunk.renderedHash = chunk.hash.substr(0, hashDigestLength);
 			this.hooks.contentHash.call(chunk);
@@ -4051,11 +4043,8 @@ This prevents using hashes of each other and should be avoided.`);
 				// Create new chunk graph, chunk and entrypoint for the build time execution
 				const chunkGraph = new ChunkGraph(this.moduleGraph);
 				const runtime = "build time";
-				const {
-					hashFunction,
-					hashDigest,
-					hashDigestLength
-				} = this.outputOptions;
+				const { hashFunction, hashDigest, hashDigestLength } =
+					this.outputOptions;
 				const runtimeTemplate = this.runtimeTemplate;
 
 				const chunk = new Chunk("build time chunk");
@@ -4151,9 +4140,8 @@ This prevents using hashes of each other and should be avoided.`);
 					});
 					this.chunkGraph = old;
 
-					const runtimeModules = chunkGraph.getChunkRuntimeModulesIterable(
-						chunk
-					);
+					const runtimeModules =
+						chunkGraph.getChunkRuntimeModulesIterable(chunk);
 
 					// Hash runtime modules
 					for (const module of runtimeModules) {

package/lib/Compiler.js

@@ -230,6 +230,8 @@ class Compiler {
 		this.fileTimestamps = undefined;
 		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
 		this.contextTimestamps = undefined;
+		/** @type {number} */
+		this.fsStartTime = undefined;
 
 		/** @type {ResolverFactory} */
 		this.resolverFactory = new ResolverFactory();
@@ -590,9 +592,8 @@ class Compiler {
 						allTargetPaths.add(targetPath);
 
 						// check if the target file has already been written by this Compiler
-						const targetFileGeneration = this._assetEmittingWrittenFiles.get(
-							targetPath
-						);
+						const targetFileGeneration =
+							this._assetEmittingWrittenFiles.get(targetPath);
 
 						// create an cache entry for this Source if not already existing
 						let cacheEntry = this._assetEmittingSourceCache.get(source);
@@ -622,7 +623,8 @@ class Compiler {
 									}
 									alreadyWritten();
 								} else {
-									const err = new WebpackError(`Prevent writing to file that only differs in casing or query string from already written file.
+									const err =
+										new WebpackError(`Prevent writing to file that only differs in casing or query string from already written file.
 This will lead to a race-condition and corrupted files on case-insensitive file systems.
 ${targetPath}
 ${other}`);
@@ -952,6 +954,7 @@ ${other}`);
 		childCompiler.removedFiles = this.removedFiles;
 		childCompiler.fileTimestamps = this.fileTimestamps;
 		childCompiler.contextTimestamps = this.contextTimestamps;
+		childCompiler.fsStartTime = this.fsStartTime;
 		childCompiler.cache = this.cache;
 		childCompiler.compilerPath = `${this.compilerPath}${compilerName}|${compilerIndex}|`;
 

package/lib/ConcatenationScope.js

@@ -7,7 +7,8 @@
 
 /** @typedef {import("./Module")} Module */
 
-const MODULE_REFERENCE_REGEXP = /^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(?:_asiSafe(\d))?__$/;
+const MODULE_REFERENCE_REGEXP =
+	/^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(?:_asiSafe(\d))?__$/;
 
 const DEFAULT_EXPORT = "__WEBPACK_DEFAULT_EXPORT__";
 const NAMESPACE_OBJECT_EXPORT = "__WEBPACK_NAMESPACE_OBJECT__";

package/lib/ConcurrentCompilationError.js

@@ -14,7 +14,5 @@ module.exports = class ConcurrentCompilationError extends WebpackError {
 		this.name = "ConcurrentCompilationError";
 		this.message =
 			"You ran Webpack twice. Each instance only supports a single concurrent compilation at a time.";
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 };

package/lib/ContextModule.js

@@ -54,6 +54,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {RegExp=} include
  * @property {RegExp=} exclude
  * @property {RawChunkGroupOptions=} groupOptions
+ * @property {string=} typePrefix
  * @property {string=} category
  * @property {string[][]=} referencedExports exports referenced from modules (won't be mangled)
  */
@@ -577,7 +578,7 @@ class ContextModule extends Module {
 		fakeMapDataExpression = "fakeMap[id]"
 	) {
 		if (typeof fakeMap === "number") {
-			return `return ${this.getReturn(fakeMap)};`;
+			return `return ${this.getReturn(fakeMap, asyncModule)};`;
 		}
 		return `return ${
 			RuntimeGlobals.createFakeNamespaceObject
@@ -1016,9 +1017,9 @@ module.exports = webpackEmptyAsyncContext;`;
 			this.getSource(this.getSourceString(this.options.mode, context))
 		);
 		const set = new Set();
-		const allDeps = /** @type {ContextElementDependency[]} */ (this.dependencies.concat(
-			this.blocks.map(b => b.dependencies[0])
-		));
+		const allDeps = /** @type {ContextElementDependency[]} */ (
+			this.dependencies.concat(this.blocks.map(b => b.dependencies[0]))
+		);
 		set.add(RuntimeGlobals.module);
 		set.add(RuntimeGlobals.hasOwnProperty);
 		if (allDeps.length > 0) {

package/lib/ContextModuleFactory.js

@@ -273,7 +273,8 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 			include,
 			exclude,
 			referencedExports,
-			category
+			category,
+			typePrefix
 		} = options;
 		if (!regExp || !resource) return callback(null, []);
 
@@ -346,6 +347,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 													const dep = new ContextElementDependency(
 														obj.request + resourceQuery + resourceFragment,
 														obj.request,
+														typePrefix,
 														category,
 														referencedExports
 													);

package/lib/ContextReplacementPlugin.js

@@ -104,9 +104,10 @@ class ContextReplacementPlugin {
 						result.regExp = newContentRegExp;
 					}
 					if (typeof newContentCreateContextMap === "function") {
-						result.resolveDependencies = createResolveDependenciesFromContextMap(
-							newContentCreateContextMap
-						);
+						result.resolveDependencies =
+							createResolveDependenciesFromContextMap(
+								newContentCreateContextMap
+							);
 					}
 					if (typeof newContentCallback === "function") {
 						const origResource = result.resource;

package/lib/DefinePlugin.js

@@ -89,9 +89,9 @@ class RuntimeValue {
 			module: parser.state.module,
 			key,
 			get version() {
-				return /** @type {string} */ (valueCacheVersions.get(
-					VALUE_DEP_PREFIX + key
-				));
+				return /** @type {string} */ (
+					valueCacheVersions.get(VALUE_DEP_PREFIX + key)
+				);
 			}
 		});
 	}
@@ -286,11 +286,13 @@ class DefinePlugin {
 				);
 				const { runtimeTemplate } = compilation;
 
-				const mainValue = /** @type {Set<string>} */ (provide(
-					compilation.valueCacheVersions,
-					VALUE_DEP_MAIN,
-					() => new Set()
-				));
+				const mainValue = /** @type {Set<string>} */ (
+					provide(
+						compilation.valueCacheVersions,
+						VALUE_DEP_MAIN,
+						() => new Set()
+					)
+				);
 
 				/**
 				 * Handler
@@ -313,10 +315,12 @@ class DefinePlugin {
 						);
 					};
 
-					const withValueDependency = (key, fn) => (...args) => {
-						addValueDependency(key);
-						return fn(...args);
-					};
+					const withValueDependency =
+						(key, fn) =>
+						(...args) => {
+							addValueDependency(key);
+							return fn(...args);
+						};
 
 					/**
 					 * Walk definitions

package/lib/DllReferencePlugin.js

@@ -156,8 +156,6 @@ class DllManifestError extends WebpackError {
 
 		this.name = "DllManifestError";
 		this.message = `Dll manifest ${filename}\n${message}`;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/EntryPlugin.js

@@ -41,10 +41,10 @@ class EntryPlugin {
 			}
 		);
 
-		compiler.hooks.make.tapAsync("EntryPlugin", (compilation, callback) => {
-			const { entry, options, context } = this;
+		const { entry, options, context } = this;
+		const dep = EntryPlugin.createDependency(entry, options);
 
-			const dep = EntryPlugin.createDependency(entry, options);
+		compiler.hooks.make.tapAsync("EntryPlugin", (compilation, callback) => {
 			compilation.addEntry(context, dep, options, err => {
 				callback(err);
 			});

package/lib/EvalSourceMapDevToolPlugin.js

@@ -91,7 +91,9 @@ class EvalSourceMapDevToolPlugin {
 						} else if (m instanceof ConcatenatedModule) {
 							const concatModule = /** @type {ConcatenatedModule} */ (m);
 							if (concatModule.rootModule instanceof NormalModule) {
-								const module = /** @type {NormalModule} */ (concatModule.rootModule);
+								const module = /** @type {NormalModule} */ (
+									concatModule.rootModule
+								);
 								if (!matchModule(module.resource)) {
 									return result(source);
 								}

package/lib/ExportsInfo.js

@@ -137,18 +137,22 @@ class ExportsInfo {
 
 	_sortExportsMap(exports) {
 		if (exports.size > 1) {
-			const entriesInOrder = Array.from(exports.values());
-			if (
-				entriesInOrder.length !== 2 ||
-				entriesInOrder[0].name > entriesInOrder[1].name
-			) {
-				entriesInOrder.sort((a, b) => {
-					return a.name < b.name ? -1 : 1;
-				});
-				exports.clear();
-				for (const entry of entriesInOrder) {
-					exports.set(entry.name, entry);
-				}
+			const namesInOrder = [];
+			for (const entry of exports.values()) {
+				namesInOrder.push(entry.name);
+			}
+			namesInOrder.sort();
+			let i = 0;
+			for (const entry of exports.values()) {
+				const name = namesInOrder[i];
+				if (entry.name !== name) break;
+				i++;
+			}
+			for (; i < namesInOrder.length; i++) {
+				const name = namesInOrder[i];
+				const correctEntry = exports.get(name);
+				exports.delete(name);
+				exports.set(name, correctEntry);
 			}
 		}
 	}
@@ -722,7 +726,7 @@ class ExportsInfo {
 		const otherCanMangleProvide = this._otherExportsInfo.canMangleProvide;
 		const otherTerminalBinding = this._otherExportsInfo.terminalBinding;
 		const exports = [];
-		for (const exportInfo of this._exports.values()) {
+		for (const exportInfo of this.orderedExports) {
 			if (
 				exportInfo.provided !== otherProvided ||
 				exportInfo.canMangleProvide !== otherCanMangleProvide ||
@@ -754,7 +758,9 @@ class ExportsInfo {
 		otherTerminalBinding,
 		exports
 	}) {
+		let wasEmpty = true;
 		for (const exportInfo of this._exports.values()) {
+			wasEmpty = false;
 			exportInfo.provided = otherProvided;
 			exportInfo.canMangleProvide = otherCanMangleProvide;
 			exportInfo.terminalBinding = otherTerminalBinding;
@@ -772,6 +778,7 @@ class ExportsInfo {
 				exportsInfo.restoreProvided(exp.exportsInfo);
 			}
 		}
+		if (wasEmpty) this._exportsAreOrdered = true;
 	}
 }