webpack 5.37.1 → 5.39.1

package/lib/Watching.js

@@ -90,9 +90,13 @@ class Watching {
 		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 &&
@@ -104,6 +108,19 @@ class Watching {
 					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 => {
@@ -120,19 +137,6 @@ class Watching {
 					run();
 				});
 			}
-
-			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());
-
 			this.invalid = false;
 			this._invalidReported = false;
 			this.compiler.hooks.watchRun.callAsync(this.compiler, err => {
@@ -295,7 +299,7 @@ class Watching {
 			files,
 			dirs,
 			missing,
-			this.startTime,
+			this.lastWatcherStartTime,
 			this.watchOptions,
 			(
 				err,
@@ -309,6 +313,7 @@ class Watching {
 					this.compiler.removedFiles = undefined;
 					this.compiler.fileTimestamps = undefined;
 					this.compiler.contextTimestamps = undefined;
+					this.compiler.fsStartTime = undefined;
 					return this.handler(err);
 				}
 				this._invalidate(
@@ -357,6 +362,7 @@ class Watching {
 		}
 
 		if (this.running) {
+			this._mergeWithCollected(changedFiles, removedFiles);
 			this.invalid = true;
 		} else {
 			this._go(
@@ -399,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. ` +

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
 									};

package/lib/cache/PackFileCacheStrategy.js

@@ -8,6 +8,7 @@
 const FileSystemInfo = require("../FileSystemInfo");
 const ProgressPlugin = require("../ProgressPlugin");
 const { formatSize } = require("../SizeFormatHelpers");
+const SerializerMiddleware = require("../serialization/SerializerMiddleware");
 const LazySet = require("../util/LazySet");
 const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
@@ -715,6 +716,7 @@ class PackContent {
 					this.logger.timeEnd(timeMessage);
 				}
 				this.content = map;
+				this.lazy = SerializerMiddleware.unMemoizeLazy(this.lazy);
 				return map.get(identifier);
 			});
 		} else {
@@ -723,6 +725,7 @@ class PackContent {
 				this.logger.timeEnd(timeMessage);
 			}
 			this.content = map;
+			this.lazy = SerializerMiddleware.unMemoizeLazy(this.lazy);
 			return map.get(identifier);
 		}
 	}

package/lib/config/defaults.js

@@ -478,7 +478,15 @@ const applyModuleDefaults = (
 			},
 			{
 				dependency: "url",
-				type: "asset/resource"
+				oneOf: [
+					{
+						scheme: /^data$/,
+						type: "asset/inline"
+					},
+					{
+						type: "asset/resource"
+					}
+				]
 			}
 		];
 		if (asyncWebAssembly) {

package/lib/config/normalization.js

@@ -129,6 +129,7 @@ const getNormalizedWebpackOptions = config => {
 				case "filesystem":
 					return {
 						type: "filesystem",
+						allowCollectingMemory: cache.allowCollectingMemory,
 						maxMemoryGenerations: cache.maxMemoryGenerations,
 						maxAge: cache.maxAge,
 						profile: cache.profile,

package/lib/config/target.js

@@ -5,14 +5,18 @@
 
 "use strict";
 
-const browserslistTargetHandler = require("./browserslistTargetHandler");
+const memoize = require("../util/memoize");
+
+const getBrowserslistTargetHandler = memoize(() =>
+	require("./browserslistTargetHandler")
+);
 
 /**
  * @param {string} context the context directory
  * @returns {string} default target
  */
 const getDefaultTarget = context => {
-	const browsers = browserslistTargetHandler.load(null, context);
+	const browsers = getBrowserslistTargetHandler().load(null, context);
 	return browsers ? "browserslist" : "web";
 };
 
@@ -78,6 +82,7 @@ const TARGETS = [
 		"Resolve features from browserslist. Will resolve browserslist config automatically. Only browser or node queries are supported (electron is not supported). Examples: 'browserslist:modern' to use 'modern' environment from browserslist config",
 		/^browserslist(?::(.+))?$/,
 		(rest, context) => {
+			const browserslistTargetHandler = getBrowserslistTargetHandler();
 			const browsers = browserslistTargetHandler.load(
 				rest ? rest.trim() : null,
 				context

package/lib/dependencies/ContextElementDependency.js

@@ -14,9 +14,10 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class ContextElementDependency extends ModuleDependency {
-	constructor(request, userRequest, category, referencedExports) {
+	constructor(request, userRequest, typePrefix, category, referencedExports) {
 		super(request);
 		this.referencedExports = referencedExports;
+		this._typePrefix = typePrefix;
 		this._category = category;
 
 		if (userRequest) {
@@ -25,6 +26,10 @@ class ContextElementDependency extends ModuleDependency {
 	}
 
 	get type() {
+		if (this._typePrefix) {
+			return `${this._typePrefix} context element`;
+		}
+
 		return "context element";
 	}
 

package/lib/dependencies/CriticalDependencyWarning.js

@@ -14,8 +14,6 @@ class CriticalDependencyWarning extends WebpackError {
 
 		this.name = "CriticalDependencyWarning";
 		this.message = "Critical dependency: " + message;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/dependencies/ImportParserPlugin.js

@@ -248,6 +248,7 @@ class ImportParserPlugin {
 						namespaceObject: parser.state.module.buildMeta.strictHarmonyModule
 							? "strict"
 							: true,
+						typePrefix: "import()",
 						category: "esm",
 						referencedExports: exports
 					},

package/lib/dependencies/RequireIncludeDependencyParserPlugin.js

@@ -67,8 +67,6 @@ class RequireIncludeDeprecationWarning extends WebpackError {
 		this.name = "RequireIncludeDeprecationWarning";
 
 		this.loc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/dependencies/SystemPlugin.js

@@ -127,8 +127,6 @@ class SystemImportDeprecationWarning extends WebpackError {
 		this.name = "SystemImportDeprecationWarning";
 
 		this.loc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/errors/BuildCycleError.js

@@ -21,7 +21,6 @@ class BuildCycleError extends WebpackError {
 
 		this.name = "BuildCycleError";
 		this.module = module;
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/hmr/LazyCompilationPlugin.js

@@ -350,7 +350,9 @@ class LazyCompilationPlugin {
 							resolveData.dependencies.every(
 								dep =>
 									IGNORED_DEPENDENCY_TYPES.has(dep.type) ||
-									(this.imports && dep.type === "import()") ||
+									(this.imports &&
+										(dep.type === "import()" ||
+											dep.type === "import() context element")) ||
 									(this.entries && dep.type === "entry")
 							) &&
 							!/webpack[/\\]hot[/\\]|webpack-dev-server[/\\]client/.test(

package/lib/node/NodeEnvironmentPlugin.js

@@ -50,6 +50,7 @@ class NodeEnvironmentPlugin {
 		);
 		compiler.hooks.beforeRun.tap("NodeEnvironmentPlugin", compiler => {
 			if (compiler.inputFileSystem === inputFileSystem) {
+				compiler.fsStartTime = Date.now();
 				inputFileSystem.purge();
 			}
 		});

package/lib/optimize/ConcatenatedModule.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const eslintScope = require("eslint-scope");
+const Referencer = require("eslint-scope/lib/referencer");
 const {
 	CachedSource,
 	ConcatSource,
@@ -58,6 +59,14 @@ const {
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
+// fix eslint-scope to support class properties correctly
+// cspell:word Referencer
+const ReferencerClass = Referencer;
+if (!ReferencerClass.prototype.PropertyDefinition) {
+	ReferencerClass.prototype.PropertyDefinition =
+		ReferencerClass.prototype.Property;
+}
+
 /**
  * @typedef {Object} ReexportInfo
  * @property {Module} module

package/lib/performance/AssetsOverSizeLimitWarning.js

@@ -28,7 +28,5 @@ Assets: ${assetLists}`);
 
 		this.name = "AssetsOverSizeLimitWarning";
 		this.assets = assetsOverSizeLimit;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 };

package/lib/performance/EntrypointsOverSizeLimitWarning.js

@@ -31,7 +31,5 @@ Entrypoints:${entrypointList}\n`);
 
 		this.name = "EntrypointsOverSizeLimitWarning";
 		this.entrypoints = entrypoints;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 };

package/lib/performance/NoAsyncChunksWarning.js

@@ -16,7 +16,5 @@ module.exports = class NoAsyncChunksWarning extends WebpackError {
 		);
 
 		this.name = "NoAsyncChunksWarning";
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 };

package/lib/schemes/DataUriPlugin.js

@@ -6,10 +6,25 @@
 "use strict";
 
 const NormalModule = require("../NormalModule");
-const { getMimetype, decodeDataURI } = require("../util/DataURI");
 
 /** @typedef {import("../Compiler")} Compiler */
 
+// data URL scheme: "data:text/javascript;charset=utf-8;base64,some-string"
+// http://www.ietf.org/rfc/rfc2397.txt
+const URIRegEx = /^data:(?:[^;,]+)?(?:(?:;[^;,]+)*?)(;base64)?,(.*)$/i;
+const URIMetaRegEx = /^data:([^;,]+)?(?:(?:;[^;,]+)*?)(?:;(base64))?,/i;
+
+const decodeDataURI = uri => {
+	const match = URIRegEx.exec(uri);
+	if (!match) return null;
+
+	const isBase64 = match[1];
+	const body = match[2];
+	return isBase64
+		? Buffer.from(body, "base64")
+		: Buffer.from(decodeURIComponent(body), "ascii");
+};
+
 class DataUriPlugin {
 	/**
 	 * Apply the plugin
@@ -23,7 +38,11 @@ class DataUriPlugin {
 				normalModuleFactory.hooks.resolveForScheme
 					.for("data")
 					.tap("DataUriPlugin", resourceData => {
-						resourceData.data.mimetype = getMimetype(resourceData.resource);
+						const match = URIMetaRegEx.exec(resourceData.resource);
+						if (match) {
+							resourceData.data.mimetype = match[1] || "";
+							resourceData.data.encoding = match[2] || false;
+						}
 					});
 				NormalModule.getCompilationHooks(compilation)
 					.readResourceForScheme.for("data")

package/lib/serialization/BinaryMiddleware.js

@@ -100,6 +100,9 @@ const F64_SIZE = 8;
 const MEASURE_START_OPERATION = Symbol("MEASURE_START_OPERATION");
 const MEASURE_END_OPERATION = Symbol("MEASURE_END_OPERATION");
 
+/** @typedef {typeof MEASURE_START_OPERATION} MEASURE_START_OPERATION_TYPE */
+/** @typedef {typeof MEASURE_END_OPERATION} MEASURE_END_OPERATION_TYPE */
+
 const identifyNumber = n => {
 	if (n === (n | 0)) {
 		if (n <= 127 && n >= -128) return 0;

package/lib/serialization/SerializerMiddleware.js

@@ -126,6 +126,25 @@ class SerializerMiddleware {
 		fn[LAZY_SERIALIZED_VALUE] = lazy;
 		return fn;
 	}
+
+	/**
+	 * @param {function(): Promise<any> | any} lazy lazy function
+	 * @returns {function(): Promise<any> | any} new lazy
+	 */
+	static unMemoizeLazy(lazy) {
+		if (!SerializerMiddleware.isLazy(lazy)) return lazy;
+		const fn = () => {
+			throw new Error(
+				"A lazy value that has been unmemorized can't be called again"
+			);
+		};
+		fn[LAZY_SERIALIZED_VALUE] = SerializerMiddleware.unMemoizeLazy(
+			lazy[LAZY_SERIALIZED_VALUE]
+		);
+		fn[LAZY_TARGET] = lazy[LAZY_TARGET];
+		fn.options = /** @type {any} */ (lazy).options;
+		return fn;
+	}
 }
 
 module.exports = SerializerMiddleware;

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -10,7 +10,6 @@ const ModuleDependency = require("../dependencies/ModuleDependency");
 const formatLocation = require("../formatLocation");
 const { LogType } = require("../logging/Logger");
 const AggressiveSplittingPlugin = require("../optimize/AggressiveSplittingPlugin");
-const ConcatenatedModule = require("../optimize/ConcatenatedModule");
 const SizeLimitsPlugin = require("../performance/SizeLimitsPlugin");
 const { countIterable } = require("../util/IterableHelpers");
 const {
@@ -1227,11 +1226,13 @@ const SIMPLE_EXTRACTORS = {
 		},
 		nestedModules: (object, module, context, options, factory) => {
 			const { type } = context;
-			if (module instanceof ConcatenatedModule) {
-				const modules = module.modules;
+			const innerModules = /** @type {Module & { modules?: Module[] }} */ (
+				module
+			).modules;
+			if (Array.isArray(innerModules)) {
 				const groupedModules = factory.create(
 					`${type.slice(0, -8)}.modules`,
-					modules,
+					innerModules,
 					context
 				);
 				const limited = spaceLimited(

package/lib/util/ArrayQueue.js

@@ -27,6 +27,14 @@ class ArrayQueue {
 		return this._list.length + this._listReversed.length;
 	}
 
+	/**
+	 * Empties the queue.
+	 */
+	clear() {
+		this._list.length = 0;
+		this._listReversed.length = 0;
+	}
+
 	/**
 	 * Appends the specified element to this queue.
 	 * @param {T} item The element to add.

package/lib/util/AsyncQueue.js

@@ -359,6 +359,15 @@ class AsyncQueue {
 			inHandleResult--;
 		});
 	}
+
+	clear() {
+		this._entries.clear();
+		this._queued.clear();
+		this._activeTasks = 0;
+		this._willEnsureProcessing = false;
+		this._needProcessing = false;
+		this._stopped = false;
+	}
 }
 
 module.exports = AsyncQueue;

package/lib/util/createHash.js

@@ -67,6 +67,7 @@ class BulkUpdateDecorator extends Hash {
 	 */
 	digest(encoding) {
 		let digestCache;
+		const buffer = this.buffer;
 		if (this.hash === undefined) {
 			// short data for hash, we can use caching
 			const cacheKey = `${this.hashKey}-${encoding}`;
@@ -74,18 +75,18 @@ class BulkUpdateDecorator extends Hash {
 			if (digestCache === undefined) {
 				digestCache = digestCaches[cacheKey] = new Map();
 			}
-			const cacheEntry = digestCache.get(this.buffer);
+			const cacheEntry = digestCache.get(buffer);
 			if (cacheEntry !== undefined) return cacheEntry;
 			this.hash = this.hashFactory();
 		}
-		if (this.buffer.length > 0) {
-			this.hash.update(this.buffer);
+		if (buffer.length > 0) {
+			this.hash.update(buffer);
 		}
 		const digestResult = this.hash.digest(encoding);
 		const result =
 			typeof digestResult === "string" ? digestResult : digestResult.toString();
 		if (digestCache !== undefined) {
-			digestCache.set(this.buffer, result);
+			digestCache.set(buffer, result);
 		}
 		return result;
 	}