webpack 5.102.0 → 5.103.0

package/lib/hmr/LazyCompilationPlugin.js

@@ -257,6 +257,7 @@ class LazyCompilationProxyModule extends Module {
 					block,
 					module,
 					request: this.request,
+					dependency: dep,
 					strict: false, // TODO this should be inherited from the original module
 					message: "import()",
 					runtimeRequirements

package/lib/ids/HashedModuleIdsPlugin.js

@@ -16,12 +16,12 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../../declarations/plugins/HashedModuleIdsPlugin").HashedModuleIdsPluginOptions} HashedModuleIdsPluginOptions */
+/** @typedef {import("../../declarations/plugins/ids/HashedModuleIdsPlugin").HashedModuleIdsPluginOptions} HashedModuleIdsPluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/HashedModuleIdsPlugin.check"),
-	() => require("../../schemas/plugins/HashedModuleIdsPlugin.json"),
+	require("../../schemas/plugins/ids/HashedModuleIdsPlugin.check"),
+	() => require("../../schemas/plugins/ids/HashedModuleIdsPlugin.json"),
 	{
 		name: "Hashed Module Ids Plugin",
 		baseDataPath: "options"
@@ -37,7 +37,7 @@ class HashedModuleIdsPlugin {
 	constructor(options = {}) {
 		validate(options);
 
-		/** @type {HashedModuleIdsPluginOptions} */
+		/** @type {Required<Omit<HashedModuleIdsPluginOptions, "context">> & { context?: string | undefined }} */
 		this.options = {
 			context: undefined,
 			hashFunction: DEFAULTS.HASH_FUNCTION,
@@ -73,9 +73,7 @@ class HashedModuleIdsPlugin {
 						)
 					);
 					hash.update(ident || "");
-					const hashId = /** @type {string} */ (
-						hash.digest(options.hashDigest)
-					);
+					const hashId = hash.digest(options.hashDigest);
 					let len = options.hashDigestLength;
 					while (usedIds.has(hashId.slice(0, len))) {
 						/** @type {number} */ (len)++;

package/lib/ids/IdHelpers.js

@@ -15,6 +15,7 @@ const numberHash = require("../util/numberHash");
 /** @typedef {import("../Module")} Module */
 /** @typedef {typeof import("../util/Hash")} Hash */
 /** @typedef {import("../util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 
 /**
  * @param {string} str string to hash
@@ -25,7 +26,7 @@ const numberHash = require("../util/numberHash");
 const getHash = (str, len, hashFunction) => {
 	const hash = createHash(hashFunction);
 	hash.update(str);
-	const digest = /** @type {string} */ (hash.digest("hex"));
+	const digest = hash.digest("hex");
 	return digest.slice(0, len);
 };
 
@@ -246,7 +247,9 @@ const getUsedModuleIdsAndModules = (compilation, filter) => {
 			usedIds.add(String(moduleId));
 		} else if (
 			(!filter || filter(module)) &&
-			chunkGraph.getNumberOfModuleChunks(module) !== 0
+			(chunkGraph.getNumberOfModuleChunks(module) !== 0 ||
+				// CSS modules need IDs even when not in chunks, for generating CSS class names(i.e. [id]-[local])
+				/** @type {BuildMeta} */ (module.buildMeta).isCSSModule)
 		) {
 			modules.push(module);
 		}

package/lib/index.js

@@ -232,6 +232,9 @@ module.exports = mergeExports(fn, {
 	get DynamicEntryPlugin() {
 		return require("./DynamicEntryPlugin");
 	},
+	get DotenvPlugin() {
+		return require("./DotenvPlugin");
+	},
 	get EntryOptionPlugin() {
 		return require("./EntryOptionPlugin");
 	},
@@ -355,6 +358,9 @@ module.exports = mergeExports(fn, {
 	get Stats() {
 		return require("./Stats");
 	},
+	get ManifestPlugin() {
+		return require("./ManifestPlugin");
+	},
 	get Template() {
 		return require("./Template");
 	},

package/lib/javascript/ChunkHelpers.js

@@ -16,17 +16,28 @@ const Entrypoint = require("../Entrypoint");
  * @returns {Set<Chunk>} chunks
  */
 const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
+	/** @type {Set<Entrypoint>} */
 	const queue = new Set([entrypoint]);
+	/** @type {Set<Entrypoint>} */
+	const groups = new Set([]);
+	for (const group of queue) {
+		if (group !== entrypoint) {
+			groups.add(group);
+		}
+		for (const parent of group.parentsIterable) {
+			if (parent instanceof Entrypoint) queue.add(parent);
+		}
+	}
+	groups.add(entrypoint);
+
+	/** @type {Set<Chunk>} */
 	const chunks = new Set();
-	for (const entrypoint of queue) {
-		for (const chunk of entrypoint.chunks) {
+	for (const group of groups) {
+		for (const chunk of group.chunks) {
 			if (chunk === excludedChunk1) continue;
 			if (chunk === excludedChunk2) continue;
 			chunks.add(chunk);
 		}
-		for (const parent of entrypoint.parentsIterable) {
-			if (parent instanceof Entrypoint) queue.add(parent);
-		}
 	}
 	return chunks;
 };

package/lib/javascript/JavascriptGenerator.js

@@ -101,107 +101,6 @@ class JavascriptGenerator extends Generator {
 		}
 	}
 
-	/**
-	 * @param {NormalModule} module module for which the code should be generated
-	 * @param {GenerateContext} generateContext context for generate
-	 * @returns {Source | null} generated code
-	 */
-	generate(module, generateContext) {
-		const originalSource = module.originalSource();
-		if (!originalSource) {
-			return DEFAULT_SOURCE.source();
-		}
-
-		const source = new ReplaceSource(originalSource);
-		/** @type {InitFragment<GenerateContext>[]} */
-		const initFragments = [];
-
-		this.sourceModule(module, initFragments, source, generateContext);
-
-		return InitFragment.addToSource(source, initFragments, generateContext);
-	}
-
-	/**
-	 * @param {Error} error the error
-	 * @param {NormalModule} module module for which the code should be generated
-	 * @param {GenerateContext} generateContext context for generate
-	 * @returns {Source | null} generated code
-	 */
-	generateError(error, module, generateContext) {
-		return new RawSource(`throw new Error(${JSON.stringify(error.message)});`);
-	}
-
-	/**
-	 * @param {Module} module the module to generate
-	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
-	 * @param {ReplaceSource} source the current replace source which can be modified
-	 * @param {GenerateContext} generateContext the generateContext
-	 * @returns {void}
-	 */
-	sourceModule(module, initFragments, source, generateContext) {
-		for (const dependency of module.dependencies) {
-			this.sourceDependency(
-				module,
-				dependency,
-				initFragments,
-				source,
-				generateContext
-			);
-		}
-
-		if (module.presentationalDependencies !== undefined) {
-			for (const dependency of module.presentationalDependencies) {
-				this.sourceDependency(
-					module,
-					dependency,
-					initFragments,
-					source,
-					generateContext
-				);
-			}
-		}
-
-		for (const childBlock of module.blocks) {
-			this.sourceBlock(
-				module,
-				childBlock,
-				initFragments,
-				source,
-				generateContext
-			);
-		}
-	}
-
-	/**
-	 * @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 {ReplaceSource} source the current replace source which can be modified
-	 * @param {GenerateContext} generateContext the generateContext
-	 * @returns {void}
-	 */
-	sourceBlock(module, block, initFragments, source, generateContext) {
-		for (const dependency of block.dependencies) {
-			this.sourceDependency(
-				module,
-				dependency,
-				initFragments,
-				source,
-				generateContext
-			);
-		}
-
-		for (const childBlock of block.blocks) {
-			this.sourceBlock(
-				module,
-				childBlock,
-				initFragments,
-				source,
-				generateContext
-			);
-		}
-	}
-
 	/**
 	 * @param {Module} module the current module
 	 * @param {Dependency} dependency the dependency to generate
@@ -271,6 +170,107 @@ class JavascriptGenerator extends Generator {
 			}
 		}
 	}
+
+	/**
+	 * @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 {ReplaceSource} source the current replace source which can be modified
+	 * @param {GenerateContext} generateContext the generateContext
+	 * @returns {void}
+	 */
+	sourceBlock(module, block, initFragments, source, generateContext) {
+		for (const dependency of block.dependencies) {
+			this.sourceDependency(
+				module,
+				dependency,
+				initFragments,
+				source,
+				generateContext
+			);
+		}
+
+		for (const childBlock of block.blocks) {
+			this.sourceBlock(
+				module,
+				childBlock,
+				initFragments,
+				source,
+				generateContext
+			);
+		}
+	}
+
+	/**
+	 * @param {Module} module the module to generate
+	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
+	 * @param {ReplaceSource} source the current replace source which can be modified
+	 * @param {GenerateContext} generateContext the generateContext
+	 * @returns {void}
+	 */
+	sourceModule(module, initFragments, source, generateContext) {
+		for (const dependency of module.dependencies) {
+			this.sourceDependency(
+				module,
+				dependency,
+				initFragments,
+				source,
+				generateContext
+			);
+		}
+
+		if (module.presentationalDependencies !== undefined) {
+			for (const dependency of module.presentationalDependencies) {
+				this.sourceDependency(
+					module,
+					dependency,
+					initFragments,
+					source,
+					generateContext
+				);
+			}
+		}
+
+		for (const childBlock of module.blocks) {
+			this.sourceBlock(
+				module,
+				childBlock,
+				initFragments,
+				source,
+				generateContext
+			);
+		}
+	}
+
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source | null} generated code
+	 */
+	generate(module, generateContext) {
+		const originalSource = module.originalSource();
+		if (!originalSource) {
+			return DEFAULT_SOURCE.source();
+		}
+
+		const source = new ReplaceSource(originalSource);
+		/** @type {InitFragment<GenerateContext>[]} */
+		const initFragments = [];
+
+		this.sourceModule(module, initFragments, source, generateContext);
+
+		return InitFragment.addToSource(source, initFragments, generateContext);
+	}
+
+	/**
+	 * @param {Error} error the error
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source | null} generated code
+	 */
+	generateError(error, module, generateContext) {
+		return new RawSource(`throw new Error(${JSON.stringify(error.message)});`);
+	}
 }
 
 module.exports = JavascriptGenerator;

package/lib/javascript/JavascriptModulesPlugin.js

@@ -298,16 +298,20 @@ class JavascriptModulesPlugin {
 				]) {
 					normalModuleFactory.hooks.createParser
 						.for(type)
-						.tap(PLUGIN_NAME, (_options) => {
+						.tap(PLUGIN_NAME, (options) => {
 							switch (type) {
 								case JAVASCRIPT_MODULE_TYPE_AUTO: {
-									return new JavascriptParser("auto");
+									return new JavascriptParser("auto", { parse: options.parse });
 								}
 								case JAVASCRIPT_MODULE_TYPE_DYNAMIC: {
-									return new JavascriptParser("script");
+									return new JavascriptParser("script", {
+										parse: options.parse
+									});
 								}
 								case JAVASCRIPT_MODULE_TYPE_ESM: {
-									return new JavascriptParser("module");
+									return new JavascriptParser("module", {
+										parse: options.parse
+									});
 								}
 							}
 						});
@@ -503,11 +507,10 @@ class JavascriptModulesPlugin {
 						}
 						xor.updateHash(hash);
 					}
-					const digest = /** @type {string} */ (hash.digest(hashDigest));
+					const digest = hash.digest(hashDigest);
 					chunk.contentHash.javascript = nonNumericOnlyHash(
 						digest,
-						/** @type {number} */
-						(hashDigestLength)
+						hashDigestLength
 					);
 				});
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
@@ -951,7 +954,8 @@ class JavascriptModulesPlugin {
 			let inlinedInIIFE = false;
 
 			if (avoidEntryIife) {
-				renamedInlinedModule = this.getRenamedInlineModule(
+				renamedInlinedModule = this._getRenamedInlineModule(
+					compilation,
 					allModules,
 					renderContext,
 					inlinedModules,
@@ -1585,10 +1589,7 @@ class JavascriptModulesPlugin {
 							"// Execute the module function",
 							moduleExecution,
 							...(needModuleDefer
-								? [
-										"// delete __webpack_module_deferred_exports__[module];",
-										"// skipped because strictModuleErrorHandling is not enabled."
-									]
+								? ["delete __webpack_module_deferred_exports__[moduleId];"]
 								: [])
 						]),
 			needModuleLoaded
@@ -1609,6 +1610,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * @param {Compilation} compilation compilation
 	 * @param {Module[]} allModules allModules
 	 * @param {MainRenderContext} renderContext renderContext
 	 * @param {Set<Module>} inlinedModules inlinedModules
@@ -1618,7 +1620,8 @@ class JavascriptModulesPlugin {
 	 * @param {boolean} hasChunkModules hasChunkModules
 	 * @returns {Map<Module, Source> | false} renamed inlined modules
 	 */
-	getRenamedInlineModule(
+	_getRenamedInlineModule(
+		compilation,
 		allModules,
 		renderContext,
 		inlinedModules,
@@ -1665,9 +1668,15 @@ class JavascriptModulesPlugin {
 
 			if (!moduleSource) continue;
 			const code = /** @type {string} */ (moduleSource.source());
-			const ast = JavascriptParser._parse(code, {
-				sourceType: "auto"
-			});
+
+			const { ast } = JavascriptParser._parse(
+				code,
+				{
+					sourceType: "auto",
+					ranges: true
+				},
+				JavascriptParser._getModuleParseFunction(compilation, m)
+			);
 
 			const scopeManager = eslintScope.analyze(ast, {
 				ecmaVersion: 6,