webpack 5.102.0 → 5.102.1

package/lib/css/walkCssTokens.js

@@ -66,7 +66,7 @@ const CC_LOWER_Z = "z".charCodeAt(0);
 const CC_UPPER_A = "A".charCodeAt(0);
 const CC_UPPER_F = "F".charCodeAt(0);
 const CC_UPPER_E = "E".charCodeAt(0);
-const CC_UPPER_U = "E".charCodeAt(0);
+const CC_UPPER_U = "U".charCodeAt(0);
 const CC_UPPER_Z = "Z".charCodeAt(0);
 const CC_0 = "0".charCodeAt(0);
 const CC_9 = "9".charCodeAt(0);

package/lib/dependencies/ContextElementDependency.js

@@ -68,8 +68,8 @@ class ContextElementDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
-		if (this.attributes !== undefined) {
-			str += JSON.stringify(this.attributes);
+		if (this.attributes) {
+			str += `|importAttributes${JSON.stringify(this.attributes)}`;
 		}
 		return str;
 	}

package/lib/dependencies/CssLocalIdentifierDependency.js

@@ -64,9 +64,7 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 		hash.update(local);
 	}
 
-	const localIdentHash =
-		/** @type {string} */
-		(hash.digest(hashDigest)).slice(0, hashDigestLength);
+	const localIdentHash = hash.digest(hashDigest).slice(0, hashDigestLength);
 
 	return runtimeTemplate.compilation
 		.getPath(localIdentName, {

package/lib/dependencies/HarmonyImportDependency.js

@@ -79,8 +79,11 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
-		if (this.attributes !== undefined) {
-			str += JSON.stringify(this.attributes);
+		if (this.defer) {
+			str += "|defer";
+		}
+		if (this.attributes) {
+			str += `|importAttributes${JSON.stringify(this.attributes)}`;
 		}
 		return str;
 	}

package/lib/dependencies/ImportContextDependency.js

@@ -35,6 +35,19 @@ class ImportContextDependency extends ContextDependency {
 		return "esm";
 	}
 
+	/**
+	 * @returns {string | null} an identifier to merge equal requests
+	 */
+	getResourceIdentifier() {
+		let str = super.getResourceIdentifier();
+
+		if (this.options.attributes) {
+			str += `|importAttributes${JSON.stringify(this.options.attributes)}`;
+		}
+
+		return str;
+	}
+
 	/**
 	 * @param {ObjectSerializerContext} context context
 	 */

package/lib/dependencies/ImportDependency.js

@@ -50,8 +50,8 @@ class ImportDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
-		if (this.attributes !== undefined) {
-			str += JSON.stringify(this.attributes);
+		if (this.attributes) {
+			str += `|importAttributes${JSON.stringify(this.attributes)}`;
 		}
 		return str;
 	}

package/lib/dependencies/ImportMetaPlugin.js

@@ -115,7 +115,7 @@ class ImportMetaPlugin {
 									new ModuleDependencyWarning(
 										parser.state.module,
 										new CriticalDependencyWarning(
-											"Accessing import.meta directly is unsupported (only property access or destructuring is supported)"
+											"'import.meta' cannot be used as a standalone expression. For static analysis, its properties must be accessed directly (e.g., 'import.meta.url') or through destructuring."
 										),
 										/** @type {DependencyLocation} */ (metaProperty.loc)
 									)

package/lib/dependencies/WorkerPlugin.js

@@ -378,9 +378,7 @@ class WorkerPlugin {
 							)}|${i}`;
 							const hash = createHash(compilation.outputOptions.hashFunction);
 							hash.update(name);
-							const digest =
-								/** @type {string} */
-								(hash.digest(compilation.outputOptions.hashDigest));
+							const digest = hash.digest(compilation.outputOptions.hashDigest);
 							entryOptions.runtime = digest.slice(
 								0,
 								compilation.outputOptions.hashDigestLength

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

@@ -25,7 +25,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);
 };
 

package/lib/javascript/JavascriptModulesPlugin.js

@@ -503,11 +503,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(

package/lib/javascript/JavascriptParser.js

@@ -106,7 +106,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 & { options?: Expression | null, phase?: "defer" }} ImportExpression */
+/** @typedef {import("estree").ImportExpression & { phase?: "defer" }} ImportExpression */
 
 /** @type {string[]} */
 const EMPTY_ARRAY = [];

package/lib/library/SystemLibraryPlugin.js

@@ -134,11 +134,21 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 										);
 										if (used) {
 											if (otherUnused || used !== exportInfo.name) {
-												instructions.push(
-													`${external}${propertyAccess([
-														used
-													])} = module${propertyAccess([exportInfo.name])};`
-												);
+												if (exportInfo.name === "default") {
+													// Ideally we should use `module && module.__esModule ? module['default'] : module`
+													// But we need to keep compatibility with SystemJS format libraries (they are using `default`) and bundled SystemJS libraries from commonjs format
+													instructions.push(
+														`${external}${propertyAccess([
+															used
+														])} = module["default"] || module;`
+													);
+												} else {
+													instructions.push(
+														`${external}${propertyAccess([
+															used
+														])} = module${propertyAccess([exportInfo.name])};`
+													);
+												}
 												handledNames.push(exportInfo.name);
 											}
 										} else {

package/lib/optimize/RealContentHashPlugin.js

@@ -12,6 +12,8 @@ const WebpackError = require("../WebpackError");
 const { compareSelect, compareStrings } = require("../util/comparators");
 const createHash = require("../util/createHash");
 
+/** @typedef {import("../../declarations/WebpackOptions").HashFunction} HashFunction */
+/** @typedef {import("../../declarations/WebpackOptions").HashDigest} HashDigest */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Cache").Etag} Etag */
 /** @typedef {import("../Compilation").AssetInfo} AssetInfo */
@@ -109,8 +111,8 @@ const compilationHooksMap = new WeakMap();
 
 /**
  * @typedef {object} RealContentHashPluginOptions
- * @property {string | Hash} hashFunction the hash function to use
- * @property {string=} hashDigest the hash digest to use
+ * @property {HashFunction} hashFunction the hash function to use
+ * @property {HashDigest} hashDigest the hash digest to use
  */
 
 const PLUGIN_NAME = "RealContentHashPlugin";
@@ -432,7 +434,7 @@ ${referencingAssets
 								hash.update(content);
 							}
 							const digest = hash.digest(this._hashDigest);
-							newHash = /** @type {string} */ (digest.slice(0, oldHash.length));
+							newHash = digest.slice(0, oldHash.length);
 						}
 						hashToNewHash.set(oldHash, newHash);
 					}

package/lib/serialization/FileMiddleware.js

@@ -55,7 +55,7 @@ const WRITE_LIMIT_CHUNK = 511 * 1024 * 1024;
 const hashForName = (buffers, hashFunction) => {
 	const hash = createHash(hashFunction);
 	for (const buf of buffers) hash.update(buf);
-	return /** @type {string} */ (hash.digest("hex"));
+	return hash.digest("hex");
 };
 
 const COMPRESSION_CHUNK_SIZE = 100 * 1024 * 1024;

package/lib/serialization/ObjectMiddleware.js

@@ -117,7 +117,7 @@ const setMapSize = (map, size) => {
 const toHash = (buffer, hashFunction) => {
 	const hash = createHash(hashFunction);
 	hash.update(buffer);
-	return /** @type {string} */ (hash.digest("latin1"));
+	return hash.digest("latin1");
 };
 
 const ESCAPE = null;

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -722,7 +722,7 @@ const SIMPLE_EXTRACTORS = {
 			}
 		},
 		hash: (object, compilation) => {
-			object.hash = /** @type {string} */ (compilation.hash);
+			object.hash = compilation.hash;
 		},
 		version: (object) => {
 			object.version = require("../../package.json").version;

package/lib/util/Hash.js

@@ -5,14 +5,31 @@
 
 "use strict";
 
+/** @typedef {import("../../declarations/WebpackOptions").HashDigest} Encoding */
+
 class Hash {
 	/* istanbul ignore next */
 	/**
 	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
 	 * @abstract
-	 * @param {string|Buffer} data data
-	 * @param {string=} inputEncoding data encoding
-	 * @returns {this} updated hash
+	 * @overload
+	 * @param {string | Buffer} data data
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @abstract
+	 * @overload
+	 * @param {string} data data
+	 * @param {Encoding} inputEncoding data encoding
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @abstract
+	 * @param {string | Buffer} data data
+	 * @param {Encoding=} inputEncoding data encoding
+	 * @returns {Hash} updated hash
 	 */
 	update(data, inputEncoding) {
 		const AbstractMethodError = require("../AbstractMethodError");
@@ -24,8 +41,21 @@ class Hash {
 	/**
 	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
 	 * @abstract
-	 * @param {string=} encoding encoding of the return value
-	 * @returns {string|Buffer} digest
+	 * @overload
+	 * @returns {Buffer} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @abstract
+	 * @overload
+	 * @param {Encoding} encoding encoding of the return value
+	 * @returns {string} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @abstract
+	 * @param {Encoding=} encoding encoding of the return value
+	 * @returns {string | Buffer} digest
 	 */
 	digest(encoding) {
 		const AbstractMethodError = require("../AbstractMethodError");

package/lib/util/create-schema-validation.js

@@ -8,7 +8,7 @@
 const memoize = require("./memoize");
 
 /** @typedef {import("schema-utils").Schema} Schema */
-/** @typedef {import("schema-utils/declarations/validate").ValidationErrorConfiguration} ValidationErrorConfiguration */
+/** @typedef {import("schema-utils").ValidationErrorConfiguration} ValidationErrorConfiguration */
 
 const getValidate = memoize(() => require("schema-utils").validate);
 

package/lib/util/createHash.js

@@ -7,9 +7,10 @@
 
 const Hash = require("./Hash");
 
+/** @typedef {import("../../declarations/WebpackOptions").HashDigest} Encoding */
 /** @typedef {import("../../declarations/WebpackOptions").HashFunction} HashFunction */
 
-const BULK_SIZE = 2000;
+const BULK_SIZE = 3;
 
 // We are using an object instead of a Map as this will stay static during the runtime
 // so access to it can be optimized by v8
@@ -38,9 +39,22 @@ class BulkUpdateDecorator extends Hash {
 
 	/**
 	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
-	 * @param {string|Buffer} data data
-	 * @param {string=} inputEncoding data encoding
-	 * @returns {this} updated hash
+	 * @overload
+	 * @param {string | Buffer} data data
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @overload
+	 * @param {string} data data
+	 * @param {Encoding} inputEncoding data encoding
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @param {string | Buffer} data data
+	 * @param {Encoding=} inputEncoding data encoding
+	 * @returns {Hash} updated hash
 	 */
 	update(data, inputEncoding) {
 		if (
@@ -55,7 +69,11 @@ class BulkUpdateDecorator extends Hash {
 				this.hash.update(this.buffer);
 				this.buffer = "";
 			}
-			this.hash.update(data, inputEncoding);
+			if (typeof data === "string" && inputEncoding) {
+				this.hash.update(data, inputEncoding);
+			} else {
+				this.hash.update(data);
+			}
 		} else {
 			this.buffer += data;
 			if (this.buffer.length > BULK_SIZE) {
@@ -71,8 +89,19 @@ class BulkUpdateDecorator extends Hash {
 
 	/**
 	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
-	 * @param {string=} encoding encoding of the return value
-	 * @returns {string|Buffer} digest
+	 * @overload
+	 * @returns {Buffer} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @overload
+	 * @param {Encoding} encoding encoding of the return value
+	 * @returns {string} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @param {Encoding=} encoding encoding of the return value
+	 * @returns {string | Buffer} digest
 	 */
 	digest(encoding) {
 		let digestCache;
@@ -91,9 +120,19 @@ class BulkUpdateDecorator extends Hash {
 		if (buffer.length > 0) {
 			this.hash.update(buffer);
 		}
+		if (!encoding) {
+			const result = this.hash.digest();
+			if (digestCache !== undefined) {
+				digestCache.set(buffer, result);
+			}
+			return result;
+		}
 		const digestResult = this.hash.digest(encoding);
+		// Compatibility with the old hash library
 		const result =
-			typeof digestResult === "string" ? digestResult : digestResult.toString();
+			typeof digestResult === "string"
+				? digestResult
+				: /** @type {NodeJS.TypedArray} */ (digestResult).toString();
 		if (digestCache !== undefined) {
 			digestCache.set(buffer, result);
 		}
@@ -110,9 +149,22 @@ class DebugHash extends Hash {
 
 	/**
 	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
-	 * @param {string|Buffer} data data
-	 * @param {string=} inputEncoding data encoding
-	 * @returns {this} updated hash
+	 * @overload
+	 * @param {string | Buffer} data data
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @overload
+	 * @param {string} data data
+	 * @param {Encoding} inputEncoding data encoding
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @param {string | Buffer} data data
+	 * @param {Encoding=} inputEncoding data encoding
+	 * @returns {Hash} updated hash
 	 */
 	update(data, inputEncoding) {
 		if (typeof data !== "string") data = data.toString("utf8");
@@ -132,8 +184,19 @@ class DebugHash extends Hash {
 
 	/**
 	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
-	 * @param {string=} encoding encoding of the return value
-	 * @returns {string|Buffer} digest
+	 * @overload
+	 * @returns {Buffer} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @overload
+	 * @param {Encoding} encoding encoding of the return value
+	 * @returns {string} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @param {Encoding=} encoding encoding of the return value
+	 * @returns {string | Buffer} digest
 	 */
 	digest(encoding) {
 		return Buffer.from(`@webpack-debug-digest@${this.string}`).toString("hex");
@@ -186,14 +249,21 @@ module.exports = (algorithm) => {
 		case "native-md4":
 			if (crypto === undefined) crypto = require("crypto");
 			return new BulkUpdateDecorator(
-				() => /** @type {typeof import("crypto")} */ (crypto).createHash("md4"),
+				() =>
+					/** @type {Hash} */ (
+						/** @type {typeof import("crypto")} */
+						(crypto).createHash("md4")
+					),
 				"md4"
 			);
 		default:
 			if (crypto === undefined) crypto = require("crypto");
 			return new BulkUpdateDecorator(
 				() =>
-					/** @type {typeof import("crypto")} */ (crypto).createHash(algorithm),
+					/** @type {Hash} */ (
+						/** @type {typeof import("crypto")} */
+						(crypto).createHash(algorithm)
+					),
 				algorithm
 			);
 	}

package/lib/util/hash/BatchedHash.js

@@ -8,6 +8,8 @@
 const Hash = require("../Hash");
 const MAX_SHORT_STRING = require("./wasm-hash").MAX_SHORT_STRING;
 
+/** @typedef {import("../../../declarations/WebpackOptions").HashDigest} Encoding */
+
 class BatchedHash extends Hash {
 	/**
 	 * @param {Hash} hash hash
@@ -21,9 +23,22 @@ class BatchedHash extends Hash {
 
 	/**
 	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
-	 * @param {string|Buffer} data data
-	 * @param {string=} inputEncoding data encoding
-	 * @returns {this} updated hash
+	 * @overload
+	 * @param {string | Buffer} data data
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @overload
+	 * @param {string} data data
+	 * @param {Encoding} inputEncoding data encoding
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @param {string | Buffer} data data
+	 * @param {Encoding=} inputEncoding data encoding
+	 * @returns {Hash} updated hash
 	 */
 	update(data, inputEncoding) {
 		if (this.string !== undefined) {
@@ -35,7 +50,11 @@ class BatchedHash extends Hash {
 				this.string += data;
 				return this;
 			}
-			this.hash.update(this.string, this.encoding);
+			if (this.encoding) {
+				this.hash.update(this.string, this.encoding);
+			} else {
+				this.hash.update(this.string);
+			}
 			this.string = undefined;
 		}
 		if (typeof data === "string") {
@@ -46,8 +65,10 @@ class BatchedHash extends Hash {
 			) {
 				this.string = data;
 				this.encoding = inputEncoding;
-			} else {
+			} else if (inputEncoding) {
 				this.hash.update(data, inputEncoding);
+			} else {
+				this.hash.update(data);
 			}
 		} else {
 			this.hash.update(data);
@@ -57,12 +78,30 @@ class BatchedHash extends Hash {
 
 	/**
 	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
-	 * @param {string=} encoding encoding of the return value
-	 * @returns {string|Buffer} digest
+	 * @overload
+	 * @returns {Buffer} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @overload
+	 * @param {Encoding} encoding encoding of the return value
+	 * @returns {string} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @param {Encoding=} encoding encoding of the return value
+	 * @returns {string | Buffer} digest
 	 */
 	digest(encoding) {
 		if (this.string !== undefined) {
-			this.hash.update(this.string, this.encoding);
+			if (this.encoding) {
+				this.hash.update(this.string, this.encoding);
+			} else {
+				this.hash.update(this.string);
+			}
+		}
+		if (!encoding) {
+			return this.hash.digest();
 		}
 		return this.hash.digest(encoding);
 	}