webpack 5.106.1 → 5.107.0

package/lib/util/registerExternalSerializer.js

@@ -33,6 +33,7 @@ register(
 	"webpack-sources/CachedSource",
 	new (class CachedSourceSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {CachedSource} source the cached source to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -47,6 +48,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {CachedSource} cached source
 		 */
@@ -64,6 +66,7 @@ register(
 	"webpack-sources/RawSource",
 	new (class RawSourceSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {RawSource} source the raw source to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -74,6 +77,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {RawSource} raw source
 		 */
@@ -91,6 +95,7 @@ register(
 	"webpack-sources/ConcatSource",
 	new (class ConcatSourceSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {ConcatSource} source the concat source to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -100,6 +105,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {ConcatSource} concat source
 		 */
@@ -117,6 +123,7 @@ register(
 	"webpack-sources/PrefixSource",
 	new (class PrefixSourceSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {PrefixSource} source the prefix source to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -127,6 +134,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {PrefixSource} prefix source
 		 */
@@ -142,6 +150,7 @@ register(
 	"webpack-sources/ReplaceSource",
 	new (class ReplaceSourceSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {ReplaceSource} source the replace source to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -162,6 +171,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {ReplaceSource} replace source
 		 */
@@ -193,6 +203,7 @@ register(
 	"webpack-sources/OriginalSource",
 	new (class OriginalSourceSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {OriginalSource} source the original source to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -203,6 +214,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {OriginalSource} original source
 		 */
@@ -220,6 +232,7 @@ register(
 	"acorn/SourceLocation",
 	new (class SourceLocationSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {SourceLocation} loc the location to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -232,6 +245,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {RealDependencyLocation} location
 		 */
@@ -256,6 +270,7 @@ register(
 	"acorn/Position",
 	new (class PositionSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {Position} pos the position to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -266,6 +281,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {SourcePosition} position
 		 */
@@ -284,6 +300,7 @@ register(
 	"webpack-sources/SourceMapSource",
 	new (class SourceMapSourceSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {SourceMapSource} source the source map source to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -293,6 +310,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {SourceMapSource} source source map source
 		 */
@@ -309,6 +327,7 @@ register(
 	"schema-utils/ValidationError",
 	new (class ValidationErrorSerializer {
 		/**
+		 * Serializes this instance into the provided serializer context.
 		 * @param {ValidationError} error the source map source to be serialized
 		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
@@ -324,6 +343,7 @@ register(
 		}
 
 		/**
+		 * Restores this instance from the provided deserializer context.
 		 * @param {ObjectDeserializerContext} context context
 		 * @returns {ValidationError} error
 		 */

package/lib/util/removeBOM.js

@@ -6,6 +6,7 @@
 "use strict";
 
 /**
+ * Returns result without BOM.
  * @param {string | Buffer} strOrBuffer string or buffer
  * @returns {string | Buffer} result without BOM
  */

package/lib/util/runtime.js

@@ -15,6 +15,7 @@ const SortableSet = require("./SortableSet");
 /** @typedef {RuntimeSpec | boolean} RuntimeCondition */
 
 /**
+ * Gets entry runtime.
  * @param {Compilation} compilation the compilation
  * @param {string} name name of the entry
  * @param {EntryOptions=} options optionally already received entry options
@@ -54,6 +55,7 @@ const getEntryRuntime = (compilation, name, options) => {
 };
 
 /**
+ * Processes the provided runtime.
  * @param {RuntimeSpec} runtime runtime
  * @param {(runtime: string | undefined) => void} fn functor
  * @param {boolean} deterministicOrder enforce a deterministic order
@@ -73,6 +75,7 @@ const forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 };
 
 /**
+ * Returns runtime key.
  * @template T
  * @param {Exclude<RuntimeSpec, undefined | string>} set set
  * @returns {string} runtime key
@@ -83,6 +86,7 @@ const getRuntimesKey = (set) => {
 };
 
 /**
+ * Returns key of runtimes.
  * @param {RuntimeSpec} runtime runtime(s)
  * @returns {string} key of runtimes
  */
@@ -93,6 +97,7 @@ const getRuntimeKey = (runtime) => {
 };
 
 /**
+ * Returns runtime(s).
  * @param {string} key key of runtimes
  * @returns {RuntimeSpec} runtime(s)
  */
@@ -104,6 +109,7 @@ const keyToRuntime = (key) => {
 };
 
 /**
+ * Gets runtimes string.
  * @template T
  * @param {Exclude<RuntimeSpec, undefined | string>} set set
  * @returns {string} runtime string
@@ -114,6 +120,7 @@ const getRuntimesString = (set) => {
 };
 
 /**
+ * Returns readable version.
  * @param {RuntimeSpec} runtime runtime(s)
  * @returns {string} readable version
  */
@@ -124,6 +131,7 @@ const runtimeToString = (runtime) => {
 };
 
 /**
+ * Runtime condition to string.
  * @param {RuntimeCondition} runtimeCondition runtime condition
  * @returns {string} readable version
  */
@@ -134,6 +142,7 @@ const runtimeConditionToString = (runtimeCondition) => {
 };
 
 /**
+ * Returns true, when they are equal.
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {boolean} true, when they are equal
@@ -164,6 +173,7 @@ const runtimeEqual = (a, b) => {
 };
 
 /**
+ * Compares the provided values and returns their ordering.
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {-1 | 0 | 1} compare
@@ -184,6 +194,7 @@ const compareRuntime = (a, b) => {
 };
 
 /**
+ * Merges the provided values into a single result.
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {RuntimeSpec} merged
@@ -225,6 +236,7 @@ const mergeRuntime = (a, b) => {
 };
 
 /**
+ * Merges runtime condition.
  * @param {RuntimeCondition} a first
  * @param {RuntimeCondition} b second
  * @param {RuntimeSpec} runtime full runtime
@@ -246,6 +258,7 @@ const mergeRuntimeCondition = (a, b, runtime) => {
 };
 
 /**
+ * Merges runtime condition non false.
  * @param {RuntimeSpec | true} a first
  * @param {RuntimeSpec | true} b second
  * @param {RuntimeSpec} runtime full runtime
@@ -265,6 +278,7 @@ const mergeRuntimeConditionNonFalse = (a, b, runtime) => {
 };
 
 /**
+ * Merges runtime owned.
  * @param {RuntimeSpec} a first (may be modified)
  * @param {RuntimeSpec} b second
  * @returns {RuntimeSpec} merged
@@ -302,6 +316,7 @@ const mergeRuntimeOwned = (a, b) => {
 };
 
 /**
+ * Returns merged.
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {RuntimeSpec} merged
@@ -339,6 +354,7 @@ const intersectRuntime = (a, b) => {
 };
 
 /**
+ * Returns result.
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {RuntimeSpec} result
@@ -384,6 +400,7 @@ const subtractRuntime = (a, b) => {
 };
 
 /**
+ * Subtract runtime condition.
  * @param {RuntimeCondition} a first
  * @param {RuntimeCondition} b second
  * @param {RuntimeSpec} runtime runtime
@@ -398,6 +415,7 @@ const subtractRuntimeCondition = (a, b, runtime) => {
 };
 
 /**
+ * Returns true/false if filter is constant for all runtimes, otherwise runtimes that are active.
  * @param {RuntimeSpec} runtime runtime
  * @param {(runtime?: RuntimeSpec) => boolean} filter filter function
  * @returns {boolean | RuntimeSpec} true/false if filter is constant for all runtimes, otherwise runtimes that are active
@@ -424,16 +442,19 @@ const filterRuntime = (runtime, filter) => {
 };
 
 /**
+ * Defines the runtime spec map inner map type used by this module.
  * @template T
  * @typedef {Map<string, T>} RuntimeSpecMapInnerMap
  */
 
 /**
+ * Represents RuntimeSpecMap.
  * @template T
  * @template [R=T]
  */
 class RuntimeSpecMap {
 	/**
+	 * Creates an instance of RuntimeSpecMap.
 	 * @param {RuntimeSpecMap<T, R>=} clone copy form this
 	 */
 	constructor(clone) {
@@ -448,6 +469,7 @@ class RuntimeSpecMap {
 	}
 
 	/**
+	 * Returns value.
 	 * @param {RuntimeSpec} runtime the runtimes
 	 * @returns {R | undefined} value
 	 */
@@ -467,6 +489,7 @@ class RuntimeSpecMap {
 	}
 
 	/**
+	 * Returns true, when the runtime is stored.
 	 * @param {RuntimeSpec} runtime the runtimes
 	 * @returns {boolean} true, when the runtime is stored
 	 */
@@ -484,6 +507,7 @@ class RuntimeSpecMap {
 	}
 
 	/**
+	 * Updates default using the provided runtime.
 	 * @param {RuntimeSpec} runtime the runtimes
 	 * @param {R} value the value
 	 */
@@ -515,6 +539,7 @@ class RuntimeSpecMap {
 	}
 
 	/**
+	 * Returns the new value.
 	 * @param {RuntimeSpec} runtime the runtimes
 	 * @param {() => R} computer function to compute the value
 	 * @returns {R} the new value
@@ -557,6 +582,7 @@ class RuntimeSpecMap {
 	}
 
 	/**
+	 * Processes the provided runtime.
 	 * @param {RuntimeSpec} runtime the runtimes
 	 */
 	delete(runtime) {
@@ -577,6 +603,7 @@ class RuntimeSpecMap {
 	}
 
 	/**
+	 * Processes the provided runtime.
 	 * @param {RuntimeSpec} runtime the runtimes
 	 * @param {(value: R | undefined) => R} fn function to update the value
 	 */
@@ -634,6 +661,7 @@ class RuntimeSpecMap {
 	}
 
 	/**
+	 * Returns values.
 	 * @returns {IterableIterator<R>} values
 	 */
 	values() {
@@ -658,6 +686,7 @@ class RuntimeSpecMap {
 
 class RuntimeSpecSet {
 	/**
+	 * Creates an instance of RuntimeSpecSet.
 	 * @param {Iterable<RuntimeSpec>=} iterable iterable
 	 */
 	constructor(iterable) {
@@ -671,6 +700,7 @@ class RuntimeSpecSet {
 	}
 
 	/**
+	 * Processes the provided runtime.
 	 * @param {RuntimeSpec} runtime runtime
 	 */
 	add(runtime) {
@@ -678,6 +708,7 @@ class RuntimeSpecSet {
 	}
 
 	/**
+	 * Returns true, when the runtime exists.
 	 * @param {RuntimeSpec} runtime runtime
 	 * @returns {boolean} true, when the runtime exists
 	 */
@@ -686,6 +717,7 @@ class RuntimeSpecSet {
 	}
 
 	/**
+	 * Returns iterable iterator.
 	 * @returns {IterableIterator<RuntimeSpec>} iterable iterator
 	 */
 	[Symbol.iterator]() {

package/lib/util/semver.js

@@ -11,11 +11,13 @@
 /** @typedef {(SemVerRangeItem | SemVerRangeItem[])[]} SemVerRange */
 
 /**
+ * Returns parsed version.
  * @param {string} str version string
  * @returns {SemVerRange} parsed version
  */
 const parseVersion = (str) => {
 	/**
+	 * Returns result.
 	 * @param {str} str str
 	 * @returns {VersionValue[]} result
 	 */
@@ -49,6 +51,7 @@ module.exports.parseVersion = parseVersion;
 
 /* eslint-disable eqeqeq */
 /**
+ * Returns true, iff a < b.
  * @param {string} a version
  * @param {string} b version
  * @returns {boolean} true, iff a < b
@@ -98,11 +101,13 @@ const versionLt = (a, b) => {
 module.exports.versionLt = versionLt;
 
 /**
+ * Returns parsed range.
  * @param {string} str range string
  * @returns {SemVerRange} parsed range
  */
 module.exports.parseRange = (str) => {
 	/**
+	 * Returns result.
 	 * @param {string} str str
 	 * @returns {VersionValue[]} result
 	 */
@@ -114,6 +119,7 @@ module.exports.parseRange = (str) => {
 
 	// see https://docs.npmjs.com/misc/semver#range-grammar for grammar
 	/**
+	 * Returns the sem ver range item.
 	 * @param {string} str str
 	 * @returns {SemVerRangeItem[]}
 	 */
@@ -143,6 +149,7 @@ module.exports.parseRange = (str) => {
 	};
 
 	/**
+	 * Returns the sem ver range item.
 	 *
 	 * @param {SemVerRangeItem[]} range range
 	 * @returns {SemVerRangeItem[]}
@@ -163,6 +170,7 @@ module.exports.parseRange = (str) => {
 	};
 
 	/**
+	 * Returns result.
 	 *
 	 * @param {SemVerRangeItem[]} range
 	 * @returns {SemVerRangeItem[]} result
@@ -172,6 +180,7 @@ module.exports.parseRange = (str) => {
 	};
 
 	/**
+	 * Returns the sem ver range.
 	 * @param {string} str str
 	 * @returns {SemVerRange}
 	 */
@@ -230,6 +239,7 @@ module.exports.parseRange = (str) => {
 	};
 
 	/**
+	 * Returns result.
 	 *
 	 * @param {SemVerRangeItem[][]} items items
 	 * @param {number} fn fn
@@ -251,6 +261,7 @@ module.exports.parseRange = (str) => {
 	};
 
 	/**
+	 * Returns the sem ver range.
 	 * @param {string} str str
 	 * @returns {SemVerRange}
 	 */
@@ -291,6 +302,7 @@ module.exports.parseRange = (str) => {
 	};
 
 	/**
+	 * Returns the sem ver range.
 	 * @param {string} str str
 	 * @returns {SemVerRange}
 	 */
@@ -309,6 +321,7 @@ module.exports.parseRange = (str) => {
 
 /* eslint-disable eqeqeq */
 /**
+ * Returns the string.
  * @param {SemVerRange} range
  * @returns {string}
  */
@@ -370,6 +383,7 @@ const rangeToString = (range) => {
 module.exports.rangeToString = rangeToString;
 
 /**
+ * Returns if version satisfy the range.
  * @param {SemVerRange} range version range
  * @param {string} version the version
  * @returns {boolean} if version satisfy the range
@@ -531,6 +545,7 @@ const satisfy = (range, version) => {
 module.exports.satisfy = satisfy;
 
 /**
+ * Returns the string.
  * @param {SemVerRange | string | number | false | undefined} json
  * @returns {string}
  */

package/lib/util/serialization.js

@@ -13,6 +13,7 @@ const memoize = require("./memoize");
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
 /**
+ * Defines the serializer type used by this module.
  * @template D, S, C
  * @typedef {import("../serialization/Serializer")<D, S, C>} Serializer
  */
@@ -109,6 +110,7 @@ module.exports = {
 		);
 	},
 	/**
+	 * Creates a file serializer.
 	 * @template D, S, C
 	 * @param {IntermediateFileSystem} fs filesystem
 	 * @param {HashFunction} hashFunction hash function to use

package/lib/util/smartGrouping.js

@@ -6,6 +6,7 @@
 "use strict";
 
 /**
+ * Defines the group options type used by this module.
  * @typedef {object} GroupOptions
  * @property {boolean=} groupChildren
  * @property {boolean=} force
@@ -13,6 +14,7 @@
  */
 
 /**
+ * Defines the group config type used by this module.
  * @template I
  * @template G
  * @typedef {object} GroupConfig
@@ -22,17 +24,20 @@
  */
 
 /**
+ * Defines the group type used by this module.
  * @template I
  * @template G
  * @typedef {{ config: GroupConfig<I, G>, name: string, alreadyGrouped: boolean, items: Items<I, G> | undefined }} Group
  */
 
 /**
+ * Defines the groups type used by this module.
  * @template I, G
  * @typedef {Set<Group<I, G>>} Groups
  */
 
 /**
+ * Defines the item with groups type used by this module.
  * @template I
  * @template G
  * @typedef {object} ItemWithGroups
@@ -41,11 +46,13 @@
  */
 
 /**
+ * Defines the items type used by this module.
  * @template T, G
  * @typedef {Set<ItemWithGroups<T, G>>} Items
  */
 
 /**
+ * Returns grouped items.
  * @template I
  * @template G
  * @template R
@@ -90,6 +97,7 @@ const smartGrouping = (items, groupConfigs) => {
 	}
 
 	/**
+	 * Returns groups items.
 	 * @param {Items<I, G>} itemsWithGroups input items with groups
 	 * @returns {(I | G)[]} groups items
 	 */

package/lib/util/source.js

@@ -6,11 +6,13 @@
 "use strict";
 
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("./Hash")} Hash */
 
 /** @type {WeakMap<Source, WeakMap<Source, boolean>>} */
 const equalityCache = new WeakMap();
 
 /**
+ * Checks whether source equal true, when both sources are equal.
  * @param {Source} a a source
  * @param {Source} b another source
  * @returns {boolean} true, when both sources are equal
@@ -29,6 +31,7 @@ const _isSourceEqual = (a, b) => {
 };
 
 /**
+ * Checks whether this object is source equal.
  * @param {Source} a a source
  * @param {Source} b another source
  * @returns {boolean} true, when both sources are equal
@@ -59,4 +62,24 @@ const isSourceEqual = (a, b) => {
 	return result;
 };
 
+// TODO remove in webpack 6, this is protection against authors who directly use `webpack-sources` outdated version
+/**
+ * Feeds the Source's content into a Hash without forcing a single
+ * concatenated Buffer. Uses webpack-sources >= 3.4.0 `buffers()` when
+ * available so `ConcatSource` can stream its children directly.
+ * @param {Hash} hash hash to update
+ * @param {Source} source source whose bytes are appended
+ * @returns {void}
+ */
+const updateHashFromSource = (hash, source) => {
+	// TODO webpack 6: drop the `buffers` check, require webpack-sources >= 3.4
+	// and call `source.buffers()` unconditionally.
+	if (typeof source.buffers === "function") {
+		for (const buf of source.buffers()) hash.update(buf);
+	} else {
+		hash.update(source.buffer());
+	}
+};
+
 module.exports.isSourceEqual = isSourceEqual;
+module.exports.updateHashFromSource = updateHashFromSource;

package/lib/util/topologicalSort.js

@@ -0,0 +1,69 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+/**
+ * Topologically sort `nodes` using Kahn's algorithm with source-order
+ * tie-breaking. Nodes that participate in a cycle remain unvisited —
+ * `visit` is never called for them — so the caller can naturally keep
+ * them in their original position by treating "no visit" as "keep
+ * source order".
+ *
+ * Precondition: every node appearing in `graph` (as a key OR inside any
+ * successor set) must also appear in `nodes`. The caller owns this
+ * invariant; the function does not validate it.
+ *
+ * Complexity: O(V·(V + E)). Each outer iteration scans the ready set
+ * linearly to find the smallest source-index node. CSS composes graphs
+ * are small (a handful of files per module) so this is fine; if a much
+ * larger graph ever needs sorting here, swap in a min-heap.
+ * @template T
+ * @param {Map<T, Set<T>>} graph adjacency list (`a -> b` means `a` must come before `b`)
+ * @param {T[]} nodes nodes in source first-appearance order
+ * @param {(node: T, index: number) => void} visit called once per non-cyclic node in topological order
+ * @returns {void}
+ */
+module.exports = (graph, nodes, visit) => {
+	/** @type {Map<T, number>} */
+	const inDegree = new Map();
+	/** @type {Map<T, number>} */
+	const sourceIndex = new Map();
+	for (let i = 0; i < nodes.length; i++) {
+		inDegree.set(nodes[i], 0);
+		sourceIndex.set(nodes[i], i);
+	}
+	for (const successors of graph.values()) {
+		for (const to of successors) {
+			inDegree.set(to, /** @type {number} */ (inDegree.get(to)) + 1);
+		}
+	}
+
+	const ready = nodes.filter((n) => inDegree.get(n) === 0);
+	let index = 0;
+	while (ready.length > 0) {
+		// Smallest-source-index wins ties. Linear scan + swap-with-last
+		// + pop avoids re-sorting the ready set on every iteration.
+		let minIdx = 0;
+		for (let i = 1; i < ready.length; i++) {
+			if (
+				/** @type {number} */ (sourceIndex.get(ready[i])) <
+				/** @type {number} */ (sourceIndex.get(ready[minIdx]))
+			) {
+				minIdx = i;
+			}
+		}
+		const node = ready[minIdx];
+		ready[minIdx] = ready[ready.length - 1];
+		ready.pop();
+		visit(node, index++);
+		const successors = graph.get(node);
+		if (!successors) continue;
+		for (const to of successors) {
+			const newDeg = /** @type {number} */ (inDegree.get(to)) - 1;
+			inDegree.set(to, newDeg);
+			if (newDeg === 0) ready.push(to);
+		}
+	}
+};