webpack 5.105.3 → 5.106.0

package/lib/dependencies/ImportPhase.js

@@ -25,11 +25,14 @@ const ImportPhase = Object.freeze({
 	Source: 0b10
 });
 
+/** @typedef {"defer" | "source" | "evaluation"} ImportPhaseName */
+
 /**
  * @typedef {object} ImportPhaseUtils
- * @property {(phase: ImportPhaseType) => boolean} isEvaluation true if phase is evaluation
- * @property {(phase: ImportPhaseType) => boolean} isDefer true if phase is defer
- * @property {(phase: ImportPhaseType) => boolean} isSource true if phase is source
+ * @property {(phase: ImportPhaseType | undefined) => boolean} isEvaluation true if phase is evaluation
+ * @property {(phase: ImportPhaseType | undefined) => boolean} isDefer true if phase is defer
+ * @property {(phase: ImportPhaseType | undefined) => boolean} isSource true if phase is source
+ * @property {(phase: ImportPhaseType) => ImportPhaseName} stringify return stringified name of phase
  */
 
 /** @type {ImportPhaseUtils} */
@@ -42,6 +45,16 @@ const ImportPhaseUtils = {
 	},
 	isSource(phase) {
 		return phase === ImportPhase.Source;
+	},
+	stringify(phase) {
+		switch (phase) {
+			case ImportPhase.Defer:
+				return "defer";
+			case ImportPhase.Source:
+				return "source";
+			default:
+				return "evaluation";
+		}
 	}
 };
 
@@ -58,17 +71,22 @@ const ImportPhaseUtils = {
  */
 
 /**
- * @param {boolean=} enableImportPhase enable import phase detection
+ * @param {boolean=} enableDeferPhase enable import phase detection
+ * @param {boolean=} enableSourcePhase enable import phase detection
  * @returns {GetImportPhase} evaluates the import phase for ast node
  */
-function createGetImportPhase(enableImportPhase) {
+function createGetImportPhase(enableDeferPhase, enableSourcePhase) {
 	return (parser, node, getCommentOptions) => {
-		if (!enableImportPhase) return ImportPhase.Evaluation;
+		if (!enableDeferPhase && !enableSourcePhase) return ImportPhase.Evaluation;
 
-		// We now only support `defer import`
+		// We now only support `defer import` and `source import` syntax
 		const phaseBySyntax =
-			"phase" in node && node.phase === "defer"
-				? ImportPhase.Defer
+			"phase" in node
+				? node.phase === "defer" && enableDeferPhase
+					? ImportPhase.Defer
+					: node.phase === "source" && enableSourcePhase
+						? ImportPhase.Source
+						: ImportPhase.Evaluation
 				: ImportPhase.Evaluation;
 
 		if (!node.range) {
@@ -99,19 +117,44 @@ function createGetImportPhase(enableImportPhase) {
 
 		const options = getCommentOptions();
 
-		if (!options || !options.webpackDefer) return phaseBySyntax;
-
-		const { webpackDefer } = options;
-		if (typeof webpackDefer === "boolean") {
-			return webpackDefer ? ImportPhase.Defer : phaseBySyntax;
-		} else if (node.loc) {
-			const CommentCompilationWarning = getCommentCompilationWarning();
-			parser.state.module.addWarning(
-				new CommentCompilationWarning(
-					"webpackDefer magic comment expected a boolean value.",
-					node.loc
-				)
-			);
+		if (!options) {
+			return phaseBySyntax;
+		}
+
+		if (!options.webpackDefer && !options.webpackSource) {
+			return phaseBySyntax;
+		}
+
+		const { webpackDefer, webpackSource } = options;
+
+		if (enableDeferPhase && typeof options.webpackDefer !== "undefined") {
+			if (typeof webpackDefer === "boolean") {
+				return webpackDefer ? ImportPhase.Defer : phaseBySyntax;
+			} else if (node.loc) {
+				const CommentCompilationWarning = getCommentCompilationWarning();
+
+				parser.state.module.addWarning(
+					new CommentCompilationWarning(
+						"webpackDefer magic comment expected a boolean value.",
+						node.loc
+					)
+				);
+			}
+		}
+
+		if (enableSourcePhase && typeof options.webpackSource !== "undefined") {
+			if (typeof webpackSource === "boolean") {
+				return webpackSource ? ImportPhase.Source : phaseBySyntax;
+			} else if (node.loc) {
+				const CommentCompilationWarning = getCommentCompilationWarning();
+
+				parser.state.module.addWarning(
+					new CommentCompilationWarning(
+						"webpackSource magic comment expected a boolean value.",
+						node.loc
+					)
+				);
+			}
 		}
 
 		return phaseBySyntax;

package/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js

@@ -93,7 +93,7 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 					parser.state.current = /** @type {EXPECTED_ANY} */ (depBlock);
 					try {
 						let failed = false;
-						parser.inScope([], () => {
+						parser.inFunctionScope(true, [], () => {
 							for (const ee of dependenciesItems) {
 								if (ee.isString()) {
 									const ensureDependency = new RequireEnsureItemDependency(

package/lib/esm/ModuleChunkFormatPlugin.js

@@ -255,10 +255,7 @@ class ModuleChunkFormatPlugin {
 						hooks.renderStartup.call(
 							startupSource,
 							entries[entries.length - 1][0],
-							{
-								...renderContext,
-								inlined: false
-							}
+							renderContext
 						)
 					);
 					return entrySource;

package/lib/ids/HashedModuleIdsPlugin.js

@@ -9,7 +9,6 @@ const { DEFAULTS } = require("../config/defaults");
 const {
 	compareModulesByPreOrderIndexOrIdentifier
 } = require("../util/comparators");
-const createSchemaValidation = require("../util/create-schema-validation");
 const createHash = require("../util/createHash");
 const {
 	getFullModuleName,
@@ -19,15 +18,6 @@ const {
 /** @typedef {import("../../declarations/plugins/ids/HashedModuleIdsPlugin").HashedModuleIdsPluginOptions} HashedModuleIdsPluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
 
-const validate = createSchemaValidation(
-	require("../../schemas/plugins/ids/HashedModuleIdsPlugin.check"),
-	() => require("../../schemas/plugins/ids/HashedModuleIdsPlugin.json"),
-	{
-		name: "Hashed Module Ids Plugin",
-		baseDataPath: "options"
-	}
-);
-
 const PLUGIN_NAME = "HashedModuleIdsPlugin";
 
 class HashedModuleIdsPlugin {
@@ -35,16 +25,8 @@ class HashedModuleIdsPlugin {
 	 * @param {HashedModuleIdsPluginOptions=} options options object
 	 */
 	constructor(options = {}) {
-		validate(options);
-
-		/** @type {Required<Omit<HashedModuleIdsPluginOptions, "context">> & { context?: string | undefined }} */
-		this.options = {
-			context: undefined,
-			hashFunction: DEFAULTS.HASH_FUNCTION,
-			hashDigest: "base64",
-			hashDigestLength: 4,
-			...options
-		};
+		/** @type {HashedModuleIdsPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -53,6 +35,20 @@ class HashedModuleIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => require("../../schemas/plugins/ids/HashedModuleIdsPlugin.json"),
+				this.options,
+				{
+					name: "Hashed Module Ids Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../../schemas/plugins/ids/HashedModuleIdsPlugin.check")(
+						options
+					)
+			);
+		});
 		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const chunkGraph = compilation.chunkGraph;
@@ -66,10 +62,12 @@ class HashedModuleIdsPlugin {
 				);
 				for (const module of modulesInNaturalOrder) {
 					const ident = getFullModuleName(module, context, compiler.root);
-					const hash = createHash(this.options.hashFunction);
+					const hash = createHash(
+						this.options.hashFunction || DEFAULTS.HASH_FUNCTION
+					);
 					hash.update(ident || "");
-					const hashId = hash.digest(this.options.hashDigest);
-					let len = this.options.hashDigestLength;
+					const hashId = hash.digest(this.options.hashDigest || "base64");
+					let len = this.options.hashDigestLength || 4;
 					while (usedIds.has(hashId.slice(0, len))) {
 						/** @type {number} */ (len)++;
 					}

package/lib/ids/OccurrenceChunkIdsPlugin.js

@@ -6,22 +6,12 @@
 "use strict";
 
 const { compareChunksNatural } = require("../util/comparators");
-const createSchemaValidation = require("../util/create-schema-validation");
 const { assignAscendingChunkIds } = require("./IdHelpers");
 
 /** @typedef {import("../../declarations/plugins/ids/OccurrenceChunkIdsPlugin").OccurrenceChunkIdsPluginOptions} OccurrenceChunkIdsPluginOptions */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
-const validate = createSchemaValidation(
-	require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.check"),
-	() => require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.json"),
-	{
-		name: "Occurrence Order Chunk Ids Plugin",
-		baseDataPath: "options"
-	}
-);
-
 const PLUGIN_NAME = "OccurrenceChunkIdsPlugin";
 
 class OccurrenceChunkIdsPlugin {
@@ -29,7 +19,6 @@ class OccurrenceChunkIdsPlugin {
 	 * @param {OccurrenceChunkIdsPluginOptions=} options options object
 	 */
 	constructor(options = {}) {
-		validate(options);
 		/** @type {OccurrenceChunkIdsPluginOptions} */
 		this.options = options;
 	}
@@ -40,6 +29,21 @@ class OccurrenceChunkIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() =>
+					require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.json"),
+				this.options,
+				{
+					name: "Occurrence Order Chunk Ids Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.check")(
+						options
+					)
+			);
+		});
 		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.hooks.chunkIds.tap(PLUGIN_NAME, (chunks) => {
 				const chunkGraph = compilation.chunkGraph;

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -8,7 +8,6 @@
 const {
 	compareModulesByPreOrderIndexOrIdentifier
 } = require("../util/comparators");
-const createSchemaValidation = require("../util/create-schema-validation");
 const {
 	assignAscendingModuleIds,
 	getUsedModuleIdsAndModules
@@ -18,15 +17,6 @@ const {
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
 
-const validate = createSchemaValidation(
-	require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.check"),
-	() => require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.json"),
-	{
-		name: "Occurrence Order Module Ids Plugin",
-		baseDataPath: "options"
-	}
-);
-
 const PLUGIN_NAME = "OccurrenceModuleIdsPlugin";
 
 class OccurrenceModuleIdsPlugin {
@@ -34,7 +24,6 @@ class OccurrenceModuleIdsPlugin {
 	 * @param {OccurrenceModuleIdsPluginOptions=} options options object
 	 */
 	constructor(options = {}) {
-		validate(options);
 		/** @type {OccurrenceModuleIdsPluginOptions} */
 		this.options = options;
 	}
@@ -45,6 +34,21 @@ class OccurrenceModuleIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() =>
+					require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.json"),
+				this.options,
+				{
+					name: "Occurrence Order Module Ids Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.check")(
+						options
+					)
+			);
+		});
 		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const moduleGraph = compilation.moduleGraph;
 

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -110,10 +110,7 @@ class ArrayPushCallbackChunkFormatPlugin {
 								hooks.renderStartup.call(
 									startupSource,
 									entries[entries.length - 1][0],
-									{
-										...renderContext,
-										inlined: false
-									}
+									renderContext
 								)
 							);
 							if (

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -128,10 +128,7 @@ class CommonJsChunkFormatPlugin {
 						hooks.renderStartup.call(
 							startupSource,
 							entries[entries.length - 1][0],
-							{
-								...renderContext,
-								inlined: false
-							}
+							renderContext
 						)
 					);
 					entrySource.add("\n})()");

package/lib/javascript/EnableChunkLoadingPlugin.js

@@ -106,8 +106,7 @@ class EnableChunkLoadingPlugin {
 					}).apply(compiler);
 					break;
 				}
-				case "import":
-				case "universal": {
+				case "import": {
 					const ModuleChunkLoadingPlugin = require("../esm/ModuleChunkLoadingPlugin");
 
 					new ModuleChunkLoadingPlugin().apply(compiler);

package/lib/javascript/JavascriptModulesPlugin.js

@@ -225,8 +225,9 @@ const printGeneratedCodeForStack = (module, code) => {
  * @property {ChunkGraph} chunkGraph the chunk graph
  * @property {CodeGenerationResults} codeGenerationResults results of code generation
  * @property {boolean | undefined} strictMode rendering in strict context
- * @property {boolean} inlined inlined
+ * @property {boolean=} inlined inlined
  * @property {boolean=} inlinedInIIFE the inlined entry module is wrapped in an IIFE
+ * @property {boolean=} needExportsDeclaration whether the top-level exports declaration needs to be generated
  */
 
 /**
@@ -1019,10 +1020,6 @@ class JavascriptModulesPlugin {
 			const lastInlinedModule = /** @type {Module} */ (last(inlinedModules));
 			const startupSource = new ConcatSource();
 
-			if (runtimeRequirements.has(RuntimeGlobals.exports)) {
-				startupSource.add(`var ${RuntimeGlobals.exports} = {};\n`);
-			}
-
 			const avoidEntryIife = compilation.options.optimization.avoidEntryIife;
 			/** @type {Map<Module, Source> | false} */
 			let renamedInlinedModule = false;
@@ -1118,13 +1115,41 @@ class JavascriptModulesPlugin {
 					`${RuntimeGlobals.exports} = ${RuntimeGlobals.onChunksLoaded}(${RuntimeGlobals.exports});\n`
 				);
 			}
-			source.add(
-				hooks.renderStartup.call(startupSource, lastInlinedModule, {
-					...renderContext,
-					inlined: true,
-					inlinedInIIFE
-				})
+			/** @type {StartupRenderContext} */
+			const startupRenderContext = {
+				...renderContext,
+				inlined: true,
+				inlinedInIIFE,
+				needExportsDeclaration: runtimeRequirements.has(RuntimeGlobals.exports)
+			};
+			let renderedStartup = hooks.renderStartup.call(
+				startupSource,
+				lastInlinedModule,
+				startupRenderContext
 			);
+			const lastInlinedModuleRequirements =
+				chunkGraph.getModuleRuntimeRequirements(
+					lastInlinedModule,
+					chunk.runtime
+				);
+			if (
+				// `onChunksLoaded` reads and reassigns `__webpack_exports__`
+				runtimeRequirements.has(RuntimeGlobals.onChunksLoaded) ||
+				// Top-level `__webpack_exports__` will be returned
+				runtimeRequirements.has(RuntimeGlobals.returnExportsFromRuntime) ||
+				// Custom exports argument aliases from `__webpack_exports__`
+				(lastInlinedModuleRequirements.has(RuntimeGlobals.exports) &&
+					lastInlinedModule.exportsArgument !== RuntimeGlobals.exports)
+			) {
+				startupRenderContext.needExportsDeclaration = true;
+			}
+			if (startupRenderContext.needExportsDeclaration) {
+				renderedStartup = new ConcatSource(
+					`var ${RuntimeGlobals.exports} = {};\n`,
+					renderedStartup
+				);
+			}
+			source.add(renderedStartup);
 			if (bootstrap.afterStartup.length > 0) {
 				const afterStartup = `${Template.asString(bootstrap.afterStartup)}\n`;
 				source.add(
@@ -1156,7 +1181,8 @@ class JavascriptModulesPlugin {
 							lastEntryModule,
 							{
 								...renderContext,
-								inlined: false
+								inlined: false,
+								needExportsDeclaration: true
 							}
 						),
 						toSource(bootstrap.afterStartup, "webpack/after-startup"),

package/lib/javascript/JavascriptParser.js

@@ -125,7 +125,7 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 /** @typedef {Set<DestructuringAssignmentProperty>} DestructuringAssignmentProperties */
 
 // TODO remove cast when @types/estree has been updated to import assertions
-/** @typedef {import("estree").ImportExpression & { phase?: "defer" }} ImportExpression */
+/** @typedef {import("estree").ImportExpression & { phase?: "defer" | "source" }} ImportExpression */
 
 /** @type {string[]} */
 const EMPTY_ARRAY = [];
@@ -4868,13 +4868,15 @@ class JavascriptParser extends Parser {
 					return true;
 				});
 			}
-
+			case "TemplateLiteral":
+				return expr.expressions.every((expr) =>
+					this.isPure(expr, /** @type {Range} */ (expr.range)[0])
+				);
 			case "FunctionDeclaration":
 			case "FunctionExpression":
 			case "ArrowFunctionExpression":
 			case "ThisExpression":
 			case "Literal":
-			case "TemplateLiteral":
 			case "Identifier":
 			case "PrivateIdentifier":
 				return true;

package/lib/json/JsonModulesPlugin.js

@@ -6,30 +6,11 @@
 "use strict";
 
 const { JSON_MODULE_TYPE } = require("../ModuleTypeConstants");
-const createSchemaValidation = require("../util/create-schema-validation");
 const JsonGenerator = require("./JsonGenerator");
 const JsonParser = require("./JsonParser");
 
 /** @typedef {import("../Compiler")} Compiler */
 
-const validate = createSchemaValidation(
-	require("../../schemas/plugins/json/JsonModulesPluginParser.check"),
-	() => require("../../schemas/plugins/json/JsonModulesPluginParser.json"),
-	{
-		name: "Json Modules Plugin",
-		baseDataPath: "parser"
-	}
-);
-
-const validateGenerator = createSchemaValidation(
-	require("../../schemas/plugins/json/JsonModulesPluginGenerator.check"),
-	() => require("../../schemas/plugins/json/JsonModulesPluginGenerator.json"),
-	{
-		name: "Json Modules Plugin",
-		baseDataPath: "generator"
-	}
-);
-
 const PLUGIN_NAME = "JsonModulesPlugin";
 
 /**
@@ -49,13 +30,39 @@ class JsonModulesPlugin {
 				normalModuleFactory.hooks.createParser
 					.for(JSON_MODULE_TYPE)
 					.tap(PLUGIN_NAME, (parserOptions) => {
-						validate(parserOptions);
+						compiler.validate(
+							() =>
+								require("../../schemas/plugins/json/JsonModulesPluginParser.json"),
+							parserOptions,
+							{
+								name: "Json Modules Plugin",
+								baseDataPath: "parser"
+							},
+							(options) =>
+								require("../../schemas/plugins/json/JsonModulesPluginParser.check")(
+									options
+								)
+						);
+
 						return new JsonParser(parserOptions);
 					});
 				normalModuleFactory.hooks.createGenerator
 					.for(JSON_MODULE_TYPE)
 					.tap(PLUGIN_NAME, (generatorOptions) => {
-						validateGenerator(generatorOptions);
+						compiler.validate(
+							() =>
+								require("../../schemas/plugins/json/JsonModulesPluginGenerator.json"),
+							generatorOptions,
+							{
+								name: "Json Modules Plugin",
+								baseDataPath: "generator"
+							},
+							(options) =>
+								require("../../schemas/plugins/json/JsonModulesPluginGenerator.check")(
+									options
+								)
+						);
+
 						return new JsonGenerator(generatorOptions);
 					});
 			}

package/lib/library/AssignLibraryPlugin.js

@@ -9,7 +9,7 @@ const { ConcatSource } = require("webpack-sources");
 const { UsageState } = require("../ExportsInfo");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
-const propertyAccess = require("../util/propertyAccess");
+const { propertyAccess } = require("../util/property");
 const { getEntryRuntime } = require("../util/runtime");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 

package/lib/library/ExportPropertyLibraryPlugin.js

@@ -8,7 +8,7 @@
 const { ConcatSource } = require("webpack-sources");
 const { UsageState } = require("../ExportsInfo");
 const RuntimeGlobals = require("../RuntimeGlobals");
-const propertyAccess = require("../util/propertyAccess");
+const { propertyAccess } = require("../util/property");
 const { getEntryRuntime } = require("../util/runtime");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");