webpack 5.108.4 → 5.109.0

package/lib/javascript/JavascriptGenerator.js

@@ -10,7 +10,15 @@ const { RawSource, ReplaceSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
 const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
+const RuntimeGlobals = require("../RuntimeGlobals");
+const CommonJsExportsDependency = require("../dependencies/CommonJsExportsDependency");
+const CommonJsFullRequireDependency = require("../dependencies/CommonJsFullRequireDependency");
+const CommonJsRequireDependency = require("../dependencies/CommonJsRequireDependency");
+const CommonJsSelfReferenceDependency = require("../dependencies/CommonJsSelfReferenceDependency");
+const ContextDependency = require("../dependencies/ContextDependency");
 const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
+const ImportDependency = require("../dependencies/ImportDependency");
+const RequireResolveDependency = require("../dependencies/RequireResolveDependency");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Compilation").DependencyConstructor} DependencyConstructor */
@@ -42,6 +50,143 @@ const DEFAULT_SOURCE = {
 // TODO: clean up this file
 // replace with newer constructs
 
+// Runtime requirements whose presence on a presentational dependency means the
+// code references the module/exports objects, which do not exist for an inner
+// concatenated module (e.g. `module.id`, `module.hot`, top-level `this`).
+/** @type {ReadonlySet<string>} */
+const CONCATENATION_INCOMPATIBLE_RUNTIME_REQUIREMENTS = new Set([
+	RuntimeGlobals.module,
+	RuntimeGlobals.moduleId,
+	RuntimeGlobals.moduleLoaded,
+	RuntimeGlobals.moduleCache,
+	RuntimeGlobals.exports,
+	RuntimeGlobals.thisAsExports,
+	RuntimeGlobals.harmonyModuleDecorator,
+	RuntimeGlobals.nodeModuleDecorator
+]);
+
+// A wrapped CommonJS module keeps real `module`/`exports` objects and top-level
+// `this`, so only requirements that need a module object webpack does not
+// synthesize here (id, loaded state, cache, decorators) block wrapping.
+/** @type {ReadonlySet<string>} */
+const WRAPPING_INCOMPATIBLE_RUNTIME_REQUIREMENTS = new Set([
+	RuntimeGlobals.moduleId,
+	RuntimeGlobals.moduleLoaded,
+	RuntimeGlobals.moduleCache,
+	RuntimeGlobals.harmonyModuleDecorator,
+	RuntimeGlobals.nodeModuleDecorator
+]);
+
+/**
+ * Returns the reason a CommonJS module cannot take part in concatenation at
+ * all — neither hoisted (as a "nice" module) nor wrapped. A module passing
+ * this check can be hoisted or wrapped; {@link isCommonJsHoistable} decides
+ * which.
+ * @param {NormalModule} module the module
+ * @returns {string | undefined} reason it can't be concatenated
+ */
+const getCommonJsConcatenationBailoutReason = (module) => {
+	const buildMeta = module.buildMeta;
+	// "flagged"/"default" are hoistable; a dynamic (undefined) exports type is a
+	// reassigned/computed `module.exports`, only reachable by wrapping. Proper ESM
+	// modules ("namespace") never reach this path.
+	if (
+		!buildMeta ||
+		(buildMeta.exportsType !== "flagged" &&
+			buildMeta.exportsType !== "default" &&
+			buildMeta.exportsType !== undefined)
+	) {
+		return "Module is not an ECMAScript module";
+	}
+	// Sloppy-mode modules bail out in ModuleConcatenationPlugin anyway,
+	// so skip the dependency scan for them (most of node_modules)
+	if (!(/** @type {JavascriptModuleBuildInfo} */ (module.buildInfo).strict)) {
+		return "Module is not in strict mode";
+	}
+	const wrapped = !isCommonJsHoistable(module);
+	// A dynamic exports type only makes sense when wrapping; a hoistable module
+	// with no static exports keeps its previous (bailed) behavior.
+	if (buildMeta.exportsType === undefined && !wrapped) {
+		return "Module is not an ECMAScript module";
+	}
+	for (const dep of module.dependencies) {
+		if (
+			dep instanceof CommonJsExportsDependency ||
+			dep instanceof CommonJsSelfReferenceDependency
+		) {
+			// Any export shape is fine: hoisted modules restrict these below,
+			// wrapped modules keep them verbatim inside the wrapper.
+			continue;
+		} else if (
+			dep instanceof CommonJsRequireDependency ||
+			dep instanceof CommonJsFullRequireDependency ||
+			dep instanceof RequireResolveDependency ||
+			dep instanceof ContextDependency
+		) {
+			// A wrapped module renders with its own module ids intact, so a
+			// require() target that is itself inlined (no id) would break. Only
+			// hoisted ("nice") modules — whose require targets always stay
+			// external — may keep these.
+			if (wrapped) {
+				return `Module uses ${dep.type} which is not supported when wrapping`;
+			}
+		} else if (!(dep instanceof ImportDependency)) {
+			return `Module uses an unsupported dependency (${dep.type})`;
+		}
+	}
+	if (module.presentationalDependencies !== undefined) {
+		const incompatible = wrapped
+			? WRAPPING_INCOMPATIBLE_RUNTIME_REQUIREMENTS
+			: CONCATENATION_INCOMPATIBLE_RUNTIME_REQUIREMENTS;
+		for (const dep of module.presentationalDependencies) {
+			const runtimeRequirements =
+				/** @type {{ runtimeRequirements?: ReadonlySet<string> | null }} */
+				(dep).runtimeRequirements;
+			if (!runtimeRequirements) continue;
+			for (const requirement of runtimeRequirements) {
+				if (incompatible.has(requirement)) {
+					return `Module uses ${requirement}`;
+				}
+			}
+		}
+	}
+	return undefined;
+};
+
+/**
+ * A "nice" CommonJS module has a static list of exports, assigned only via
+ * plain `exports.x = …` / `module.exports.x = …`, and never uses the
+ * `module`/`exports` objects in any other way, so every reference can be
+ * rewritten to a hoisted module-scope variable. Modules eligible for
+ * concatenation but not hoistable are wrapped instead.
+ * @param {NormalModule} module the module
+ * @returns {boolean} true when the module can be hoisted rather than wrapped
+ */
+const isCommonJsHoistable = (module) => {
+	for (const dep of module.dependencies) {
+		if (dep instanceof CommonJsExportsDependency) {
+			if (dep.base !== "exports" && dep.base !== "module.exports") return false;
+			if (dep.names.length === 0) return false;
+		} else if (dep instanceof CommonJsSelfReferenceDependency) {
+			if (dep.base !== "exports" && dep.base !== "module.exports") return false;
+			if (dep.names.length === 0) return false;
+			// `exports.f()` passes the exports object as `this`
+			if (dep.call && dep.names.length === 1) return false;
+		}
+	}
+	return true;
+};
+
+/**
+ * Whether a concatenation-eligible CommonJS module must be wrapped (rendered
+ * inside an IIFE with real `module`/`exports` objects) rather than hoisted.
+ * @param {NormalModule} module the module
+ * @returns {boolean} true when the module needs wrapping
+ */
+const isCommonJsWrapped = (module) =>
+	getCommonJsConcatenationBailoutReason(module) === undefined &&
+	!isCommonJsHoistable(module);
+
 const deprecatedGetInitFragments = util.deprecate(
 	/**
 	 * Handles the callback logic for this hook.
@@ -88,7 +233,8 @@ class JavascriptGenerator extends Generator {
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
 	 */
 	getConcatenationBailoutReason(module, context) {
-		// Only harmony modules are valid for optimization
+		// Harmony modules and CommonJS modules with statically rewritable
+		// exports are valid for optimization
 		if (
 			!module.buildMeta ||
 			module.buildMeta.exportsType !== "namespace" ||
@@ -97,7 +243,11 @@ class JavascriptGenerator extends Generator {
 				(d) => d instanceof HarmonyCompatibilityDependency
 			)
 		) {
-			return "Module is not an ECMAScript module";
+			// CommonJS concatenation is opt-in via optimization.concatenateCommonJsModules
+			const reason = context.concatenateCommonJsModules
+				? getCommonJsConcatenationBailoutReason(module)
+				: "Module is not an ECMAScript module";
+			if (reason !== undefined) return reason;
 		}
 
 		// Some expressions are not compatible with module concatenation
@@ -113,14 +263,13 @@ class JavascriptGenerator extends Generator {
 
 	/**
 	 * Processes the provided module.
-	 * @param {Module} module the current module
 	 * @param {Dependency} dependency the dependency to generate
-	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
+	 * @param {DependencyTemplateContext} templateContext the template context shared for the whole module
 	 * @param {GenerateContext} generateContext the render context
 	 * @returns {void}
 	 */
-	sourceDependency(module, dependency, initFragments, source, generateContext) {
+	sourceDependency(dependency, source, templateContext, generateContext) {
 		const constructor =
 			/** @type {DependencyConstructor} */
 			(dependency.constructor);
@@ -131,39 +280,6 @@ class JavascriptGenerator extends Generator {
 			);
 		}
 
-		/** @type {InitFragment<GenerateContext>[] | undefined} */
-		let chunkInitFragments;
-
-		/** @type {DependencyTemplateContext} */
-		const templateContext = {
-			runtimeTemplate: generateContext.runtimeTemplate,
-			dependencyTemplates: generateContext.dependencyTemplates,
-			moduleGraph: generateContext.moduleGraph,
-			chunkGraph: generateContext.chunkGraph,
-			module,
-			runtime: generateContext.runtime,
-			runtimeRequirements: generateContext.runtimeRequirements,
-			concatenationScope: generateContext.concatenationScope,
-			codeGenerationResults:
-				/** @type {NonNullable<GenerateContext["codeGenerationResults"]>} */
-				(generateContext.codeGenerationResults),
-			initFragments,
-			get chunkInitFragments() {
-				if (!chunkInitFragments) {
-					const data =
-						/** @type {NonNullable<GenerateContext["getData"]>} */
-						(generateContext.getData)();
-					chunkInitFragments = data.get("chunkInitFragments");
-					if (!chunkInitFragments) {
-						chunkInitFragments = [];
-						data.set("chunkInitFragments", chunkInitFragments);
-					}
-				}
-
-				return chunkInitFragments;
-			}
-		};
-
 		template.apply(dependency, source, templateContext);
 
 		// TODO remove in webpack 6
@@ -176,7 +292,7 @@ class JavascriptGenerator extends Generator {
 
 			if (fragments) {
 				for (const fragment of fragments) {
-					initFragments.push(fragment);
+					templateContext.initFragments.push(fragment);
 				}
 			}
 		}
@@ -186,18 +302,17 @@ class JavascriptGenerator extends Generator {
 	 * Processes the provided module.
 	 * @param {Module} module the module to generate
 	 * @param {DependenciesBlock} block the dependencies block which will be processed
-	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
+	 * @param {DependencyTemplateContext} templateContext the template context shared for the whole module
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {GenerateContext} generateContext the generateContext
 	 * @returns {void}
 	 */
-	sourceBlock(module, block, initFragments, source, generateContext) {
+	sourceBlock(module, block, templateContext, source, generateContext) {
 		for (const dependency of block.dependencies) {
 			this.sourceDependency(
-				module,
 				dependency,
-				initFragments,
 				source,
+				templateContext,
 				generateContext
 			);
 		}
@@ -206,7 +321,7 @@ class JavascriptGenerator extends Generator {
 			this.sourceBlock(
 				module,
 				childBlock,
-				initFragments,
+				templateContext,
 				source,
 				generateContext
 			);
@@ -222,12 +337,45 @@ class JavascriptGenerator extends Generator {
 	 * @returns {void}
 	 */
 	sourceModule(module, initFragments, source, generateContext) {
+		/** @type {InitFragment<GenerateContext>[] | undefined} */
+		let chunkInitFragments;
+
+		// one template context for all dependencies of the module (hot path)
+		/** @type {DependencyTemplateContext} */
+		const templateContext = {
+			runtimeTemplate: generateContext.runtimeTemplate,
+			dependencyTemplates: generateContext.dependencyTemplates,
+			moduleGraph: generateContext.moduleGraph,
+			chunkGraph: generateContext.chunkGraph,
+			module,
+			runtime: generateContext.runtime,
+			runtimeRequirements: generateContext.runtimeRequirements,
+			concatenationScope: generateContext.concatenationScope,
+			codeGenerationResults:
+				/** @type {NonNullable<GenerateContext["codeGenerationResults"]>} */
+				(generateContext.codeGenerationResults),
+			initFragments,
+			get chunkInitFragments() {
+				if (!chunkInitFragments) {
+					const data =
+						/** @type {NonNullable<GenerateContext["getData"]>} */
+						(generateContext.getData)();
+					chunkInitFragments = data.get("chunkInitFragments");
+					if (!chunkInitFragments) {
+						chunkInitFragments = [];
+						data.set("chunkInitFragments", chunkInitFragments);
+					}
+				}
+
+				return chunkInitFragments;
+			}
+		};
+
 		for (const dependency of module.dependencies) {
 			this.sourceDependency(
-				module,
 				dependency,
-				initFragments,
 				source,
+				templateContext,
 				generateContext
 			);
 		}
@@ -235,10 +383,9 @@ class JavascriptGenerator extends Generator {
 		if (module.presentationalDependencies !== undefined) {
 			for (const dependency of module.presentationalDependencies) {
 				this.sourceDependency(
-					module,
 					dependency,
-					initFragments,
 					source,
+					templateContext,
 					generateContext
 				);
 			}
@@ -248,7 +395,7 @@ class JavascriptGenerator extends Generator {
 			this.sourceBlock(
 				module,
 				childBlock,
-				initFragments,
+				templateContext,
 				source,
 				generateContext
 			);
@@ -289,3 +436,4 @@ class JavascriptGenerator extends Generator {
 }
 
 module.exports = JavascriptGenerator;
+module.exports.isCommonJsWrapped = isCommonJsWrapped;

package/lib/javascript/JavascriptModulesPlugin.js

@@ -46,6 +46,7 @@ const createHooksRegistry = require("../util/createHooksRegistry");
 const { digestNonNumericOnlyWithFull } = require("../util/nonNumericOnlyHash");
 const removeBOM = require("../util/removeBOM");
 const { intersectRuntime } = require("../util/runtime");
+const { getAllChunks } = require("./ChunkHelpers");
 const JavascriptGenerator = require("./JavascriptGenerator");
 const JavascriptModule = require("./JavascriptModule");
 const JavascriptParser = require("./JavascriptParser");
@@ -283,6 +284,8 @@ const printGeneratedCodeForStack = (module, code) => {
  * @property {CodeGenerationResults} codeGenerationResults results of code generation
  * @property {InitFragment<ChunkRenderContext>[]} chunkInitFragments init fragments for the chunk
  * @property {boolean | undefined} strictMode rendering in strict context
+ * @property {Module=} inlinedEntryModule entry module inlined at the chunk top level instead of the registry
+ * @property {Source=} inlinedEntrySource rendered body of the inlined entry module
  */
 
 /**
@@ -455,19 +458,31 @@ class JavascriptModulesPlugin {
 								case JAVASCRIPT_MODULE_TYPE_AUTO: {
 									return new JavascriptParser("auto", {
 										parse: options.parse,
-										typescript: options.typescript
+										typescript: options.typescript,
+										importPhases: Boolean(
+											options.deferImport || options.sourceImport
+										),
+										strictModeViolations: options.strictModeViolations
 									});
 								}
 								case JAVASCRIPT_MODULE_TYPE_DYNAMIC: {
 									return new JavascriptParser("script", {
 										parse: options.parse,
-										typescript: options.typescript
+										typescript: options.typescript,
+										importPhases: Boolean(
+											options.deferImport || options.sourceImport
+										),
+										strictModeViolations: options.strictModeViolations
 									});
 								}
 								case JAVASCRIPT_MODULE_TYPE_ESM: {
 									return new JavascriptParser("module", {
 										parse: options.parse,
-										typescript: options.typescript
+										typescript: options.typescript,
+										importPhases: Boolean(
+											options.deferImport || options.sourceImport
+										),
+										strictModeViolations: options.strictModeViolations
 									});
 								}
 							}
@@ -945,10 +960,30 @@ class JavascriptModulesPlugin {
 			chunkInitFragments: [],
 			strictMode: allStrict
 		};
+		// ESM entry chunk whose runtime lives in a separate chunk: inline the
+		// single entry module at the top level (instead of the module registry)
+		// so its own top-level declarations stay live ESM bindings for consumers.
+		const inlinedEntryModule = this._getEsmEntryModuleToInline(
+			renderContext,
+			allModules
+		);
+		let registryModules = allModules;
+		if (inlinedEntryModule) {
+			const inlinedEntrySource = this.renderModule(
+				inlinedEntryModule,
+				{ ...chunkRenderContext, factory: false },
+				hooks
+			);
+			if (inlinedEntrySource) {
+				registryModules = allModules.filter((m) => m !== inlinedEntryModule);
+				chunkRenderContext.inlinedEntryModule = inlinedEntryModule;
+				chunkRenderContext.inlinedEntrySource = inlinedEntrySource;
+			}
+		}
 		const moduleSources =
 			Template.renderChunkModules(
 				chunkRenderContext,
-				allModules,
+				registryModules,
 				(module, renderInObject) =>
 					this.renderModule(
 						module,
@@ -991,6 +1026,92 @@ class JavascriptModulesPlugin {
 				: new ConcatSource(source, ";");
 	}
 
+	/**
+	 * Returns the chunk's single entry module when it can be inlined at the top
+	 * level of an ESM output chunk (instead of the module registry), which keeps
+	 * its exports as live ESM bindings. Only a self-contained ESM entry whose
+	 * top-level declarations can be lifted into the chunk scope qualifies;
+	 * otherwise `undefined` is returned and the registry path is used.
+	 * @param {RenderContext} renderContext render context
+	 * @param {Module[]} allModules all javascript modules of the chunk
+	 * @returns {Module | undefined} the entry module to inline, if any
+	 */
+	_getEsmEntryModuleToInline(renderContext, allModules) {
+		const {
+			chunk,
+			chunkGraph,
+			moduleGraph,
+			runtimeTemplate,
+			codeGenerationResults
+		} = renderContext;
+
+		// Only a single ESM entry whose runtime lives in a separate chunk.
+		if (
+			!runtimeTemplate.isModule() ||
+			chunk.hasRuntime() ||
+			chunkGraph.getNumberOfEntryModules(chunk) !== 1
+		) {
+			return undefined;
+		}
+		const [entryEntry] =
+			chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk);
+		const [entryModule, entrypoint] = /** @type {[Module, Entrypoint]} */ (
+			entryEntry
+		);
+
+		// Module-local safety: the body is lifted verbatim, so it must use the
+		// standard exports binding (not `module`/`this`) and expose top-level
+		// declarations whose names can't collide with runtime/startup identifiers.
+		const runtimeRequirements = chunkGraph.getModuleRuntimeRequirements(
+			entryModule,
+			chunk.runtime
+		);
+		if (
+			entryModule.exportsArgument !== RuntimeGlobals.exports ||
+			runtimeRequirements.has(RuntimeGlobals.module) ||
+			runtimeRequirements.has(RuntimeGlobals.thisAsExports)
+		) {
+			return undefined;
+		}
+		const topLevelDeclarations =
+			codeGenerationResults.getData(
+				entryModule,
+				chunk.runtime,
+				"topLevelDeclarations"
+			) ||
+			(entryModule.buildInfo && entryModule.buildInfo.topLevelDeclarations);
+		if (!topLevelDeclarations || topLevelDeclarations.size === 0) {
+			return undefined;
+		}
+		for (const name of topLevelDeclarations) {
+			if (RESERVED_NAMES.has(name) || name.startsWith("__webpack_")) {
+				return undefined;
+			}
+		}
+
+		// Self-contained: the entry must not be imported by another module (which
+		// needs it in the registry), and must not require other chunks or
+		// `dependOn` parents to execute first.
+		if (
+			entrypoint.getParents().length > 0 ||
+			getAllChunks(entrypoint, chunk, entrypoint.getRuntimeChunk()).size > 0
+		) {
+			return undefined;
+		}
+		const referenced = someInIterable(
+			moduleGraph.getIncomingConnectionsByOriginModule(entryModule),
+			([originModule, connections]) =>
+				originModule &&
+				originModule !== entryModule &&
+				connections.some((c) => c.isTargetActive(chunk.runtime)) &&
+				someInIterable(
+					chunkGraph.getModuleRuntimes(originModule),
+					(runtime) => intersectRuntime(runtime, chunk.runtime) !== undefined
+				)
+		);
+		return referenced ? undefined : entryModule;
+	}
+
 	/**
 	 * Renders the newly generated source from rendering.
 	 * @param {MainRenderContext} renderContext options object
@@ -1044,9 +1165,7 @@ class JavascriptModulesPlugin {
 			const strictBailout = hooks.strictRuntimeBailout.call(renderContext);
 			if (strictBailout) {
 				source.add(
-					`${
-						prefix
-					}// runtime can't be in strict mode because ${strictBailout}.\n`
+					`${prefix}// runtime can't be in strict mode because ${strictBailout}.\n`
 				);
 			} else {
 				allStrict = true;
@@ -1220,7 +1339,9 @@ class JavascriptModulesPlugin {
 							);
 						} else if (m.exportsArgument !== RuntimeGlobals.exports) {
 							startupSource.add(
-								`${runtimeTemplate.renderLet()} ${m.exportsArgument} = ${RuntimeGlobals.exports};\n`
+								`${runtimeTemplate.renderLet()} ${m.exportsArgument} = ${
+									RuntimeGlobals.exports
+								};\n`
 							);
 						}
 					}
@@ -1660,9 +1781,13 @@ class JavascriptModulesPlugin {
 								(() => {
 									if (needThisAsExports) {
 										const comma = args.length ? "," : "";
-										return `__webpack_modules__[${moduleIdExpr}].call(${RuntimeGlobals.exports}${comma}${args.join(",")});`;
+										return `__webpack_modules__[${moduleIdExpr}].call(${
+											RuntimeGlobals.exports
+										}${comma}${args.join(",")});`;
 									}
-									return `__webpack_modules__[${moduleIdExpr}](${args.join(",")});`;
+									return `__webpack_modules__[${moduleIdExpr}](${args.join(
+										","
+									)});`;
 								})()
 							)
 						);
@@ -1802,6 +1927,18 @@ class JavascriptModulesPlugin {
 		const needModuleDefer = runtimeRequirements.has(
 			RuntimeGlobals.makeDeferredNamespaceObject
 		);
+		// Both deferred-namespace runtimes re-invoke `__webpack_require__` on
+		// access, so a module's evaluation error must be retained and re-thrown
+		// (a Cyclic Module Record's [[EvaluationError]]); the optimized variant
+		// does not use `__webpack_module_deferred_exports__`, so it is tracked
+		// separately from `needModuleDefer`.
+		const needModuleDeferAny =
+			needModuleDefer ||
+			runtimeRequirements.has(
+				RuntimeGlobals.makeOptimizedDeferredNamespaceObject
+			);
+		const needModuleErrorCaching =
+			outputOptions.strictModuleErrorHandling || needModuleDeferAny;
 		// `module` is reassigned by the interceptModuleExecution path; use `let`.
 		const moduleDecl = runtimeRequirements.has(
 			RuntimeGlobals.interceptModuleExecution
@@ -1812,7 +1949,7 @@ class JavascriptModulesPlugin {
 			"// Check if module is in cache",
 			`${cst} cachedModule = __webpack_module_cache__[moduleId];`,
 			"if (cachedModule !== undefined) {",
-			outputOptions.strictModuleErrorHandling
+			needModuleErrorCaching
 				? Template.indent([
 						"if (cachedModule.error !== undefined) throw cachedModule.error;",
 						"return cachedModule.exports;"
@@ -1830,7 +1967,7 @@ class JavascriptModulesPlugin {
 			]),
 			"};",
 			"",
-			outputOptions.strictModuleExceptionHandling
+			outputOptions.strictModuleExceptionHandling && !needModuleErrorCaching
 				? Template.asString([
 						"// Execute the module function",
 						`${lt} threw = true;`,
@@ -1848,20 +1985,27 @@ class JavascriptModulesPlugin {
 						]),
 						"}"
 					])
-				: outputOptions.strictModuleErrorHandling
+				: needModuleErrorCaching
 					? Template.asString([
 							"// Execute the module function",
+							// Mark the module as evaluating so a deferred namespace that
+							// forces evaluation of an already-evaluating module can throw
+							// instead of exposing its partial exports.
+							...(needModuleDeferAny ? ["module.evaluating = true;"] : []),
 							"try {",
-							Template.indent(
-								needModuleDefer
-									? [
-											moduleExecution,
-											"delete __webpack_module_deferred_exports__[moduleId];"
-										]
-									: moduleExecution
-							),
+							Template.indent([
+								moduleExecution,
+								...(needModuleDefer
+									? ["delete __webpack_module_deferred_exports__[moduleId];"]
+									: []),
+								...(needModuleDeferAny ? ["module.evaluating = false;"] : [])
+							]),
 							"} catch(e) {",
-							Template.indent(["module.error = e;", "throw e;"]),
+							Template.indent([
+								...(needModuleDeferAny ? ["module.evaluating = false;"] : []),
+								"module.error = e;",
+								"throw e;"
+							]),
 							"}"
 						])
 					: Template.asString([
@@ -1956,11 +2100,16 @@ class JavascriptModulesPlugin {
 			}
 			const code = /** @type {string} */ (moduleSource.source());
 
+			const { experiments } = compilation.options;
 			const { ast } = JavascriptParser._parse(
 				code,
 				{
 					sourceType: "auto",
-					ranges: true
+					ranges: true,
+					// generated code contains phase imports when the experiments are on
+					importPhases: Boolean(
+						experiments.deferImport || experiments.sourceImport
+					)
 				},
 				JavascriptParser._getModuleParseFunction(compilation, m)
 			);
@@ -2028,11 +2177,16 @@ class JavascriptModulesPlugin {
 		for (const [m, moduleSource] of inlinedModuleSources) {
 			const code = /** @type {string} */ (moduleSource.source());
 
+			const { experiments } = compilation.options;
 			const { ast } = JavascriptParser._parse(
 				code,
 				{
 					sourceType: "auto",
-					ranges: true
+					ranges: true,
+					// generated code contains phase imports when the experiments are on
+					importPhases: Boolean(
+						experiments.deferImport || experiments.sourceImport
+					)
 				},
 				JavascriptParser._getModuleParseFunction(compilation, m)
 			);