webpack 5.102.0 → 5.103.0

package/lib/Compilation.js

@@ -134,6 +134,7 @@ const { isSourceEqual } = require("./util/source");
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsModule} StatsModule */
 /** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 /** @typedef {import("./util/Hash")} Hash */
+
 /**
  * @template T
  * @typedef {import("./util/deprecation").FakeHook<T>} FakeHook<T>
@@ -296,6 +297,7 @@ const { isSourceEqual } = require("./util/source");
  * @property {boolean=} development true, when asset is only used for development and doesn't count towards user-facing assets
  * @property {boolean=} hotModuleReplacement true, when asset ships data for updating an existing application (HMR)
  * @property {boolean=} javascriptModule true, when asset is javascript and an ESM
+ * @property {boolean=} manifest true, when file is a manifest
  * @property {Record<string, null | string | string[]>=} related object of pointers to other assets, keyed by type of relation (only points from parent to child)
  */
 
@@ -1635,6 +1637,10 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 	_processModuleDependencies(module, callback) {
 		/** @type {{ factory: ModuleFactory, dependencies: Dependency[], context: string | undefined, originModule: Module | null }[]} */
 		const sortedDependencies = [];
+		/** @type {boolean} */
+		const hasLowPriorityDependencies = module.dependencies.some(
+			Dependency.isLowPriorityDependency
+		);
 
 		/** @type {DependenciesBlock} */
 		let currentBlock;
@@ -1882,12 +1888,29 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 				if (list === undefined) {
 					/** @type {FactoryCacheValue} */
 					(factoryCacheValue).set(cacheKey, (list = []));
-					sortedDependencies.push({
+					const newItem = {
 						factory: factoryCacheKey2,
 						dependencies: list,
 						context: dep.getContext(),
 						originModule: module
-					});
+					};
+					if (hasLowPriorityDependencies) {
+						let insertIndex = sortedDependencies.length;
+						while (insertIndex > 0) {
+							const item = sortedDependencies[insertIndex - 1];
+							const isAllLowPriorityDependencies = item.dependencies.every(
+								Dependency.isLowPriorityDependency
+							);
+							if (isAllLowPriorityDependencies) {
+								insertIndex--;
+							} else {
+								break;
+							}
+						}
+						sortedDependencies.splice(insertIndex, 0, newItem);
+					} else {
+						sortedDependencies.push(newItem);
+					}
 				}
 				list.push(dep);
 				listCacheKey1 = category;
@@ -4378,7 +4401,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 				runtime,
 				runtimeTemplate
 			});
-			moduleHashDigest = /** @type {string} */ (moduleHash.digest(hashDigest));
+			moduleHashDigest = moduleHash.digest(hashDigest);
 		} catch (err) {
 			errors.push(new ModuleHashingError(module, /** @type {Error} */ (err)));
 			moduleHashDigest = "XXXXXX";
@@ -4601,9 +4624,7 @@ This prevents using hashes of each other and should be avoided.`);
 					moduleGraph: this.moduleGraph,
 					runtimeTemplate: this.runtimeTemplate
 				});
-				const chunkHashDigest = /** @type {string} */ (
-					chunkHash.digest(hashDigest)
-				);
+				const chunkHashDigest = chunkHash.digest(hashDigest);
 				hash.update(chunkHashDigest);
 				chunk.hash = chunkHashDigest;
 				chunk.renderedHash = chunk.hash.slice(0, hashDigestLength);
@@ -4637,7 +4658,7 @@ This prevents using hashes of each other and should be avoided.`);
 		this.logger.timeAggregateEnd("hashing: hash chunks");
 		this.logger.time("hashing: hash digest");
 		this.hooks.fullHash.call(hash);
-		this.fullHash = /** @type {string} */ (hash.digest(hashDigest));
+		this.fullHash = hash.digest(hashDigest);
 		this.hash = this.fullHash.slice(0, hashDigestLength);
 		this.logger.timeEnd("hashing: hash digest");
 
@@ -4652,9 +4673,7 @@ This prevents using hashes of each other and should be avoided.`);
 					runtime: chunk.runtime,
 					runtimeTemplate
 				});
-				const moduleHashDigest = /** @type {string} */ (
-					moduleHash.digest(hashDigest)
-				);
+				const moduleHashDigest = moduleHash.digest(hashDigest);
 				const oldHash = chunkGraph.getModuleHash(module, chunk.runtime);
 				chunkGraph.setModuleHashes(
 					module,
@@ -4671,9 +4690,7 @@ This prevents using hashes of each other and should be avoided.`);
 			const chunkHash = createHash(hashFunction);
 			chunkHash.update(chunk.hash);
 			chunkHash.update(this.hash);
-			const chunkHashDigest =
-				/** @type {string} */
-				(chunkHash.digest(hashDigest));
+			const chunkHashDigest = chunkHash.digest(hashDigest);
 			chunk.hash = chunkHashDigest;
 			chunk.renderedHash = chunk.hash.slice(0, hashDigestLength);
 			this.hooks.contentHash.call(chunk);

package/lib/ConcatenationScope.js

@@ -112,18 +112,6 @@ class ConcatenationScope {
 		this._currentModule.namespaceExportSymbol = symbol;
 	}
 
-	/**
-	 * @param {string} symbol identifier of the export in source code
-	 * @returns {boolean} registered success
-	 */
-	registerUsedName(symbol) {
-		if (this.usedNames.has(symbol)) {
-			return false;
-		}
-		this.usedNames.add(symbol);
-		return true;
-	}
-
 	/**
 	 * @param {Module} module the referenced module
 	 * @param {Partial<ModuleReferenceOptions>} options options
@@ -189,7 +177,4 @@ class ConcatenationScope {
 ConcatenationScope.DEFAULT_EXPORT = DEFAULT_EXPORT;
 ConcatenationScope.NAMESPACE_OBJECT_EXPORT = NAMESPACE_OBJECT_EXPORT;
 
-/** @type {WeakMap<Chunk, Set<string>>} */
-ConcatenationScope.chunkUsedNames = new WeakMap();
-
 module.exports = ConcatenationScope;

package/lib/ContextModule.js

@@ -254,10 +254,12 @@ class ContextModule extends Module {
 		} else if (this.options.namespaceObject) {
 			identifier += "|namespace object";
 		}
+		if (this.options.attributes) {
+			identifier += `|importAttributes: ${JSON.stringify(this.options.attributes)}`;
+		}
 		if (this.layer) {
 			identifier += `|layer: ${this.layer}`;
 		}
-
 		return identifier;
 	}
 

package/lib/CssModule.js

@@ -30,9 +30,13 @@ class CssModule extends NormalModule {
 		super(options);
 
 		// Avoid override `layer` for `Module` class, because it is a feature to run module in specific layer
+		/** @type {CSSModuleCreateData['cssLayer']} */
 		this.cssLayer = options.cssLayer;
+		/** @type {CSSModuleCreateData['supports']} */
 		this.supports = options.supports;
+		/** @type {CSSModuleCreateData['media']} */
 		this.media = options.media;
+		/** @type {CSSModuleCreateData['inheritance']} */
 		this.inheritance = options.inheritance;
 	}
 
@@ -150,7 +154,8 @@ class CssModule extends NormalModule {
 			cssLayer: /** @type {EXPECTED_ANY} */ (null),
 			supports: /** @type {EXPECTED_ANY} */ (null),
 			media: /** @type {EXPECTED_ANY} */ (null),
-			inheritance: /** @type {EXPECTED_ANY} */ (null)
+			inheritance: /** @type {EXPECTED_ANY} */ (null),
+			extractSourceMap: /** @type {EXPECTED_ANY} */ (null)
 		});
 		obj.deserialize(context);
 		return obj;

package/lib/DefinePlugin.js

@@ -354,20 +354,20 @@ class DefinePlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const definitions = this.definitions;
-
-		/**
-		 * @type {Map<string, Set<string>>}
-		 */
-		const finalByNestedKey = new Map();
-		/**
-		 * @type {Map<string, Set<string>>}
-		 */
-		const nestedByFinalKey = new Map();
-
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
+				const definitions = this.definitions;
+
+				/**
+				 * @type {Map<string, Set<string>>}
+				 */
+				const finalByNestedKey = new Map();
+				/**
+				 * @type {Map<string, Set<string>>}
+				 */
+				const nestedByFinalKey = new Map();
+
 				const logger = compilation.getLogger("webpack.DefinePlugin");
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -830,7 +830,7 @@ class DefinePlugin {
 
 				compilation.valueCacheVersions.set(
 					VALUE_DEP_MAIN,
-					/** @type {string} */ (mainHash.digest("hex").slice(0, 8))
+					mainHash.digest("hex").slice(0, 8)
 				);
 			}
 		);

package/lib/Dependency.js

@@ -19,7 +19,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
-
+/** @typedef {import("./dependencies/ModuleDependency")} ModuleDependency */
 /**
  * @typedef {object} UpdateHashContext
  * @property {ChunkGraph} chunkGraph
@@ -360,6 +360,13 @@ Object.defineProperty(Dependency.prototype, "module", {
 	}
 });
 
+/**
+ * @param {Dependency} dependency dep
+ * @returns {boolean} true if the dependency is a low priority dependency
+ */
+Dependency.isLowPriorityDependency = (dependency) =>
+	/** @type {ModuleDependency} */ (dependency).sourceOrder === Infinity;
+
 // TODO remove in webpack 6
 Object.defineProperty(Dependency.prototype, "disconnect", {
 	/**

package/lib/DependencyTemplate.js

@@ -41,6 +41,7 @@
 /**
  * @typedef {object} CssDependencyTemplateContextExtras
  * @property {CssData} cssData the css exports data
+ * @property {string} type the css exports data
  */
 
 /**

package/lib/DependencyTemplates.js

@@ -48,7 +48,7 @@ class DependencyTemplates {
 	updateHash(part) {
 		const hash = createHash(this._hashFunction);
 		hash.update(`${this._hash}${part}`);
-		this._hash = /** @type {string} */ (hash.digest("hex"));
+		this._hash = hash.digest("hex");
 	}
 
 	getHash() {