Merge branch 'main' into feature/errors-warnings-space

# Conflicts:
#	schemas/WebpackOptions.check.js

declarations/WebpackOptions.d.ts

@@ -681,7 +681,7 @@ export type AssetGeneratorDataUrl =
 	| AssetGeneratorDataUrlOptions
 	| AssetGeneratorDataUrlFunction;
 /**
- * Function that executes for module and should return an DataUrl string.
+ * Function that executes for module and should return an DataUrl string. It can have a string as 'ident' property which contributes to the module hash.
  */
 export type AssetGeneratorDataUrlFunction = (
 	source: string | Buffer,
@@ -2908,6 +2908,10 @@ export interface HttpUriOptions {
 	 * Location of the lockfile.
 	 */
 	lockfileLocation?: string;
+	/**
+	 * Proxy configuration, which can be used to specify a proxy server to use for HTTP requests.
+	 */
+	proxy?: string;
 	/**
 	 * When set, resources of existing lockfile entries will be fetched and entries will be upgraded when resource content has changed.
 	 */

declarations/plugins/schemes/HttpUriPlugin.d.ts

@@ -34,6 +34,10 @@ export interface HttpUriOptions {
 	 * Location of the lockfile.
 	 */
 	lockfileLocation?: string;
+	/**
+	 * Proxy configuration, which can be used to specify a proxy server to use for HTTP requests.
+	 */
+	proxy?: string;
 	/**
 	 * When set, resources of existing lockfile entries will be fetched and entries will be upgraded when resource content has changed.
 	 */

lib/Compilation.js

@@ -43,6 +43,7 @@ const Module = require("./Module");
 const ModuleDependencyError = require("./ModuleDependencyError");
 const ModuleDependencyWarning = require("./ModuleDependencyWarning");
 const ModuleGraph = require("./ModuleGraph");
+const ModuleHashingError = require("./ModuleHashingError");
 const ModuleNotFoundError = require("./ModuleNotFoundError");
 const ModuleProfile = require("./ModuleProfile");
 const ModuleRestoreError = require("./ModuleRestoreError");
@@ -3883,6 +3884,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		let statModulesFromCache = 0;
 		const { chunkGraph, runtimeTemplate, moduleMemCaches2 } = this;
 		const { hashFunction, hashDigest, hashDigestLength } = this.outputOptions;
+		const errors = [];
 		for (const module of this.modules) {
 			const memCache = moduleMemCaches2 && moduleMemCaches2.get(module);
 			for (const runtime of chunkGraph.getModuleRuntimes(module)) {
@@ -3907,13 +3909,20 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 					hashFunction,
 					runtimeTemplate,
 					hashDigest,
-					hashDigestLength
+					hashDigestLength,
+					errors
 				);
 				if (memCache) {
 					memCache.set(`moduleHash-${getRuntimeKey(runtime)}`, digest);
 				}
 			}
 		}
+		if (errors.length > 0) {
+			errors.sort(compareSelect(err => err.module, compareModulesByIdentifier));
+			for (const error of errors) {
+				this.errors.push(error);
+			}
+		}
 		this.logger.log(
 			`${statModulesHashed} modules hashed, ${statModulesFromCache} from cache (${
 				Math.round(
@@ -3930,17 +3939,22 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		hashFunction,
 		runtimeTemplate,
 		hashDigest,
-		hashDigestLength
+		hashDigestLength,
+		errors
 	) {
-		const moduleHash = createHash(hashFunction);
-		module.updateHash(moduleHash, {
-			chunkGraph,
-			runtime,
-			runtimeTemplate
-		});
-		const moduleHashDigest = /** @type {string} */ (
-			moduleHash.digest(hashDigest)
-		);
+		let moduleHashDigest;
+		try {
+			const moduleHash = createHash(hashFunction);
+			module.updateHash(moduleHash, {
+				chunkGraph,
+				runtime,
+				runtimeTemplate
+			});
+			moduleHashDigest = /** @type {string} */ (moduleHash.digest(hashDigest));
+		} catch (err) {
+			errors.push(new ModuleHashingError(module, err));
+			moduleHashDigest = "XXXXXX";
+		}
 		chunkGraph.setModuleHashes(
 			module,
 			runtime,
@@ -4091,6 +4105,7 @@ This prevents using hashes of each other and should be avoided.`);
 		const codeGenerationJobs = [];
 		/** @type {Map<string, Map<Module, {module: Module, hash: string, runtime: RuntimeSpec, runtimes: RuntimeSpec[]}>>} */
 		const codeGenerationJobsMap = new Map();
+		const errors = [];
 
 		const processChunk = chunk => {
 			// Last minute module hash generation for modules that depend on chunk hashes
@@ -4105,7 +4120,8 @@ This prevents using hashes of each other and should be avoided.`);
 						hashFunction,
 						runtimeTemplate,
 						hashDigest,
-						hashDigestLength
+						hashDigestLength,
+						errors
 					);
 					let hashMap = codeGenerationJobsMap.get(hash);
 					if (hashMap) {
@@ -4129,9 +4145,9 @@ This prevents using hashes of each other and should be avoided.`);
 				}
 			}
 			this.logger.timeAggregate("hashing: hash runtime modules");
-			this.logger.time("hashing: hash chunks");
-			const chunkHash = createHash(hashFunction);
 			try {
+				this.logger.time("hashing: hash chunks");
+				const chunkHash = createHash(hashFunction);
 				if (outputOptions.hashSalt) {
 					chunkHash.update(outputOptions.hashSalt);
 				}
@@ -4162,6 +4178,12 @@ This prevents using hashes of each other and should be avoided.`);
 		};
 		otherChunks.forEach(processChunk);
 		for (const chunk of runtimeChunks) processChunk(chunk);
+		if (errors.length > 0) {
+			errors.sort(compareSelect(err => err.module, compareModulesByIdentifier));
+			for (const error of errors) {
+				this.errors.push(error);
+			}
+		}
 
 		this.logger.timeAggregateEnd("hashing: hash runtime modules");
 		this.logger.timeAggregateEnd("hashing: hash chunks");
@@ -4801,6 +4823,9 @@ This prevents using hashes of each other and should be avoided.`);
 					chunkGraph.connectChunkAndModule(chunk, module);
 				}
 
+				/** @type {WebpackError[]} */
+				const errors = [];
+
 				// Hash modules
 				for (const module of modules) {
 					this._createModuleHash(
@@ -4810,15 +4835,14 @@ This prevents using hashes of each other and should be avoided.`);
 						hashFunction,
 						runtimeTemplate,
 						hashDigest,
-						hashDigestLength
+						hashDigestLength,
+						errors
 					);
 				}
 
 				const codeGenerationResults = new CodeGenerationResults(
 					this.outputOptions.hashFunction
 				);
-				/** @type {WebpackError[]} */
-				const errors = [];
 				/**
 				 * @param {Module} module the module
 				 * @param {Callback} callback callback

lib/Generator.js

@@ -38,6 +38,7 @@
  * @property {NormalModule} module the module
  * @property {ChunkGraph} chunkGraph
  * @property {RuntimeSpec} runtime
+ * @property {RuntimeTemplate=} runtimeTemplate
  */
 
 /**

lib/ModuleHashingError.js

@@ -0,0 +1,29 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+/** @typedef {import("./Module")} Module */
+
+class ModuleHashingError extends WebpackError {
+	/**
+	 * Create a new ModuleHashingError
+	 * @param {Module} module related module
+	 * @param {Error} error Original error
+	 */
+	constructor(module, error) {
+		super();
+
+		this.name = "ModuleHashingError";
+		this.error = error;
+		this.message = error.message;
+		this.details = error.stack;
+		this.module = module;
+	}
+}
+
+module.exports = ModuleHashingError;

lib/ProgressPlugin.js

@@ -531,15 +531,14 @@ class ProgressPlugin {
 			}
 		});
 		interceptHook(compiler.cache.hooks.endIdle, 0.01, "cache", "end idle");
-		compiler.hooks.initialize.intercept({
+		compiler.hooks.beforeRun.intercept({
 			name: "ProgressPlugin",
 			call() {
 				handler(0, "");
 			}
 		});
-		interceptHook(compiler.hooks.initialize, 0.01, "setup", "initialize");
-		interceptHook(compiler.hooks.beforeRun, 0.02, "setup", "before run");
-		interceptHook(compiler.hooks.run, 0.03, "setup", "run");
+		interceptHook(compiler.hooks.beforeRun, 0.01, "setup", "before run");
+		interceptHook(compiler.hooks.run, 0.02, "setup", "run");
 		interceptHook(compiler.hooks.watchRun, 0.03, "setup", "watch run");
 		interceptHook(
 			compiler.hooks.normalModuleFactory,

lib/RuntimeTemplate.js

@@ -83,6 +83,7 @@ class RuntimeTemplate {
 		this.outputOptions = outputOptions || {};
 		this.requestShortener = requestShortener;
 		this.globalObject = getGlobalObject(outputOptions.globalObject);
+		this.contentHashReplacement = "X".repeat(outputOptions.hashDigestLength);
 	}
 
 	isIIFE() {