webpack 5.110.3 → 5.111.0

package/lib/ids/HashedModuleIdsPlugin.js

@@ -10,6 +10,7 @@ const {
 	compareModulesByPreOrderIndexOrIdentifier
 } = require("../util/comparators");
 const createHash = require("../util/createHash");
+const { fileUrlToPath } = require("../util/identifier");
 const {
 	getFullModuleName,
 	getUsedModuleIdsAndModules
@@ -58,7 +59,7 @@ class HashedModuleIdsPlugin {
 			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const chunkGraph = compilation.chunkGraph;
 				const context = this.options.context
-					? this.options.context
+					? fileUrlToPath(this.options.context)
 					: compiler.context;
 
 				const [usedIds, modules] = getUsedModuleIdsAndModules(compilation);

package/lib/index.js

@@ -242,6 +242,9 @@ module.exports = mergeExports(fn, {
 	get ContextReplacementPlugin() {
 		return require("./ContextReplacementPlugin");
 	},
+	get CopyPlugin() {
+		return require("./CopyPlugin");
+	},
 	get DefinePlugin() {
 		return require("./DefinePlugin");
 	},

package/lib/javascript/JavascriptModule.js

@@ -19,6 +19,7 @@ const makeSerializable = require("../util/makeSerializable");
  * Defines the build info properties specific to javascript modules.
  * @typedef {object} KnownJavascriptModuleBuildInfo
  * @property {string=} moduleConcatenationBailout using in CommonJs
+ * @property {string=} moduleConcatenationRootBailout what rules the module out as a concatenation root, while it may still be an inner module
  * @property {boolean=} needCreateRequire using in APIPlugin
  * @property {boolean=} usingPublicPathOverride module reassigns `__webpack_public_path__` at runtime, using in APIPlugin
  * @property {Set<string>=} pureFunctions names of locally declared functions known to be free of side effects

package/lib/javascript/JavascriptModulesPlugin.js

@@ -57,27 +57,12 @@ const JavascriptGenerator = require("./JavascriptGenerator");
 const JavascriptModule = require("./JavascriptModule");
 const JavascriptParser = require("./JavascriptParser");
 const analyzeScope = require("./ScopeAnalyzer");
+const { renderAwaitedEntries } = require("./StartupHelpers");
+const { releaseParserCaches } = require("./syntax");
 
 /**
  * @import {
- * 	Program,
- * 	Node,
- * 	Identifier,
- * 	CatchClause,
- * 	ClassDeclaration,
- * 	ClassExpression,
- * 	FunctionDeclaration,
- * 	FunctionExpression,
- * 	ArrowFunctionExpression,
- * 	VariableDeclarator,
- * 	VariableDeclaration,
- * 	ImportDeclaration,
- * 	ImportSpecifier,
- * 	ImportDefaultSpecifier,
- * 	ImportNamespaceSpecifier,
- * 	AssignmentExpression,
- * 	ForInStatement,
- * 	ForOfStatement
+ * 	Program
  * } from "estree"
  */
 /** @import { Source } from "webpack-sources" */
@@ -470,6 +455,10 @@ class JavascriptModulesPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		// the parser's shared string caches only pay off while modules parse —
+		// drop them when the build ends so an idle process retains no parser state
+		compiler.hooks.done.tap(PLUGIN_NAME, releaseParserCaches);
+		compiler.hooks.failed.tap(PLUGIN_NAME, releaseParserCaches);
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
@@ -1680,8 +1669,27 @@ class JavascriptModulesPlugin {
 						continue;
 					}
 				}
-				// An async entry is not awaited here: that needs top-level `await`,
-				// gated on an option held back from the patch release (revert #21881).
+				const entryOptions = chunk.getEntryOptions();
+				const library =
+					entryOptions && entryOptions.library !== undefined
+						? entryOptions.library
+						: runtimeTemplate.outputOptions.library;
+				// A module library awaits the entry itself, in `ModuleLibraryPlugin`.
+				const awaitedByLibrary =
+					library !== undefined && library.type === "module";
+				// `await` is legal only at an ESM chunk's top level, never in the
+				// startup function below, and only where the target parses it.
+				const canAwaitEntry =
+					runtimeTemplate.isModule() &&
+					runtimeTemplate.supportsTopLevelAwait() &&
+					!awaitedByLibrary &&
+					!runtimeRequirements.has(RuntimeGlobals.startup) &&
+					!(
+						runtimeRequirements.has(RuntimeGlobals.startupOnlyBefore) &&
+						runtimeRequirements.has(RuntimeGlobals.startupOnlyAfter)
+					);
+				/** @type {string[]} */
+				const awaitedEntries = [];
 				let i = jsEntries.length;
 				for (const [entryModule, entrypoint] of jsEntries) {
 					const chunks =
@@ -1798,21 +1806,40 @@ class JavascriptModulesPlugin {
 					// reassignment is allowed.
 					const exportsDecl = runtimeTemplate.renderLet();
 					if (chunks.length > 0) {
+						const awaitEntry =
+							canAwaitEntry && moduleGraph.isAsync(entryModule);
+						const target =
+							i === 0
+								? RuntimeGlobals.exports
+								: `${RuntimeGlobals.exports}_${i}`;
+						// The wrapper hands back nothing until the flush below runs the
+						// entry, so an awaited one is caught by the entry call itself.
+						if (awaitEntry && i !== 0) buf2.push(`${exportsDecl} ${target};`);
+						const entryCall = `${RuntimeGlobals.require}(${moduleIdExpr})`;
 						buf2.push(
 							`${i === 0 ? `${exportsDecl} ${RuntimeGlobals.exports} = ` : ""}${
 								RuntimeGlobals.onChunksLoaded
 							}(undefined, ${JSON.stringify(
 								chunks.map((c) => c.id)
 							)}, ${runtimeTemplate.returningFunction(
-								`${RuntimeGlobals.require}(${moduleIdExpr})`
+								awaitEntry ? `(${target} = ${entryCall})` : entryCall
 							)})`
 						);
+						if (awaitEntry) awaitedEntries.push(target);
 					} else if (useRequire) {
+						// An async entry nobody awaits settles after the bundle did,
+						// which orphans its rejection.
+						const awaitEntry =
+							canAwaitEntry && moduleGraph.isAsync(entryModule);
+						const target =
+							i === 0
+								? RuntimeGlobals.exports
+								: `${RuntimeGlobals.exports}_${i}`;
+						const needsDecl = i === 0 || awaitEntry;
 						buf2.push(
-							`${i === 0 ? `${exportsDecl} ${RuntimeGlobals.exports} = ` : ""}${
-								RuntimeGlobals.require
-							}(${moduleIdExpr});`
+							`${needsDecl ? `${exportsDecl} ${target} = ` : ""}${RuntimeGlobals.require}(${moduleIdExpr});`
 						);
+						if (awaitEntry) awaitedEntries.push(target);
 					} else {
 						if (i === 0) {
 							buf2.push(`${exportsDecl} ${RuntimeGlobals.exports} = {};`);
@@ -1855,6 +1882,7 @@ class JavascriptModulesPlugin {
 						`${RuntimeGlobals.exports} = ${RuntimeGlobals.onChunksLoaded}(${RuntimeGlobals.exports});`
 					);
 				}
+				buf2.push(...renderAwaitedEntries(awaitedEntries));
 				if (
 					runtimeRequirements.has(RuntimeGlobals.startup) ||
 					(runtimeRequirements.has(RuntimeGlobals.startupOnlyBefore) &&