webpack 5.101.2 → 5.102.0

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -17,6 +17,7 @@ const {
 
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../ChunkGraph").EntryModuleWithChunkGroup} EntryModuleWithChunkGroup */
+/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
 
 const PLUGIN_NAME = "ArrayPushCallbackChunkFormatPlugin";
 
@@ -89,7 +90,9 @@ class ArrayPushCallbackChunkFormatPlugin {
 							runtime.add(
 								Template.renderRuntimeModules(runtimeModules, {
 									...renderContext,
-									codeGenerationResults: compilation.codeGenerationResults
+									codeGenerationResults:
+										/** @type {CodeGenerationResults} */
+										(compilation.codeGenerationResults)
 								})
 							);
 						}

package/lib/javascript/BasicEvaluatedExpression.js

@@ -8,6 +8,9 @@
 /** @typedef {import("estree").Node} Node */
 /** @typedef {import("./JavascriptParser").Range} Range */
 /** @typedef {import("./JavascriptParser").VariableInfo} VariableInfo */
+/** @typedef {import("./JavascriptParser").Members} Members */
+/** @typedef {import("./JavascriptParser").MembersOptionals} MembersOptionals */
+/** @typedef {import("./JavascriptParser").MemberRanges} MemberRanges */
 
 const TypeUnknown = 0;
 const TypeUndefined = 1;
@@ -24,6 +27,10 @@ const TypeWrapped = 11;
 const TypeTemplateString = 12;
 const TypeBigInt = 13;
 
+/** @typedef {() => Members} GetMembers */
+/** @typedef {() => MembersOptionals} GetMembersOptionals */
+/** @typedef {() => MemberRanges} GetMemberRanges */
+
 class BasicEvaluatedExpression {
 	constructor() {
 		this.type = TypeUnknown;
@@ -67,11 +74,11 @@ class BasicEvaluatedExpression {
 		this.identifier = undefined;
 		/** @type {string | VariableInfo | undefined} */
 		this.rootInfo = undefined;
-		/** @type {(() => string[]) | undefined} */
+		/** @type {GetMembers | undefined} */
 		this.getMembers = undefined;
-		/** @type {(() => boolean[]) | undefined} */
+		/** @type {GetMembersOptionals | undefined} */
 		this.getMembersOptionals = undefined;
-		/** @type {(() => Range[]) | undefined} */
+		/** @type {GetMemberRanges | undefined} */
 		this.getMemberRanges = undefined;
 		/** @type {Node | undefined} */
 		this.expression = undefined;
@@ -388,9 +395,9 @@ class BasicEvaluatedExpression {
 	 * Set's the value of this expression to a particular identifier and its members.
 	 * @param {string | VariableInfo} identifier identifier to set
 	 * @param {string | VariableInfo} rootInfo root info
-	 * @param {() => string[]} getMembers members
-	 * @param {() => boolean[]=} getMembersOptionals optional members
-	 * @param {() => Range[]=} getMemberRanges ranges of progressively increasing sub-expressions
+	 * @param {GetMembers} getMembers members
+	 * @param {GetMembersOptionals=} getMembersOptionals optional members
+	 * @param {GetMemberRanges=} getMemberRanges ranges of progressively increasing sub-expressions
 	 * @returns {this} this
 	 */
 	setIdentifier(

package/lib/javascript/ChunkFormatHelpers.js

@@ -18,7 +18,7 @@ const { updateHashForEntryStartup } = require("./StartupHelpers");
  * Gets information about a chunk including its entries and runtime chunk
  * @param {Chunk} chunk The chunk to get information for
  * @param {ChunkGraph} chunkGraph The chunk graph containing the chunk
- * @returns {{entries: Array<[Module, Entrypoint | undefined]>, runtimeChunk: Chunk|null}} Object containing chunk entries and runtime chunk
+ * @returns {{ entries: [Module, Entrypoint | undefined][], runtimeChunk: Chunk | null }} Object containing chunk entries and runtime chunk
  */
 function getChunkInfo(chunk, chunkGraph) {
 	const entries = [

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -21,7 +21,6 @@ const { generateEntryStartup } = require("./StartupHelpers");
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Entrypoint")} Entrypoint */
 
 const PLUGIN_NAME = "CommonJsChunkFormatPlugin";
 

package/lib/javascript/JavascriptGenerator.js

@@ -13,17 +13,16 @@ const { JS_TYPES } = require("../ModuleSourceTypesConstants");
 const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
 
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Compilation").DependencyConstructor} DependencyConstructor */
 /** @typedef {import("../DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate")} DependencyTemplate */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../NormalModule")} NormalModule */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 
 const DEFAULT_SOURCE = {
 	source() {
@@ -213,7 +212,7 @@ class JavascriptGenerator extends Generator {
 	 */
 	sourceDependency(module, dependency, initFragments, source, generateContext) {
 		const constructor =
-			/** @type {new (...args: EXPECTED_ANY[]) => Dependency} */
+			/** @type {DependencyConstructor} */
 			(dependency.constructor);
 		const template = generateContext.dependencyTemplates.get(constructor);
 		if (!template) {

package/lib/javascript/JavascriptModulesPlugin.js

@@ -52,8 +52,7 @@ const JavascriptParser = require("./JavascriptParser");
 /** @typedef {import("eslint-scope").Variable} Variable */
 /** @typedef {import("estree").Program} Program */
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../../declarations/WebpackOptions").HashFunction} HashFunction */
-/** @typedef {import("../../declarations/WebpackOptions").Output} OutputOptions */
+/** @typedef {import("../config/defaults").OutputNormalizedWithDefaults} OutputOptions */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
@@ -445,7 +444,6 @@ class JavascriptModulesPlugin {
 				compilation.hooks.contentHash.tap(PLUGIN_NAME, (chunk) => {
 					const {
 						chunkGraph,
-						codeGenerationResults,
 						moduleGraph,
 						runtimeTemplate,
 						outputOptions: {
@@ -455,7 +453,10 @@ class JavascriptModulesPlugin {
 							hashFunction
 						}
 					} = compilation;
-					const hash = createHash(/** @type {HashFunction} */ (hashFunction));
+					const codeGenerationResults =
+						/** @type {CodeGenerationResults} */
+						(compilation.codeGenerationResults);
+					const hash = createHash(hashFunction);
 					if (hashSalt) hash.update(hashSalt);
 					if (chunk.hasRuntime()) {
 						this.updateHashWithBootstrap(
@@ -591,11 +592,11 @@ class JavascriptModulesPlugin {
 		if (chunk.filenameTemplate) {
 			return chunk.filenameTemplate;
 		} else if (chunk instanceof HotUpdateChunk) {
-			return /** @type {TemplatePath} */ (outputOptions.hotUpdateChunkFilename);
+			return outputOptions.hotUpdateChunkFilename;
 		} else if (chunk.canBeInitial()) {
-			return /** @type {TemplatePath} */ (outputOptions.filename);
+			return outputOptions.filename;
 		}
-		return /** @type {TemplatePath} */ (outputOptions.chunkFilename);
+		return outputOptions.chunkFilename;
 	}
 
 	/**
@@ -1356,6 +1357,16 @@ class JavascriptModulesPlugin {
 							"// This entry module used 'module' so it can't be inlined"
 						);
 					}
+					if (
+						result.allowInlineStartup &&
+						entryRuntimeRequirements.has(RuntimeGlobals.thisAsExports)
+					) {
+						buf2.push(
+							"// This entry module used `this` as exports so it can't be inlined"
+						);
+						result.allowInlineStartup = false;
+					}
+
 					if (chunks.length > 0) {
 						buf2.push(
 							`${i === 0 ? `var ${RuntimeGlobals.exports} = ` : ""}${
@@ -1374,21 +1385,33 @@ class JavascriptModulesPlugin {
 						);
 					} else {
 						if (i === 0) buf2.push(`var ${RuntimeGlobals.exports} = {};`);
-						if (requireScopeUsed) {
-							buf2.push(
-								`__webpack_modules__[${moduleIdExpr}](0, ${
-									i === 0 ? RuntimeGlobals.exports : "{}"
-								}, ${RuntimeGlobals.require});`
-							);
-						} else if (entryRuntimeRequirements.has(RuntimeGlobals.exports)) {
-							buf2.push(
-								`__webpack_modules__[${moduleIdExpr}](0, ${
-									i === 0 ? RuntimeGlobals.exports : "{}"
-								});`
-							);
-						} else {
-							buf2.push(`__webpack_modules__[${moduleIdExpr}]();`);
+						const needThisAsExports = entryRuntimeRequirements.has(
+							RuntimeGlobals.thisAsExports
+						);
+
+						/** @type {string[]} */
+						const args = [];
+						if (
+							requireScopeUsed ||
+							entryRuntimeRequirements.has(RuntimeGlobals.exports)
+						) {
+							const exportsArg = i === 0 ? RuntimeGlobals.exports : "{}";
+							args.push("0", exportsArg);
+							if (requireScopeUsed) {
+								args.push(RuntimeGlobals.require);
+							}
 						}
+						buf2.push(
+							Template.asString(
+								(() => {
+									if (needThisAsExports) {
+										const comma = args.length ? "," : "";
+										return `__webpack_modules__[${moduleIdExpr}].call(${RuntimeGlobals.exports}${comma}${args.join(",")});`;
+									}
+									return `__webpack_modules__[${moduleIdExpr}](${args.join(",")});`;
+								})()
+							)
+						);
 					}
 				}
 				if (runtimeRequirements.has(RuntimeGlobals.onChunksLoaded)) {