webpack 5.47.0 → 5.50.0

package/lib/CompatibilityPlugin.js

@@ -69,7 +69,8 @@ class CompatibilityPlugin {
 				 * @param {JavascriptParser} parser the parser
 				 * @returns {void}
 				 */
-				const nestedWebpackRequireHandler = parser => {
+				const handler = parser => {
+					// Handle nested requires
 					parser.hooks.preStatement.tap("CompatibilityPlugin", statement => {
 						if (
 							statement.type === "FunctionDeclaration" &&
@@ -117,17 +118,33 @@ class CompatibilityPlugin {
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
+
+					// Handle hashbang
+					parser.hooks.program.tap(
+						"CompatibilityPlugin",
+						(program, comments) => {
+							if (comments.length === 0) return;
+							const c = comments[0];
+							if (c.type === "Line" && c.range[0] === 0) {
+								if (parser.state.source.slice(0, 2).toString() !== "#!") return;
+								// this is a hashbang comment
+								const dep = new ConstDependency("//", 0);
+								dep.loc = c.loc;
+								parser.state.module.addPresentationalDependency(dep);
+							}
+						}
+					);
 				};
 
 				normalModuleFactory.hooks.parser
 					.for("javascript/auto")
-					.tap("CompatibilityPlugin", nestedWebpackRequireHandler);
+					.tap("CompatibilityPlugin", handler);
 				normalModuleFactory.hooks.parser
 					.for("javascript/dynamic")
-					.tap("CompatibilityPlugin", nestedWebpackRequireHandler);
+					.tap("CompatibilityPlugin", handler);
 				normalModuleFactory.hooks.parser
 					.for("javascript/esm")
-					.tap("CompatibilityPlugin", nestedWebpackRequireHandler);
+					.tap("CompatibilityPlugin", handler);
 			}
 		);
 	}

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} */
@@ -293,9 +298,13 @@ class NormalModule extends Module {
 	 */
 	identifier() {
 		if (this.layer === null) {
-			return this.request;
+			if (this.type === "javascript/auto") {
+				return this.request;
+			} else {
+				return `${this.type}|${this.request}`;
+			}
 		} else {
-			return `${this.request}|${this.layer}`;
+			return `${this.type}|${this.request}|${this.layer}`;
 		}
 	}
 
@@ -348,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;
 	}
@@ -747,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) {
@@ -758,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
@@ -771,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);
 					}
 				}
 			},
@@ -785,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);
 			}
 		);
@@ -1015,7 +1025,9 @@ class NormalModule extends Module {
 
 			let result;
 			try {
-				result = this.parser.parse(this._ast || this._source.source(), {
+				const source = this._source.source();
+				result = this.parser.parse(this._ast || source, {
+					source,
 					current: this,
 					module: this,
 					compilation: compilation,
@@ -1174,7 +1186,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);
 
@@ -1209,7 +1222,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);
+			});
 		});
 	}
 
@@ -1294,6 +1320,7 @@ class NormalModule extends Module {
 			type: "",
 			// will be filled by updateCacheModule
 			resource: "",
+			context: "",
 			request: null,
 			userRequest: null,
 			rawRequest: null,