webpack 5.37.0 → 5.39.0

package/lib/NormalModule.js

@@ -164,8 +164,6 @@ class NonErrorEmittedError extends WebpackError {
 
 		this.name = "NonErrorEmittedError";
 		this.message = "(Emitted value instead of an instance of Error) " + error;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 
@@ -219,6 +217,7 @@ class NormalModule extends Module {
 	 * @param {string} options.rawRequest request without resolving
 	 * @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 | 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 +233,7 @@ class NormalModule extends Module {
 		rawRequest,
 		loaders,
 		resource,
+		resourceResolveData,
 		matchResource,
 		parser,
 		parserOptions,
@@ -260,6 +260,7 @@ class NormalModule extends Module {
 		this.generatorOptions = generatorOptions;
 		/** @type {string} */
 		this.resource = resource;
+		this.resourceResolveData = resourceResolveData;
 		/** @type {string | undefined} */
 		this.matchResource = matchResource;
 		/** @type {LoaderItem[]} */
@@ -276,6 +277,8 @@ class NormalModule extends Module {
 		this._source = null;
 		/** @private @type {Map<string, number> | undefined} **/
 		this._sourceSizes = undefined;
+		/** @private @type {Set<string>} */
+		this._sourceTypes = undefined;
 
 		// Cache
 		this._lastSuccessfulBuildMeta = {};
@@ -347,12 +350,19 @@ class NormalModule extends Module {
 		this.resource = m.resource;
 		this.matchResource = m.matchResource;
 		this.loaders = m.loaders;
+		this._sourceTypes = m._sourceTypes;
+		this._sourceSizes = m._sourceSizes;
 	}
 
 	/**
 	 * Assuming this module is in the cache. Remove internal references to allow freeing some memory.
 	 */
 	cleanupForCache() {
+		// Make sure to cache types and sizes before cleanup
+		if (this._sourceTypes === undefined) this.getSourceTypes();
+		for (const type of this._sourceTypes) {
+			this.size(type);
+		}
 		super.cleanupForCache();
 		this.parser = undefined;
 		this.parserOptions = undefined;
@@ -390,6 +400,7 @@ class NormalModule extends Module {
 			this.type,
 			this.generatorOptions
 		);
+		// we assume the generator behaves identically and keep cached sourceTypes/Sizes
 	}
 
 	/**
@@ -765,7 +776,11 @@ class NormalModule extends Module {
 			},
 			(err, result) => {
 				// Cleanup loaderContext to avoid leaking memory in ICs
-				loaderContext._compilation = loaderContext._compiler = loaderContext._module = loaderContext.fs = undefined;
+				loaderContext._compilation =
+					loaderContext._compiler =
+					loaderContext._module =
+					loaderContext.fs =
+						undefined;
 
 				if (!result) {
 					return processResult(
@@ -869,6 +884,7 @@ class NormalModule extends Module {
 		this._forceBuild = false;
 		this._source = null;
 		if (this._sourceSizes !== undefined) this._sourceSizes.clear();
+		this._sourceTypes = undefined;
 		this._ast = null;
 		this.error = null;
 		this.clearWarningsAndErrors();
@@ -887,7 +903,7 @@ class NormalModule extends Module {
 			assetsInfo: undefined
 		};
 
-		const startTime = Date.now();
+		const startTime = compilation.compiler.fsStartTime || Date.now();
 
 		return this.doBuild(options, compilation, resolver, fs, err => {
 			// if we have an error mark module as failed and exit
@@ -958,7 +974,8 @@ class NormalModule extends Module {
 				checkDependencies(this.buildInfo.missingDependencies);
 				checkDependencies(this.buildInfo.contextDependencies);
 				if (nonAbsoluteDependencies !== undefined) {
-					const InvalidDependenciesModuleWarning = getInvalidDependenciesModuleWarning();
+					const InvalidDependenciesModuleWarning =
+						getInvalidDependenciesModuleWarning();
 					this.addWarning(
 						new InvalidDependenciesModuleWarning(this, nonAbsoluteDependencies)
 					);
@@ -1070,7 +1087,10 @@ class NormalModule extends Module {
 	 * @returns {Set<string>} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return this.generator.getTypes(this);
+		if (this._sourceTypes === undefined) {
+			this._sourceTypes = this.generator.getTypes(this);
+		}
+		return this._sourceTypes;
 	}
 
 	/**
@@ -1259,7 +1279,6 @@ class NormalModule extends Module {
 		const { write } = context;
 		// deserialize
 		write(this._source);
-		write(this._sourceSizes);
 		write(this.error);
 		write(this._lastSuccessfulBuildMeta);
 		write(this._forceBuild);
@@ -1291,7 +1310,6 @@ class NormalModule extends Module {
 	deserialize(context) {
 		const { read } = context;
 		this._source = read();
-		this._sourceSizes = read();
 		this.error = read();
 		this._lastSuccessfulBuildMeta = read();
 		this._forceBuild = read();

package/lib/NormalModuleFactory.js

@@ -168,6 +168,7 @@ const unsafeCacheData = new WeakMap();
 
 const ruleSetCompiler = new RuleSetCompiler([
 	new BasicMatcherRulePlugin("test", "resource"),
+	new BasicMatcherRulePlugin("scheme"),
 	new BasicMatcherRulePlugin("mimetype"),
 	new BasicMatcherRulePlugin("dependency"),
 	new BasicMatcherRulePlugin("include", "resource"),
@@ -443,6 +444,7 @@ class NormalModuleFactory extends ModuleFactory {
 						realResource: resourceData.path,
 						resourceQuery: resourceDataForRules.query,
 						resourceFragment: resourceDataForRules.fragment,
+						scheme,
 						mimetype: matchResourceData ? "" : resourceData.data.mimetype || "",
 						dependency: dependencyType,
 						descriptionData: matchResourceData

package/lib/RecordIdsPlugin.js

@@ -48,10 +48,11 @@ class RecordIdsPlugin {
 	apply(compiler) {
 		const portableIds = this.options.portableIds;
 
-		const makePathsRelative = identifierUtils.makePathsRelative.bindContextCache(
-			compiler.context,
-			compiler.root
-		);
+		const makePathsRelative =
+			identifierUtils.makePathsRelative.bindContextCache(
+				compiler.context,
+				compiler.root
+			);
 
 		/**
 		 * @param {Module} module the module

package/lib/ResolverFactory.js

@@ -42,9 +42,9 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 		...remaining,
 		plugins:
 			plugins &&
-			/** @type {ResolvePluginInstance[]} */ (plugins.filter(
-				item => item !== "..."
-			))
+			/** @type {ResolvePluginInstance[]} */ (
+				plugins.filter(item => item !== "...")
+			)
 	};
 
 	if (!partialOptions.fileSystem) {
@@ -53,7 +53,10 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 		);
 	}
 	// These weird types validate that we checked all non-optional properties
-	const options = /** @type {Partial<ResolveOptions> & Pick<ResolveOptions, "fileSystem">} */ (partialOptions);
+	const options =
+		/** @type {Partial<ResolveOptions> & Pick<ResolveOptions, "fileSystem">} */ (
+			partialOptions
+		);
 
 	return removeOperations(
 		resolveByProperty(options, "byDependency", dependencyType)
@@ -124,9 +127,9 @@ module.exports = class ResolverFactory {
 		const resolveOptions = convertToResolveOptions(
 			this.hooks.resolveOptions.for(type).call(resolveOptionsWithDepType)
 		);
-		const resolver = /** @type {ResolverWithOptions} */ (Factory.createResolver(
-			resolveOptions
-		));
+		const resolver = /** @type {ResolverWithOptions} */ (
+			Factory.createResolver(resolveOptions)
+		);
 		if (!resolver) {
 			throw new Error("No resolver created");
 		}

package/lib/SourceMapDevToolPlugin.js

@@ -430,19 +430,20 @@ class SourceMapDevToolPlugin {
 										currentSourceMappingURLComment !== false &&
 										/\.css($|\?)/i.test(file)
 									) {
-										currentSourceMappingURLComment = currentSourceMappingURLComment.replace(
-											/^\n\/\/(.*)$/,
-											"\n/*$1*/"
-										);
+										currentSourceMappingURLComment =
+											currentSourceMappingURLComment.replace(
+												/^\n\/\/(.*)$/,
+												"\n/*$1*/"
+											);
 									}
 									const sourceMapString = JSON.stringify(sourceMap);
 									if (sourceMapFilename) {
 										let filename = file;
 										const sourceMapContentHash =
 											usesContentHash &&
-											/** @type {string} */ (createHash("md4")
-												.update(sourceMapString)
-												.digest("hex"));
+											/** @type {string} */ (
+												createHash("md4").update(sourceMapString).digest("hex")
+											);
 										const pathParams = {
 											chunk,
 											filename: options.fileContext
@@ -454,13 +455,11 @@ class SourceMapDevToolPlugin {
 												: filename,
 											contentHash: sourceMapContentHash
 										};
-										const {
-											path: sourceMapFile,
-											info: sourceMapInfo
-										} = compilation.getPathWithInfo(
-											sourceMapFilename,
-											pathParams
-										);
+										const { path: sourceMapFile, info: sourceMapInfo } =
+											compilation.getPathWithInfo(
+												sourceMapFilename,
+												pathParams
+											);
 										const sourceMapUrl = options.publicPath
 											? options.publicPath + sourceMapFile
 											: relative(

package/lib/Template.js

@@ -413,5 +413,7 @@ class Template {
 }
 
 module.exports = Template;
-module.exports.NUMBER_OF_IDENTIFIER_START_CHARS = NUMBER_OF_IDENTIFIER_START_CHARS;
-module.exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS = NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS;
+module.exports.NUMBER_OF_IDENTIFIER_START_CHARS =
+	NUMBER_OF_IDENTIFIER_START_CHARS;
+module.exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS =
+	NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS;

package/lib/UnsupportedFeatureWarning.js

@@ -21,8 +21,6 @@ class UnsupportedFeatureWarning extends WebpackError {
 		this.name = "UnsupportedFeatureWarning";
 		this.loc = loc;
 		this.hideStack = true;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/WarnDeprecatedOptionPlugin.js

@@ -48,8 +48,6 @@ class DeprecatedOptionWarning extends WebpackError {
 			"configuration\n" +
 			`The value '${value}' for option '${option}' is deprecated. ` +
 			`Use '${suggestion}' instead.`;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/Watching.js

@@ -57,16 +57,70 @@ class Watching {
 		this._needRecords = true;
 		this.watcher = undefined;
 		this.pausedWatcher = undefined;
+		/** @type {Set<string>} */
+		this._collectedChangedFiles = undefined;
+		/** @type {Set<string>} */
+		this._collectedRemovedFiles = undefined;
 		this._done = this._done.bind(this);
 		process.nextTick(() => {
 			if (this._initial) this._invalidate();
 		});
 	}
 
-	_go() {
+	_mergeWithCollected(changedFiles, removedFiles) {
+		if (!changedFiles) return;
+		if (!this._collectedChangedFiles) {
+			this._collectedChangedFiles = new Set(changedFiles);
+			this._collectedRemovedFiles = new Set(removedFiles);
+		} else {
+			for (const file of changedFiles) {
+				this._collectedChangedFiles.add(file);
+				this._collectedRemovedFiles.delete(file);
+			}
+			for (const file of removedFiles) {
+				this._collectedChangedFiles.delete(file);
+				this._collectedRemovedFiles.add(file);
+			}
+		}
+	}
+
+	_go(fileTimeInfoEntries, contextTimeInfoEntries, changedFiles, removedFiles) {
 		this._initial = false;
 		this.startTime = Date.now();
 		this.running = true;
+		if (this.watcher) {
+			this.pausedWatcher = this.watcher;
+			this.lastWatcherStartTime = Date.now();
+			this.watcher.pause();
+			this.watcher = null;
+		} else if (!this.lastWatcherStartTime) {
+			this.lastWatcherStartTime = Date.now();
+		}
+		this.compiler.fsStartTime = Date.now();
+		this._mergeWithCollected(
+			changedFiles ||
+				(this.pausedWatcher &&
+					this.pausedWatcher.getAggregatedChanges &&
+					this.pausedWatcher.getAggregatedChanges()),
+			(this.compiler.removedFiles =
+				removedFiles ||
+				(this.pausedWatcher &&
+					this.pausedWatcher.getAggregatedRemovals &&
+					this.pausedWatcher.getAggregatedRemovals()))
+		);
+
+		this.compiler.modifiedFiles = this._collectedChangedFiles;
+		this._collectedChangedFiles = undefined;
+		this.compiler.removedFiles = this._collectedRemovedFiles;
+		this._collectedRemovedFiles = undefined;
+
+		this.compiler.fileTimestamps =
+			fileTimeInfoEntries ||
+			(this.pausedWatcher && this.pausedWatcher.getFileTimeInfoEntries());
+		this.compiler.contextTimestamps =
+			contextTimeInfoEntries ||
+			(this.pausedWatcher && this.pausedWatcher.getContextTimeInfoEntries());
+
 		const run = () => {
 			if (this.compiler.idle) {
 				return this.compiler.cache.endIdle(err => {
@@ -159,13 +213,16 @@ class Watching {
 
 		let stats = null;
 
-		const handleError = err => {
+		const handleError = (err, cbs) => {
 			this.compiler.hooks.failed.call(err);
 			this.compiler.cache.beginIdle();
 			this.compiler.idle = true;
 			this.handler(err, stats);
-			for (const cb of this.callbacks) cb();
-			this.callbacks.length = 0;
+			if (!cbs) {
+				cbs = this.callbacks;
+				this.callbacks = [];
+			}
+			for (const cb of cbs) cb(err);
 		};
 
 		if (
@@ -197,17 +254,19 @@ class Watching {
 		}
 		if (err) return handleError(err);
 
+		const cbs = this.callbacks;
+		this.callbacks = [];
 		logger.time("done hook");
 		this.compiler.hooks.done.callAsync(stats, err => {
 			logger.timeEnd("done hook");
-			if (err) return handleError(err);
+			if (err) return handleError(err, cbs);
 			this.handler(null, stats);
 			logger.time("storeBuildDependencies");
 			this.compiler.cache.storeBuildDependencies(
 				compilation.buildDependencies,
 				err => {
 					logger.timeEnd("storeBuildDependencies");
-					if (err) return handleError(err);
+					if (err) return handleError(err, cbs);
 					logger.time("beginIdle");
 					this.compiler.cache.beginIdle();
 					this.compiler.idle = true;
@@ -221,8 +280,7 @@ class Watching {
 							);
 						}
 					});
-					for (const cb of this.callbacks) cb();
-					this.callbacks.length = 0;
+					for (const cb of cbs) cb(null);
 					this.compiler.hooks.afterDone.call(stats);
 				}
 			);
@@ -241,7 +299,7 @@ class Watching {
 			files,
 			dirs,
 			missing,
-			this.startTime,
+			this.lastWatcherStartTime,
 			this.watchOptions,
 			(
 				err,
@@ -250,25 +308,20 @@ class Watching {
 				changedFiles,
 				removedFiles
 			) => {
-				this.pausedWatcher = this.watcher;
-				this.watcher = null;
 				if (err) {
 					this.compiler.modifiedFiles = undefined;
 					this.compiler.removedFiles = undefined;
 					this.compiler.fileTimestamps = undefined;
 					this.compiler.contextTimestamps = undefined;
+					this.compiler.fsStartTime = undefined;
 					return this.handler(err);
 				}
-				this.compiler.fileTimestamps = fileTimeInfoEntries;
-				this.compiler.contextTimestamps = contextTimeInfoEntries;
-				this.compiler.removedFiles = removedFiles;
-				this.compiler.modifiedFiles = changedFiles;
-				if (this.watcher) {
-					this.pausedWatcher = this.watcher;
-					this.watcher.pause();
-					this.watcher = null;
-				}
-				this._invalidate();
+				this._invalidate(
+					fileTimeInfoEntries,
+					contextTimeInfoEntries,
+					changedFiles,
+					removedFiles
+				);
 				this._onChange();
 			},
 			(fileName, changeTime) => {
@@ -293,33 +346,31 @@ class Watching {
 			this._invalidReported = true;
 			this.compiler.hooks.invalid.call(null, Date.now());
 		}
+		this._onChange();
 		this._invalidate();
 	}
 
-	_invalidate() {
-		if (this.suspended) return;
-		if (this._isBlocked()) {
-			this.blocked = true;
+	_invalidate(
+		fileTimeInfoEntries,
+		contextTimeInfoEntries,
+		changedFiles,
+		removedFiles
+	) {
+		if (this.suspended || (this._isBlocked() && (this.blocked = true))) {
+			this._mergeWithCollected(changedFiles, removedFiles);
 			return;
 		}
-		if (this.watcher) {
-			this.compiler.modifiedFiles =
-				this.watcher.getAggregatedChanges &&
-				this.watcher.getAggregatedChanges();
-			this.compiler.removedFiles =
-				this.watcher.getAggregatedRemovals &&
-				this.watcher.getAggregatedRemovals();
-			this.compiler.fileTimestamps = this.watcher.getFileTimeInfoEntries();
-			this.compiler.contextTimestamps = this.watcher.getContextTimeInfoEntries();
-			this.pausedWatcher = this.watcher;
-			this.watcher.pause();
-			this.watcher = null;
-		}
 
 		if (this.running) {
+			this._mergeWithCollected(changedFiles, removedFiles);
 			this.invalid = true;
 		} else {
-			this._go();
+			this._go(
+				fileTimeInfoEntries,
+				contextTimeInfoEntries,
+				changedFiles,
+				removedFiles
+			);
 		}
 	}
 
@@ -334,14 +385,6 @@ class Watching {
 		}
 	}
 
-	_checkUnblocked() {
-		if (this.blocked && !this._isBlocked()) {
-			this.blocked = false;
-			this._needWatcherInfo = true;
-			this._invalidate();
-		}
-	}
-
 	/**
 	 * @param {Callback<void>} callback signals when the watcher is closed
 	 * @returns {void}
@@ -362,6 +405,7 @@ class Watching {
 			this.compiler.removedFiles = undefined;
 			this.compiler.fileTimestamps = undefined;
 			this.compiler.contextTimestamps = undefined;
+			this.compiler.fsStartTime = undefined;
 			const shutdown = () => {
 				this.compiler.cache.shutdown(err => {
 					this.compiler.hooks.watchClose.call();

package/lib/WebpackError.js

@@ -31,8 +31,6 @@ class WebpackError extends Error {
 		this.chunk = undefined;
 		/** @type {string} */
 		this.file = undefined;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 
 	[inspect]() {

package/lib/asset/AssetGenerator.js

@@ -120,12 +120,33 @@ class AssetGenerator extends Generator {
 							}
 						);
 					} else {
-						const encoding = this.dataUrlOptions.encoding;
-						const ext = path.extname(module.nameForCondition());
-						const mimeType =
-							this.dataUrlOptions.mimetype || mimeTypes.lookup(ext);
-
-						if (!mimeType) {
+						/** @type {string | false | undefined} */
+						let encoding = this.dataUrlOptions.encoding;
+						if (encoding === undefined) {
+							if (
+								module.resourceResolveData &&
+								module.resourceResolveData.encoding !== undefined
+							) {
+								encoding = module.resourceResolveData.encoding;
+							}
+						}
+						if (encoding === undefined) {
+							encoding = "base64";
+						}
+						let ext;
+						let mimeType = this.dataUrlOptions.mimetype;
+						if (mimeType === undefined) {
+							ext = path.extname(module.nameForCondition());
+							if (
+								module.resourceResolveData &&
+								module.resourceResolveData.mimetype !== undefined
+							) {
+								mimeType = module.resourceResolveData.mimetype;
+							} else if (ext) {
+								mimeType = mimeTypes.lookup(ext);
+							}
+						}
+						if (typeof mimeType !== "string") {
 							throw new Error(
 								"DataUrl can't be generated automatically, " +
 									`because there is no mimetype for "${ext}" in mimetype database. ` +
@@ -170,9 +191,9 @@ class AssetGenerator extends Generator {
 						hash.update(runtimeTemplate.outputOptions.hashSalt);
 					}
 					hash.update(originalSource.buffer());
-					const fullHash = /** @type {string} */ (hash.digest(
-						runtimeTemplate.outputOptions.hashDigest
-					));
+					const fullHash = /** @type {string} */ (
+						hash.digest(runtimeTemplate.outputOptions.hashDigest)
+					);
 					const contentHash = fullHash.slice(
 						0,
 						runtimeTemplate.outputOptions.hashDigestLength
@@ -183,26 +204,9 @@ class AssetGenerator extends Generator {
 						module.matchResource || module.resource,
 						runtimeTemplate.compilation.compiler.root
 					).replace(/^\.\//, "");
-					let {
-						path: filename,
-						info: assetInfo
-					} = runtimeTemplate.compilation.getAssetPathWithInfo(
-						assetModuleFilename,
-						{
-							module,
-							runtime,
-							filename: sourceFilename,
-							chunkGraph,
-							contentHash
-						}
-					);
-					let publicPath;
-					if (this.publicPath) {
-						const {
-							path,
-							info
-						} = runtimeTemplate.compilation.getAssetPathWithInfo(
-							this.publicPath,
+					let { path: filename, info: assetInfo } =
+						runtimeTemplate.compilation.getAssetPathWithInfo(
+							assetModuleFilename,
 							{
 								module,
 								runtime,
@@ -211,6 +215,19 @@ class AssetGenerator extends Generator {
 								contentHash
 							}
 						);
+					let publicPath;
+					if (this.publicPath) {
+						const { path, info } =
+							runtimeTemplate.compilation.getAssetPathWithInfo(
+								this.publicPath,
+								{
+									module,
+									runtime,
+									filename: sourceFilename,
+									chunkGraph,
+									contentHash
+								}
+							);
 						publicPath = JSON.stringify(path);
 						assetInfo = mergeAssetInfo(assetInfo, info);
 					} else {

package/lib/asset/AssetModulesPlugin.js

@@ -129,7 +129,7 @@ class AssetModulesPlugin {
 								dataUrl = generatorOptions.dataUrl;
 								if (!dataUrl || typeof dataUrl === "object") {
 									dataUrl = {
-										encoding: "base64",
+										encoding: undefined,
 										mimetype: undefined,
 										...dataUrl
 									};