webpack 5.48.0 → 5.49.0

package/hot/only-dev-server.js

@@ -13,7 +13,7 @@ if (module.hot) {
 		module.hot
 			.check()
 			.then(function (updatedModules) {
-				if (!updatedModules || updatedModules.length === 0) {
+				if (!updatedModules) {
 					log("warning", "[HMR] Cannot find update. Need to do a full reload!");
 					log(
 						"warning",

package/hot/poll.js

@@ -12,7 +12,7 @@ if (module.hot) {
 			module.hot
 				.check(true)
 				.then(function (updatedModules) {
-					if (!updatedModules || updatedModules.length === 0) {
+					if (!updatedModules) {
 						if (fromUpdate) log("info", "[HMR] Update applied.");
 						return;
 					}

package/hot/signal.js

@@ -9,7 +9,7 @@ if (module.hot) {
 		module.hot
 			.check()
 			.then(function (updatedModules) {
-				if (!updatedModules || updatedModules.length === 0) {
+				if (!updatedModules) {
 					if (fromUpdate) log("info", "[HMR] Update applied.");
 					else log("warning", "[HMR] Cannot find update.");
 					return;

package/lib/Compilation.js

@@ -1302,6 +1302,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 
 		module.needBuild(
 			{
+				compilation: this,
 				fileSystemInfo: this.fileSystemInfo,
 				valueCacheVersions: this.valueCacheVersions
 			},
@@ -1573,10 +1574,11 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 				if (err) {
 					if (dependencies.every(d => d.optional)) {
 						this.warnings.push(err);
+						return callback();
 					} else {
 						this.errors.push(err);
+						return callback(err);
 					}
-					return callback(err);
 				}
 
 				if (!newModule) {
@@ -3784,8 +3786,9 @@ This prevents using hashes of each other and should be avoided.`);
 		/** @type {Map<string, {hash: string, source: Source, chunk: Chunk}>} */
 		const alreadyWrittenFiles = new Map();
 
-		asyncLib.forEach(
+		asyncLib.forEachLimit(
 			this.chunks,
+			15,
 			(chunk, callback) => {
 				/** @type {RenderManifestEntry[]} */
 				let manifest;

package/lib/ExternalModuleFactoryPlugin.js

@@ -62,6 +62,7 @@ class ExternalModuleFactoryPlugin {
 				const context = data.context;
 				const contextInfo = data.contextInfo;
 				const dependency = data.dependencies[0];
+				const dependencyType = data.dependencyType;
 
 				/**
 				 * @param {string|string[]|boolean|Record<string, string|string[]>} value the external config
@@ -172,7 +173,6 @@ class ExternalModuleFactoryPlugin {
 								cb
 							);
 						} else {
-							const dependencyType = dependency.category || "";
 							const promise = externals(
 								{
 									context,

package/lib/HotModuleReplacementPlugin.js

@@ -297,10 +297,10 @@ class HotModuleReplacementPlugin {
 						records.hotIndex = hotIndex;
 						records.fullHashChunkModuleHashes = fullHashChunkModuleHashes;
 						records.chunkModuleHashes = chunkModuleHashes;
-						records.chunkHashs = {};
+						records.chunkHashes = {};
 						records.chunkRuntime = {};
 						for (const chunk of compilation.chunks) {
-							records.chunkHashs[chunk.id] = chunk.hash;
+							records.chunkHashes[chunk.id] = chunk.hash;
 							records.chunkRuntime[chunk.id] = getRuntimeKey(chunk.runtime);
 						}
 						records.chunkModuleIds = {};
@@ -420,7 +420,7 @@ class HotModuleReplacementPlugin {
 						if (records.hash === compilation.hash) return;
 						if (
 							!records.chunkModuleHashes ||
-							!records.chunkHashs ||
+							!records.chunkHashes ||
 							!records.chunkModuleIds
 						) {
 							return;
@@ -477,7 +477,7 @@ class HotModuleReplacementPlugin {
 						/** @type {Set<string | number>} */
 						const completelyRemovedModules = new Set();
 
-						for (const key of Object.keys(records.chunkHashs)) {
+						for (const key of Object.keys(records.chunkHashes)) {
 							const oldRuntime = keyToRuntime(records.chunkRuntime[key]);
 							/** @type {Module[]} */
 							const remainingModules = [];

package/lib/Module.js

@@ -93,6 +93,7 @@ const makeSerializable = require("./util/makeSerializable");
 
 /**
  * @typedef {Object} NeedBuildContext
+ * @property {Compilation} compilation
  * @property {FileSystemInfo} fileSystemInfo
  * @property {Map<string, string | Set<string>>} valueCacheVersions
  */

package/lib/MultiCompiler.js

@@ -87,7 +87,6 @@ module.exports = class MultiCompiler {
 			const compiler = this.compilers[index];
 			const compilerIndex = index;
 			let compilerDone = false;
-			// eslint-disable-next-line no-loop-func
 			compiler.hooks.done.tap("MultiCompiler", stats => {
 				if (!compilerDone) {
 					compilerDone = true;
@@ -98,7 +97,6 @@ module.exports = class MultiCompiler {
 					this.hooks.done.call(new MultiStats(compilerStats));
 				}
 			});
-			// eslint-disable-next-line no-loop-func
 			compiler.hooks.invalid.tap("MultiCompiler", () => {
 				if (compilerDone) {
 					compilerDone = false;

package/lib/NormalModule.js

@@ -16,6 +16,7 @@ const {
 	SourceMapSource
 } = require("webpack-sources");
 const Compilation = require("./Compilation");
+const HookWebpackError = require("./HookWebpackError");
 const Module = require("./Module");
 const ModuleBuildError = require("./ModuleBuildError");
 const ModuleError = require("./ModuleError");
@@ -178,6 +179,7 @@ makeSerializable(
  * @property {SyncHook<[object, NormalModule]>} loader
  * @property {SyncHook<[LoaderItem[], NormalModule, object]>} beforeLoaders
  * @property {HookMap<AsyncSeriesBailHook<[string, NormalModule], string | Buffer>>} readResourceForScheme
+ * @property {AsyncSeriesBailHook<[NormalModule, NeedBuildContext], boolean>} needBuild
  */
 
 /** @type {WeakMap<Compilation, NormalModuleCompilationHooks>} */
@@ -201,7 +203,8 @@ class NormalModule extends Module {
 				beforeLoaders: new SyncHook(["loaders", "module", "loaderContext"]),
 				readResourceForScheme: new HookMap(
 					() => new AsyncSeriesBailHook(["resource", "module"])
-				)
+				),
+				needBuild: new AsyncSeriesBailHook(["module", "context"])
 			};
 			compilationHooksMap.set(compilation, hooks);
 		}
@@ -218,6 +221,7 @@ class NormalModule extends Module {
 	 * @param {LoaderItem[]} options.loaders list of loaders
 	 * @param {string} options.resource path + query of the real resource
 	 * @param {Record<string, any>=} options.resourceResolveData resource resolve data
+	 * @param {string} options.context context directory for resolving
 	 * @param {string | undefined} options.matchResource path + query of the matched resource (virtual)
 	 * @param {Parser} options.parser the parser used
 	 * @param {object} options.parserOptions the options of the parser used
@@ -234,6 +238,7 @@ class NormalModule extends Module {
 		loaders,
 		resource,
 		resourceResolveData,
+		context,
 		matchResource,
 		parser,
 		parserOptions,
@@ -241,7 +246,7 @@ class NormalModule extends Module {
 		generatorOptions,
 		resolveOptions
 	}) {
-		super(type, getContext(resource), layer);
+		super(type, context || getContext(resource), layer);
 
 		// Info from Factory
 		/** @type {string} */
@@ -352,6 +357,7 @@ class NormalModule extends Module {
 		this.generator = m.generator;
 		this.generatorOptions = m.generatorOptions;
 		this.resource = m.resource;
+		this.context = m.context;
 		this.matchResource = m.matchResource;
 		this.loaders = m.loaders;
 	}
@@ -751,6 +757,13 @@ class NormalModule extends Module {
 
 		const hooks = NormalModule.getCompilationHooks(compilation);
 
+		this.buildInfo.fileDependencies = new LazySet();
+		this.buildInfo.contextDependencies = new LazySet();
+		this.buildInfo.missingDependencies = new LazySet();
+		if (this.loaders.length > 0) {
+			this.buildInfo.buildDependencies = new LazySet();
+		}
+		this.buildInfo.cacheable = true;
 		try {
 			hooks.beforeLoaders.call(this.loaders, this, loaderContext);
 		} catch (err) {
@@ -762,7 +775,8 @@ class NormalModule extends Module {
 				resource: this.resource,
 				loaders: this.loaders,
 				context: loaderContext,
-				processResource: (loaderContext, resource, callback) => {
+				processResource: (loaderContext, resourcePath, callback) => {
+					const resource = loaderContext.resource;
 					const scheme = getScheme(resource);
 					if (scheme) {
 						hooks.readResourceForScheme
@@ -775,8 +789,8 @@ class NormalModule extends Module {
 								return callback(null, result);
 							});
 					} else {
-						loaderContext.addDependency(resource);
-						fs.readFile(resource, callback);
+						loaderContext.addDependency(resourcePath);
+						fs.readFile(resourcePath, callback);
 					}
 				}
 			},
@@ -789,27 +803,19 @@ class NormalModule extends Module {
 						undefined;
 
 				if (!result) {
+					this.buildInfo.cacheable = false;
 					return processResult(
 						err || new Error("No result from loader-runner processing"),
 						null
 					);
 				}
-				this.buildInfo.fileDependencies = new LazySet();
 				this.buildInfo.fileDependencies.addAll(result.fileDependencies);
-				this.buildInfo.contextDependencies = new LazySet();
 				this.buildInfo.contextDependencies.addAll(result.contextDependencies);
-				this.buildInfo.missingDependencies = new LazySet();
 				this.buildInfo.missingDependencies.addAll(result.missingDependencies);
-				if (
-					this.loaders.length > 0 &&
-					this.buildInfo.buildDependencies === undefined
-				) {
-					this.buildInfo.buildDependencies = new LazySet();
-				}
 				for (const loader of this.loaders) {
 					this.buildInfo.buildDependencies.add(loader.loader);
 				}
-				this.buildInfo.cacheable = result.cacheable;
+				this.buildInfo.cacheable = this.buildInfo.cacheable && result.cacheable;
 				processResult(err, result.result);
 			}
 		);
@@ -1178,7 +1184,8 @@ class NormalModule extends Module {
 	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
-	needBuild({ fileSystemInfo, valueCacheVersions }, callback) {
+	needBuild(context, callback) {
+		const { fileSystemInfo, compilation, valueCacheVersions } = context;
 		// build if enforced
 		if (this._forceBuild) return callback(null, true);
 
@@ -1213,7 +1220,20 @@ class NormalModule extends Module {
 
 		// check snapshot for validity
 		fileSystemInfo.checkSnapshotValid(this.buildInfo.snapshot, (err, valid) => {
-			callback(err, !valid);
+			if (err) return callback(err);
+			if (!valid) return callback(null, true);
+			const hooks = NormalModule.getCompilationHooks(compilation);
+			hooks.needBuild.callAsync(this, context, (err, needBuild) => {
+				if (err) {
+					return callback(
+						HookWebpackError.makeWebpackError(
+							err,
+							"NormalModule.getCompilationHooks().needBuild"
+						)
+					);
+				}
+				callback(null, !!needBuild);
+			});
 		});
 	}
 
@@ -1298,6 +1318,7 @@ class NormalModule extends Module {
 			type: "",
 			// will be filled by updateCacheModule
 			resource: "",
+			context: "",
 			request: null,
 			userRequest: null,
 			rawRequest: null,

package/lib/NormalModuleFactory.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { getContext } = require("loader-runner");
 const asyncLib = require("neo-async");
 const {
 	AsyncSeriesBailHook,
@@ -46,6 +47,7 @@ const { parseResource } = require("./util/identifier");
  * @property {string} request
  * @property {Record<string, any> | undefined} assertions
  * @property {ModuleDependency[]} dependencies
+ * @property {string} dependencyType
  * @property {Object} createData
  * @property {LazySet<string>} fileDependencies
  * @property {LazySet<string>} missingDependencies
@@ -59,6 +61,7 @@ const { parseResource } = require("./util/identifier");
  * @property {string} path
  * @property {string} query
  * @property {string} fragment
+ * @property {string=} context
  */
 
 /** @typedef {ResourceData & { data: Record<string, any> }} ResourceDataWithData */
@@ -66,6 +69,7 @@ const { parseResource } = require("./util/identifier");
 const EMPTY_RESOLVE_OPTIONS = {};
 const EMPTY_PARSER_OPTIONS = {};
 const EMPTY_GENERATOR_OPTIONS = {};
+const EMPTY_ELEMENTS = [];
 
 const MATCH_RESOURCE_REGEX = /^([^!]+)!=!/;
 
@@ -220,6 +224,10 @@ class NormalModuleFactory extends ModuleFactory {
 			resolveForScheme: new HookMap(
 				() => new AsyncSeriesBailHook(["resourceData", "resolveData"])
 			),
+			/** @type {HookMap<AsyncSeriesBailHook<[ResourceDataWithData, ResolveData], true | void>>} */
+			resolveInScheme: new HookMap(
+				() => new AsyncSeriesBailHook(["resourceData", "resolveData"])
+			),
 			/** @type {AsyncSeriesBailHook<[ResolveData], TODO>} */
 			factorize: new AsyncSeriesBailHook(["resolveData"]),
 			/** @type {AsyncSeriesBailHook<[ResolveData], TODO>} */
@@ -340,6 +348,7 @@ class NormalModuleFactory extends ModuleFactory {
 					contextInfo,
 					context,
 					dependencies,
+					dependencyType,
 					request,
 					assertions,
 					resolveOptions,
@@ -347,49 +356,76 @@ class NormalModuleFactory extends ModuleFactory {
 					missingDependencies,
 					contextDependencies
 				} = data;
-				const dependencyType =
-					(dependencies.length > 0 && dependencies[0].category) || "";
 				const loaderResolver = this.getResolver("loader");
 
 				/** @type {ResourceData | undefined} */
 				let matchResourceData = undefined;
 				/** @type {string} */
-				let requestWithoutMatchResource = request;
-				const matchResourceMatch = MATCH_RESOURCE_REGEX.exec(request);
-				if (matchResourceMatch) {
-					let matchResource = matchResourceMatch[1];
-					if (matchResource.charCodeAt(0) === 46) {
-						// 46 === ".", 47 === "/"
-						const secondChar = matchResource.charCodeAt(1);
-						if (
-							secondChar === 47 ||
-							(secondChar === 46 && matchResource.charCodeAt(2) === 47)
-						) {
-							// if matchResources startsWith ../ or ./
-							matchResource = join(this.fs, context, matchResource);
+				let unresolvedResource;
+				/** @type {{loader: string, options: string|undefined}[]} */
+				let elements;
+				let noPreAutoLoaders = false;
+				let noAutoLoaders = false;
+				let noPrePostAutoLoaders = false;
+
+				const contextScheme = getScheme(context);
+				/** @type {string | undefined} */
+				let scheme = getScheme(request);
+
+				if (!scheme) {
+					/** @type {string} */
+					let requestWithoutMatchResource = request;
+					const matchResourceMatch = MATCH_RESOURCE_REGEX.exec(request);
+					if (matchResourceMatch) {
+						let matchResource = matchResourceMatch[1];
+						if (matchResource.charCodeAt(0) === 46) {
+							// 46 === ".", 47 === "/"
+							const secondChar = matchResource.charCodeAt(1);
+							if (
+								secondChar === 47 ||
+								(secondChar === 46 && matchResource.charCodeAt(2) === 47)
+							) {
+								// if matchResources startsWith ../ or ./
+								matchResource = join(this.fs, context, matchResource);
+							}
 						}
+						matchResourceData = {
+							resource: matchResource,
+							...cacheParseResource(matchResource)
+						};
+						requestWithoutMatchResource = request.substr(
+							matchResourceMatch[0].length
+						);
 					}
-					matchResourceData = {
-						resource: matchResource,
-						...cacheParseResource(matchResource)
-					};
-					requestWithoutMatchResource = request.substr(
-						matchResourceMatch[0].length
-					);
-				}
 
-				const firstChar = requestWithoutMatchResource.charCodeAt(0);
-				const secondChar = requestWithoutMatchResource.charCodeAt(1);
-				const noPreAutoLoaders = firstChar === 45 && secondChar === 33; // startsWith "-!"
-				const noAutoLoaders = noPreAutoLoaders || firstChar === 33; // startsWith "!"
-				const noPrePostAutoLoaders = firstChar === 33 && secondChar === 33; // startsWith "!!";
-				const rawElements = requestWithoutMatchResource
-					.slice(
-						noPreAutoLoaders || noPrePostAutoLoaders ? 2 : noAutoLoaders ? 1 : 0
-					)
-					.split(/!+/);
-				const unresolvedResource = rawElements.pop();
-				const elements = rawElements.map(identToLoaderRequest);
+					scheme = getScheme(requestWithoutMatchResource);
+
+					if (!scheme && !contextScheme) {
+						const firstChar = requestWithoutMatchResource.charCodeAt(0);
+						const secondChar = requestWithoutMatchResource.charCodeAt(1);
+						noPreAutoLoaders = firstChar === 45 && secondChar === 33; // startsWith "-!"
+						noAutoLoaders = noPreAutoLoaders || firstChar === 33; // startsWith "!"
+						noPrePostAutoLoaders = firstChar === 33 && secondChar === 33; // startsWith "!!";
+						const rawElements = requestWithoutMatchResource
+							.slice(
+								noPreAutoLoaders || noPrePostAutoLoaders
+									? 2
+									: noAutoLoaders
+									? 1
+									: 0
+							)
+							.split(/!+/);
+						unresolvedResource = rawElements.pop();
+						elements = rawElements.map(identToLoaderRequest);
+						scheme = getScheme(unresolvedResource);
+					} else {
+						unresolvedResource = requestWithoutMatchResource;
+						elements = EMPTY_ELEMENTS;
+					}
+				} else {
+					unresolvedResource = request;
+					elements = EMPTY_ELEMENTS;
+				}
 
 				const resolveContext = {
 					fileDependencies,
@@ -399,8 +435,6 @@ class NormalModuleFactory extends ModuleFactory {
 
 				/** @type {ResourceDataWithData} */
 				let resourceData;
-				/** @type {string | undefined} */
-				const scheme = getScheme(unresolvedResource);
 
 				let loaders;
 
@@ -540,6 +574,8 @@ class NormalModuleFactory extends ModuleFactory {
 								rawRequest: request,
 								loaders: allLoaders,
 								resource: resourceData.resource,
+								context:
+									resourceData.context || getContext(resourceData.resource),
 								matchResource: matchResourceData
 									? matchResourceData.resource
 									: undefined,
@@ -594,7 +630,7 @@ class NormalModuleFactory extends ModuleFactory {
 
 				this.resolveRequestArray(
 					contextInfo,
-					context,
+					contextScheme ? this.context : context,
 					elements,
 					loaderResolver,
 					resolveContext,
@@ -605,6 +641,49 @@ class NormalModuleFactory extends ModuleFactory {
 					}
 				);
 
+				const defaultResolve = context => {
+					if (/^($|\?)/.test(unresolvedResource)) {
+						resourceData = {
+							resource: unresolvedResource,
+							data: {},
+							...cacheParseResource(unresolvedResource)
+						};
+						continueCallback();
+					}
+
+					// resource without scheme and with path
+					else {
+						const normalResolver = this.getResolver(
+							"normal",
+							dependencyType
+								? cachedSetProperty(
+										resolveOptions || EMPTY_RESOLVE_OPTIONS,
+										"dependencyType",
+										dependencyType
+								  )
+								: resolveOptions
+						);
+						this.resolveResource(
+							contextInfo,
+							context,
+							unresolvedResource,
+							normalResolver,
+							resolveContext,
+							(err, resolvedResource, resolvedResourceResolveData) => {
+								if (err) return continueCallback(err);
+								if (resolvedResource !== false) {
+									resourceData = {
+										resource: resolvedResource,
+										data: resolvedResourceResolveData,
+										...cacheParseResource(resolvedResource)
+									};
+								}
+								continueCallback();
+							}
+						);
+					}
+				};
+
 				// resource with scheme
 				if (scheme) {
 					resourceData = {
@@ -612,7 +691,8 @@ class NormalModuleFactory extends ModuleFactory {
 						data: {},
 						path: undefined,
 						query: undefined,
-						fragment: undefined
+						fragment: undefined,
+						context: undefined
 					};
 					this.hooks.resolveForScheme
 						.for(scheme)
@@ -622,47 +702,27 @@ class NormalModuleFactory extends ModuleFactory {
 						});
 				}
 
-				// resource without scheme and without path
-				else if (/^($|\?)/.test(unresolvedResource)) {
+				// resource within scheme
+				else if (contextScheme) {
 					resourceData = {
 						resource: unresolvedResource,
 						data: {},
-						...cacheParseResource(unresolvedResource)
+						path: undefined,
+						query: undefined,
+						fragment: undefined,
+						context: undefined
 					};
-					continueCallback();
-				}
-
-				// resource without scheme and with path
-				else {
-					const normalResolver = this.getResolver(
-						"normal",
-						dependencyType
-							? cachedSetProperty(
-									resolveOptions || EMPTY_RESOLVE_OPTIONS,
-									"dependencyType",
-									dependencyType
-							  )
-							: resolveOptions
-					);
-					this.resolveResource(
-						contextInfo,
-						context,
-						unresolvedResource,
-						normalResolver,
-						resolveContext,
-						(err, resolvedResource, resolvedResourceResolveData) => {
+					this.hooks.resolveInScheme
+						.for(contextScheme)
+						.callAsync(resourceData, data, (err, handled) => {
 							if (err) return continueCallback(err);
-							if (resolvedResource !== false) {
-								resourceData = {
-									resource: resolvedResource,
-									data: resolvedResourceResolveData,
-									...cacheParseResource(resolvedResource)
-								};
-							}
+							if (!handled) return defaultResolve(this.context);
 							continueCallback();
-						}
-					);
+						});
 				}
+
+				// resource without scheme and without path
+				else defaultResolve(context);
 			}
 		);
 	}
@@ -703,6 +763,8 @@ class NormalModuleFactory extends ModuleFactory {
 		const fileDependencies = new LazySet();
 		const missingDependencies = new LazySet();
 		const contextDependencies = new LazySet();
+		const dependencyType =
+			(dependencies.length > 0 && dependencies[0].category) || "";
 		/** @type {ResolveData} */
 		const resolveData = {
 			contextInfo,
@@ -711,6 +773,7 @@ class NormalModuleFactory extends ModuleFactory {
 			request,
 			assertions,
 			dependencies,
+			dependencyType,
 			fileDependencies,
 			missingDependencies,
 			contextDependencies,
@@ -857,7 +920,7 @@ ${hints.join("\n\n")}`;
 										null,
 										`Did you mean '${resource}'?
 BREAKING CHANGE: The request '${unresolvedResource}' failed to resolve only because it was resolved as fully specified
-(probably because the origin is a '*.mjs' file or a '*.js' file where the package.json contains '"type": "module"').
+(probably because the origin is strict EcmaScript Module, e. g. a module with javascript mimetype, a '*.mjs' file, or a '*.js' file where the package.json contains '"type": "module"').
 The extension in the request is mandatory for it to be fully specified.
 Add the extension to the request.`
 									);

package/lib/WebpackOptionsApply.js

@@ -276,6 +276,14 @@ class WebpackOptionsApply extends OptionsApply {
 			}).apply(compiler);
 		}
 
+		if (options.experiments.buildHttp) {
+			const HttpUriPlugin = require("./schemes/HttpUriPlugin");
+			const httpOptions = options.experiments.buildHttp;
+			if (httpOptions === true)
+				throw new Error("Unexpected due to normalization");
+			new HttpUriPlugin(httpOptions).apply(compiler);
+		}
+
 		new EntryOptionPlugin().apply(compiler);
 		compiler.hooks.entryOption.call(options.context, options.entry);
 

package/lib/asset/AssetModulesPlugin.js

@@ -120,7 +120,6 @@ class AssetModulesPlugin {
 				for (const type of ["asset", "asset/inline", "asset/resource"]) {
 					normalModuleFactory.hooks.createGenerator
 						.for(type)
-						// eslint-disable-next-line no-loop-func
 						.tap(plugin, generatorOptions => {
 							validateGeneratorOptions[type](generatorOptions);