webpack 5.102.1 → 5.104.0

package/lib/dependencies/ModuleDependency.js

@@ -18,11 +18,13 @@ const DependencyTemplate = require("../DependencyTemplate");
 class ModuleDependency extends Dependency {
 	/**
 	 * @param {string} request request path which needs resolving
+	 * @param {number=} sourceOrder source order
 	 */
-	constructor(request) {
+	constructor(request, sourceOrder) {
 		super();
 		this.request = request;
 		this.userRequest = request;
+		this.sourceOrder = sourceOrder;
 		/** @type {Range | undefined} */
 		this.range = undefined;
 		this._context = undefined;
@@ -74,6 +76,7 @@ class ModuleDependency extends Dependency {
 		write(this.userRequest);
 		write(this._context);
 		write(this.range);
+		write(this.sourceOrder);
 		super.serialize(context);
 	}
 
@@ -86,6 +89,7 @@ class ModuleDependency extends Dependency {
 		this.userRequest = read();
 		this._context = read();
 		this.range = read();
+		this.sourceOrder = read();
 		super.deserialize(context);
 	}
 }

package/lib/dependencies/ModuleHotAcceptDependency.js

@@ -17,7 +17,7 @@ class ModuleHotAcceptDependency extends ModuleDependency {
 	 * @param {Range} range location in source code
 	 */
 	constructor(request, range) {
-		super(request);
+		super(request, Infinity);
 		this.range = range;
 		this.weak = true;
 	}

package/lib/dependencies/WorkerPlugin.js

@@ -41,9 +41,9 @@ const WorkerDependency = require("./WorkerDependency");
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../Entrypoint").EntryOptions} EntryOptions */
 /** @typedef {import("../NormalModule")} NormalModule */
-/** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
+/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./HarmonyImportDependencyParserPlugin").HarmonySettings} HarmonySettings */
 
@@ -62,7 +62,7 @@ const DEFAULT_SYNTAX = [
 	"Worker from worker_threads"
 ];
 
-/** @type {WeakMap<ParserState, number>} */
+/** @type {WeakMap<JavascriptParserState, number>} */
 const workerIndexMap = new WeakMap();
 
 const PLUGIN_NAME = "WorkerPlugin";

package/lib/dependencies/getFunctionExpression.js

@@ -12,7 +12,7 @@
 
 /**
  * @param {Expression | SpreadElement} expr expressions
- * @returns {{fn: FunctionExpression | ArrowFunctionExpression, expressions: (Expression | SpreadElement)[], needThis: boolean | undefined } | undefined} function expression with additional information
+ * @returns {{ fn: FunctionExpression | ArrowFunctionExpression, expressions: (Expression | SpreadElement)[], needThis: boolean | undefined } | undefined} function expression with additional information
  */
 module.exports = (expr) => {
 	// <FunctionExpression>

package/lib/esm/ExportWebpackRequireRuntimeModule.js

@@ -6,10 +6,6 @@
 
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
-
-// CompatibilityPlugin renames `__webpack_require__` but doesn’t account for `export { __webpack_require__ }`, so we create a temporary variable to handle it.
-const EXPORT_TEMP_NAME = "__webpack_require_temp__";
 
 class ExportWebpackRequireRuntimeModule extends RuntimeModule {
 	constructor() {
@@ -27,10 +23,7 @@ class ExportWebpackRequireRuntimeModule extends RuntimeModule {
 	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		return Template.asString([
-			`var ${EXPORT_TEMP_NAME} = ${RuntimeGlobals.require};`,
-			`export { ${EXPORT_TEMP_NAME} as ${RuntimeGlobals.require} };`
-		]);
+		return `export { ${RuntimeGlobals.require} };`;
 	}
 }
 

package/lib/esm/ModuleChunkFormatPlugin.js

@@ -7,6 +7,7 @@
 
 const { ConcatSource } = require("webpack-sources");
 const { HotUpdateChunk, RuntimeGlobals } = require("..");
+const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const Template = require("../Template");
 const {
 	createChunkHashHandler,
@@ -110,10 +111,10 @@ class ModuleChunkFormatPlugin {
 			);
 			const hooks = getCompilationHooks(compilation);
 			/**
-			 * @param {Set<Chunk>} chunks the chunks to render
+			 * @param {Iterable<Chunk>} chunks the chunks to render
 			 * @param {ChunkGraph} chunkGraph the chunk graph
 			 * @param {Chunk=} runtimeChunk the runtime chunk
-			 * @returns {Source|undefined} the source
+			 * @returns {Source | undefined} the source
 			 */
 			const withDependentChunks = (chunks, chunkGraph, runtimeChunk) => {
 				if (/** @type {Set<Chunk>} */ (chunks).size > 0) {
@@ -153,7 +154,7 @@ class ModuleChunkFormatPlugin {
 						const entryDependentChunks =
 							chunkGraph.getChunkEntryDependentChunksIterable(chunk);
 						const sourceWithDependentChunks = withDependentChunks(
-							/** @type {Set<Chunk>} */ (entryDependentChunks),
+							entryDependentChunks,
 							chunkGraph,
 							chunk
 						);
@@ -214,7 +215,7 @@ class ModuleChunkFormatPlugin {
 					const loadedChunks = new Set();
 					for (let i = 0; i < entries.length; i++) {
 						const [module, entrypoint] = entries[i];
-						if (!chunkGraph.getModuleSourceTypes(module).has("javascript")) {
+						if (!chunkGraph.getModuleSourceTypes(module).has(JAVASCRIPT_TYPE)) {
 							continue;
 						}
 						const final = i + 1 === entries.length;

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -285,7 +285,8 @@ module.exports = function () {
 								update.m,
 								promises,
 								currentUpdateApplyHandlers,
-								updatedModules
+								updatedModules,
+								update.css
 							);
 							return promises;
 						}, [])

package/lib/hmr/LazyCompilationPlugin.js

@@ -10,7 +10,8 @@ const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Dependency = require("../Dependency");
 const Module = require("../Module");
 const ModuleFactory = require("../ModuleFactory");
-const { JS_TYPES } = require("../ModuleSourceTypesConstants");
+const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
+const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const {
 	WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY
 } = require("../ModuleTypeConstants");
@@ -208,7 +209,7 @@ class LazyCompilationProxyModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return JS_TYPES;
+		return JAVASCRIPT_TYPES;
 	}
 
 	/**
@@ -257,6 +258,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
@@ -289,7 +291,7 @@ class LazyCompilationProxyModule extends Module {
 				keepActive
 			]);
 		}
-		sources.set("javascript", new RawSource(source));
+		sources.set(JAVASCRIPT_TYPE, new RawSource(source));
 		return {
 			sources,
 			runtimeRequirements

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
@@ -221,17 +222,19 @@ const addToMapOfItems = (map, key, value) => {
 	array.push(value);
 };
 
+/** @typedef {Set<string>} UsedModuleIds */
+
 /**
  * @param {Compilation} compilation the compilation
  * @param {((module: Module) => boolean)=} filter filter modules
- * @returns {[Set<string>, Module[]]} used module ids as strings and modules without id matching the filter
+ * @returns {[UsedModuleIds, Module[]]} used module ids as strings and modules without id matching the filter
  */
 const getUsedModuleIdsAndModules = (compilation, filter) => {
 	const chunkGraph = compilation.chunkGraph;
 
 	const modules = [];
 
-	/** @type {Set<string>} */
+	/** @type {UsedModuleIds} */
 	const usedIds = new Set();
 	if (compilation.usedModuleIds) {
 		for (const id of compilation.usedModuleIds) {
@@ -246,7 +249,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);
 		}
@@ -255,12 +260,14 @@ const getUsedModuleIdsAndModules = (compilation, filter) => {
 	return [usedIds, modules];
 };
 
+/** @typedef {Set<string>} UsedChunkIds */
+
 /**
  * @param {Compilation} compilation the compilation
- * @returns {Set<string>} used chunk ids as strings
+ * @returns {UsedChunkIds} used chunk ids as strings
  */
 const getUsedChunkIds = (compilation) => {
-	/** @type {Set<string>} */
+	/** @type {UsedChunkIds} */
 	const usedIds = new Set();
 	if (compilation.usedChunkIds) {
 		for (const id of compilation.usedChunkIds) {
@@ -296,7 +303,12 @@ const assignNames = (
 	usedIds,
 	assignName
 ) => {
-	/** @type {Map<string, T[]>} */
+	/**
+	 * @template T
+	 * @typedef {Map<string, T[]>} MapToItem
+	 */
+
+	/** @type {MapToItem<T>} */
 	const nameToItems = new Map();
 
 	for (const item of items) {
@@ -304,7 +316,7 @@ const assignNames = (
 		addToMapOfItems(nameToItems, name, item);
 	}
 
-	/** @type {Map<string, T[]>} */
+	/** @type {MapToItem<T>} */
 	const nameToItems2 = new Map();
 
 	for (const [name, items] of nameToItems) {
@@ -399,7 +411,7 @@ const assignDeterministicIds = (
 };
 
 /**
- * @param {Set<string>} usedIds used ids
+ * @param {UsedModuleIds} usedIds used ids
  * @param {Iterable<Module>} modules the modules
  * @param {Compilation} compilation the compilation
  * @returns {void}

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

@@ -9,7 +9,7 @@ const util = require("util");
 const { RawSource, ReplaceSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
-const { JS_TYPES } = require("../ModuleSourceTypesConstants");
+const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
 const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -21,6 +21,7 @@ const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibi
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../NormalModule")} NormalModule */
 
@@ -59,12 +60,12 @@ class JavascriptGenerator extends Generator {
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
-		return JS_TYPES;
+		return JAVASCRIPT_TYPES;
 	}
 
 	/**
 	 * @param {NormalModule} module the module
-	 * @param {string=} type source type
+	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {
@@ -101,107 +102,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 +171,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;