webpack 5.97.1 → 5.104.1

package/lib/util/runtime.js

@@ -19,7 +19,7 @@ const SortableSet = require("./SortableSet");
  * @param {EntryOptions=} options optionally already received entry options
  * @returns {RuntimeSpec} runtime
  */
-module.exports.getEntryRuntime = (compilation, name, options) => {
+const getEntryRuntime = (compilation, name, options) => {
 	let dependOn;
 	let runtime;
 	if (options) {
@@ -52,7 +52,7 @@ module.exports.getEntryRuntime = (compilation, name, options) => {
 
 /**
  * @param {RuntimeSpec} runtime runtime
- * @param {function(string | undefined): void} fn functor
+ * @param {(runtime: string | undefined) => void} fn functor
  * @param {boolean} deterministicOrder enforce a deterministic order
  * @returns {void}
  */
@@ -68,67 +68,63 @@ const forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 		}
 	}
 };
-module.exports.forEachRuntime = forEachRuntime;
 
 /**
  * @template T
- * @param {SortableSet<T>} set set
+ * @param {Exclude<RuntimeSpec, undefined | string>} set set
  * @returns {string} runtime key
  */
-const getRuntimesKey = set => {
+const getRuntimesKey = (set) => {
 	set.sort();
-	return Array.from(set).join("\n");
+	return [...set].join("\n");
 };
 
 /**
  * @param {RuntimeSpec} runtime runtime(s)
  * @returns {string} key of runtimes
  */
-const getRuntimeKey = runtime => {
+const getRuntimeKey = (runtime) => {
 	if (runtime === undefined) return "*";
 	if (typeof runtime === "string") return runtime;
 	return runtime.getFromUnorderedCache(getRuntimesKey);
 };
-module.exports.getRuntimeKey = getRuntimeKey;
 
 /**
  * @param {string} key key of runtimes
  * @returns {RuntimeSpec} runtime(s)
  */
-const keyToRuntime = key => {
+const keyToRuntime = (key) => {
 	if (key === "*") return;
 	const items = key.split("\n");
 	if (items.length === 1) return items[0];
 	return new SortableSet(items);
 };
-module.exports.keyToRuntime = keyToRuntime;
 
 /**
  * @template T
- * @param {SortableSet<T>} set set
+ * @param {Exclude<RuntimeSpec, undefined | string>} set set
  * @returns {string} runtime string
  */
-const getRuntimesString = set => {
+const getRuntimesString = (set) => {
 	set.sort();
-	return Array.from(set).join("+");
+	return [...set].join("+");
 };
 
 /**
  * @param {RuntimeSpec} runtime runtime(s)
  * @returns {string} readable version
  */
-const runtimeToString = runtime => {
+const runtimeToString = (runtime) => {
 	if (runtime === undefined) return "*";
 	if (typeof runtime === "string") return runtime;
 	return runtime.getFromUnorderedCache(getRuntimesString);
 };
-module.exports.runtimeToString = runtimeToString;
 
 /**
  * @param {RuntimeCondition} runtimeCondition runtime condition
  * @returns {string} readable version
  */
-module.exports.runtimeConditionToString = runtimeCondition => {
+const runtimeConditionToString = (runtimeCondition) => {
 	if (runtimeCondition === true) return "true";
 	if (runtimeCondition === false) return "false";
 	return runtimeToString(runtimeCondition);
@@ -163,14 +159,13 @@ const runtimeEqual = (a, b) => {
 		if (aV.value !== bV.value) return false;
 	}
 };
-module.exports.runtimeEqual = runtimeEqual;
 
 /**
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
- * @returns {-1|0|1} compare
+ * @returns {-1 | 0 | 1} compare
  */
-module.exports.compareRuntime = (a, b) => {
+const compareRuntime = (a, b) => {
 	if (a === b) {
 		return 0;
 	} else if (a === undefined) {
@@ -221,7 +216,6 @@ const mergeRuntime = (a, b) => {
 	if (set.size === a.size) return a;
 	return set;
 };
-module.exports.mergeRuntime = mergeRuntime;
 
 /**
  * @param {RuntimeCondition} a first
@@ -229,7 +223,7 @@ module.exports.mergeRuntime = mergeRuntime;
  * @param {RuntimeSpec} runtime full runtime
  * @returns {RuntimeCondition} result
  */
-module.exports.mergeRuntimeCondition = (a, b, runtime) => {
+const mergeRuntimeCondition = (a, b, runtime) => {
 	if (a === false) return b;
 	if (b === false) return a;
 	if (a === true || b === true) return true;
@@ -250,7 +244,7 @@ module.exports.mergeRuntimeCondition = (a, b, runtime) => {
  * @param {RuntimeSpec} runtime full runtime
  * @returns {RuntimeSpec | true} result
  */
-module.exports.mergeRuntimeConditionNonFalse = (a, b, runtime) => {
+const mergeRuntimeConditionNonFalse = (a, b, runtime) => {
 	if (a === true || b === true) return true;
 	const merged = mergeRuntime(a, b);
 	if (merged === undefined) return;
@@ -296,14 +290,13 @@ const mergeRuntimeOwned = (a, b) => {
 	for (const item of b) a.add(item);
 	return a;
 };
-module.exports.mergeRuntimeOwned = mergeRuntimeOwned;
 
 /**
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {RuntimeSpec} merged
  */
-module.exports.intersectRuntime = (a, b) => {
+const intersectRuntime = (a, b) => {
 	if (a === undefined) {
 		return b;
 	} else if (b === undefined) {
@@ -376,7 +369,6 @@ const subtractRuntime = (a, b) => {
 	}
 	return set;
 };
-module.exports.subtractRuntime = subtractRuntime;
 
 /**
  * @param {RuntimeCondition} a first
@@ -384,7 +376,7 @@ module.exports.subtractRuntime = subtractRuntime;
  * @param {RuntimeSpec} runtime runtime
  * @returns {RuntimeCondition} result
  */
-module.exports.subtractRuntimeCondition = (a, b, runtime) => {
+const subtractRuntimeCondition = (a, b, runtime) => {
 	if (b === true) return false;
 	if (b === false) return a;
 	if (a === false) return false;
@@ -394,10 +386,10 @@ module.exports.subtractRuntimeCondition = (a, b, runtime) => {
 
 /**
  * @param {RuntimeSpec} runtime runtime
- * @param {function(RuntimeSpec=): boolean} filter filter function
+ * @param {(runtime?: RuntimeSpec) => boolean} filter filter function
  * @returns {boolean | RuntimeSpec} true/false if filter is constant for all runtimes, otherwise runtimes that are active
  */
-module.exports.filterRuntime = (runtime, filter) => {
+const filterRuntime = (runtime, filter) => {
 	if (runtime === undefined) return filter();
 	if (typeof runtime === "string") return filter(runtime);
 	let some = false;
@@ -424,24 +416,26 @@ module.exports.filterRuntime = (runtime, filter) => {
 
 /**
  * @template T
+ * @template [R=T]
  */
 class RuntimeSpecMap {
 	/**
-	 * @param {RuntimeSpecMap<T>=} clone copy form this
+	 * @param {RuntimeSpecMap<T, R>=} clone copy form this
 	 */
 	constructor(clone) {
+		/** @type {0 | 1 | 2} */
 		this._mode = clone ? clone._mode : 0; // 0 = empty, 1 = single entry, 2 = map
 		/** @type {RuntimeSpec} */
 		this._singleRuntime = clone ? clone._singleRuntime : undefined;
-		/** @type {T | undefined} */
+		/** @type {R | undefined} */
 		this._singleValue = clone ? clone._singleValue : undefined;
-		/** @type {RuntimeSpecMapInnerMap<T> | undefined} */
+		/** @type {RuntimeSpecMapInnerMap<R> | undefined} */
 		this._map = clone && clone._map ? new Map(clone._map) : undefined;
 	}
 
 	/**
 	 * @param {RuntimeSpec} runtime the runtimes
-	 * @returns {T | undefined} value
+	 * @returns {R | undefined} value
 	 */
 	get(runtime) {
 		switch (this._mode) {
@@ -452,7 +446,7 @@ class RuntimeSpecMap {
 					? this._singleValue
 					: undefined;
 			default:
-				return /** @type {RuntimeSpecMapInnerMap<T>} */ (this._map).get(
+				return /** @type {RuntimeSpecMapInnerMap<R>} */ (this._map).get(
 					getRuntimeKey(runtime)
 				);
 		}
@@ -469,7 +463,7 @@ class RuntimeSpecMap {
 			case 1:
 				return runtimeEqual(this._singleRuntime, runtime);
 			default:
-				return /** @type {RuntimeSpecMapInnerMap<T>} */ (this._map).has(
+				return /** @type {RuntimeSpecMapInnerMap<R>} */ (this._map).has(
 					getRuntimeKey(runtime)
 				);
 		}
@@ -477,7 +471,7 @@ class RuntimeSpecMap {
 
 	/**
 	 * @param {RuntimeSpec} runtime the runtimes
-	 * @param {T} value the value
+	 * @param {R} value the value
 	 */
 	set(runtime, value) {
 		switch (this._mode) {
@@ -495,21 +489,21 @@ class RuntimeSpecMap {
 				this._map = new Map();
 				this._map.set(
 					getRuntimeKey(this._singleRuntime),
-					/** @type {T} */ (this._singleValue)
+					/** @type {R} */ (this._singleValue)
 				);
 				this._singleRuntime = undefined;
 				this._singleValue = undefined;
 			/* falls through */
 			default:
-				/** @type {RuntimeSpecMapInnerMap<T>} */
+				/** @type {RuntimeSpecMapInnerMap<R>} */
 				(this._map).set(getRuntimeKey(runtime), value);
 		}
 	}
 
 	/**
 	 * @param {RuntimeSpec} runtime the runtimes
-	 * @param {() => TODO} computer function to compute the value
-	 * @returns {TODO} true, when the runtime was deleted
+	 * @param {() => R} computer function to compute the value
+	 * @returns {R} the new value
 	 */
 	provide(runtime, computer) {
 		switch (this._mode) {
@@ -519,13 +513,14 @@ class RuntimeSpecMap {
 				return (this._singleValue = computer());
 			case 1: {
 				if (runtimeEqual(this._singleRuntime, runtime)) {
-					return /** @type {T} */ (this._singleValue);
+					return /** @type {R} */ (this._singleValue);
 				}
 				this._mode = 2;
 				this._map = new Map();
 				this._map.set(
 					getRuntimeKey(this._singleRuntime),
-					/** @type {T} */ (this._singleValue)
+					/** @type {R} */
+					(this._singleValue)
 				);
 				this._singleRuntime = undefined;
 				this._singleValue = undefined;
@@ -535,10 +530,12 @@ class RuntimeSpecMap {
 			}
 			default: {
 				const key = getRuntimeKey(runtime);
-				const value = /** @type {Map<string, T>} */ (this._map).get(key);
+				const value =
+					/** @type {RuntimeSpecMapInnerMap<R>} */
+					(this._map).get(key);
 				if (value !== undefined) return value;
 				const newValue = computer();
-				/** @type {Map<string, T>} */
+				/** @type {RuntimeSpecMapInnerMap<R>} */
 				(this._map).set(key, newValue);
 				return newValue;
 			}
@@ -560,14 +557,14 @@ class RuntimeSpecMap {
 				}
 				return;
 			default:
-				/** @type {RuntimeSpecMapInnerMap<T>} */
+				/** @type {RuntimeSpecMapInnerMap<R>} */
 				(this._map).delete(getRuntimeKey(runtime));
 		}
 	}
 
 	/**
 	 * @param {RuntimeSpec} runtime the runtimes
-	 * @param {function(T | undefined): T} fn function to update the value
+	 * @param {(value: R | undefined) => R} fn function to update the value
 	 */
 	update(runtime, fn) {
 		switch (this._mode) {
@@ -584,7 +581,8 @@ class RuntimeSpecMap {
 					this._map = new Map();
 					this._map.set(
 						getRuntimeKey(this._singleRuntime),
-						/** @type {T} */ (this._singleValue)
+						/** @type {R} */
+						(this._singleValue)
 					);
 					this._singleRuntime = undefined;
 					this._singleValue = undefined;
@@ -594,11 +592,14 @@ class RuntimeSpecMap {
 			}
 			default: {
 				const key = getRuntimeKey(runtime);
-				const oldValue = /** @type {Map<string, T>} */ (this._map).get(key);
+				const oldValue =
+					/** @type {RuntimeSpecMapInnerMap<R>} */
+					(this._map).get(key);
 				const newValue = fn(oldValue);
-				if (newValue !== oldValue)
-					/** @type {RuntimeSpecMapInnerMap<T>} */
+				if (newValue !== oldValue) {
+					/** @type {RuntimeSpecMapInnerMap<R>} */
 					(this._map).set(key, newValue);
+				}
 			}
 		}
 	}
@@ -611,7 +612,7 @@ class RuntimeSpecMap {
 				return [this._singleRuntime];
 			default:
 				return Array.from(
-					/** @type {RuntimeSpecMapInnerMap<T>} */
+					/** @type {RuntimeSpecMapInnerMap<R>} */
 					(this._map).keys(),
 					keyToRuntime
 				);
@@ -619,16 +620,16 @@ class RuntimeSpecMap {
 	}
 
 	/**
-	 * @returns {IterableIterator<T>} values
+	 * @returns {IterableIterator<R>} values
 	 */
 	values() {
 		switch (this._mode) {
 			case 0:
 				return [][Symbol.iterator]();
 			case 1:
-				return [/** @type {T} */ (this._singleValue)][Symbol.iterator]();
+				return [/** @type {R} */ (this._singleValue)][Symbol.iterator]();
 			default:
-				return /** @type {Map<string, T>} */ (this._map).values();
+				return /** @type {RuntimeSpecMapInnerMap<R>} */ (this._map).values();
 		}
 	}
 
@@ -637,12 +638,10 @@ class RuntimeSpecMap {
 			return /** @type {number} */ (this._mode);
 		}
 
-		return /** @type {Map<string, T>} */ (this._map).size;
+		return /** @type {RuntimeSpecMapInnerMap<R>} */ (this._map).size;
 	}
 }
 
-module.exports.RuntimeSpecMap = RuntimeSpecMap;
-
 class RuntimeSpecSet {
 	/**
 	 * @param {Iterable<RuntimeSpec>=} iterable iterable
@@ -684,4 +683,21 @@ class RuntimeSpecSet {
 	}
 }
 
+module.exports.RuntimeSpecMap = RuntimeSpecMap;
 module.exports.RuntimeSpecSet = RuntimeSpecSet;
+module.exports.compareRuntime = compareRuntime;
+module.exports.filterRuntime = filterRuntime;
+module.exports.forEachRuntime = forEachRuntime;
+module.exports.getEntryRuntime = getEntryRuntime;
+module.exports.getRuntimeKey = getRuntimeKey;
+module.exports.intersectRuntime = intersectRuntime;
+module.exports.keyToRuntime = keyToRuntime;
+module.exports.mergeRuntime = mergeRuntime;
+module.exports.mergeRuntimeCondition = mergeRuntimeCondition;
+module.exports.mergeRuntimeConditionNonFalse = mergeRuntimeConditionNonFalse;
+module.exports.mergeRuntimeOwned = mergeRuntimeOwned;
+module.exports.runtimeConditionToString = runtimeConditionToString;
+module.exports.runtimeEqual = runtimeEqual;
+module.exports.runtimeToString = runtimeToString;
+module.exports.subtractRuntime = subtractRuntime;
+module.exports.subtractRuntimeCondition = subtractRuntimeCondition;

package/lib/util/semver.js

@@ -6,22 +6,23 @@
 "use strict";
 
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {string | number | undefined} SemVerRangeItem */
+/** @typedef {string | number} VersionValue */
+/** @typedef {VersionValue | undefined} SemVerRangeItem */
 /** @typedef {(SemVerRangeItem | SemVerRangeItem[])[]} SemVerRange */
 
 /**
  * @param {string} str version string
  * @returns {SemVerRange} parsed version
  */
-const parseVersion = str => {
+const parseVersion = (str) => {
 	/**
 	 * @param {str} str str
-	 * @returns {(string | number)[]} result
+	 * @returns {VersionValue[]} result
 	 */
 	var splitAndConvert = function (str) {
 		return str.split(".").map(function (item) {
 			// eslint-disable-next-line eqeqeq
-			return +item == /** @type {EXPECTED_ANY} */ (item) ? +item : item;
+			return +item == /** @type {string | number} */ (item) ? +item : item;
 		});
 	};
 
@@ -29,7 +30,7 @@ const parseVersion = str => {
 		/** @type {RegExpExecArray} */
 		(/^([^-+]+)?(?:-([^+]+))?(?:\+(.+))?$/.exec(str));
 
-	/** @type {(string | number | undefined | [])[]} */
+	/** @type {(VersionValue | undefined | [])[]} */
 	var ver = match[1] ? splitAndConvert(match[1]) : [];
 
 	if (match[2]) {
@@ -100,15 +101,15 @@ module.exports.versionLt = versionLt;
  * @param {string} str range string
  * @returns {SemVerRange} parsed range
  */
-module.exports.parseRange = str => {
+module.exports.parseRange = (str) => {
 	/**
 	 * @param {string} str str
-	 * @returns {(string | number)[]} result
+	 * @returns {VersionValue[]} result
 	 */
-	const splitAndConvert = str => {
+	const splitAndConvert = (str) => {
 		return str
 			.split(".")
-			.map(item => (item !== "NaN" && `${+item}` === item ? +item : item));
+			.map((item) => (item !== "NaN" && `${+item}` === item ? +item : item));
 	};
 
 	// see https://docs.npmjs.com/misc/semver#range-grammar for grammar
@@ -116,7 +117,7 @@ module.exports.parseRange = str => {
 	 * @param {string} str str
 	 * @returns {SemVerRangeItem[]}
 	 */
-	const parsePartial = str => {
+	const parsePartial = (str) => {
 		const match =
 			/** @type {RegExpExecArray} */
 			(/^([^-+]+)?(?:-([^+]+))?(?:\+(.+))?$/.exec(str));
@@ -146,7 +147,7 @@ module.exports.parseRange = str => {
 	 * @param {SemVerRangeItem[]} range range
 	 * @returns {SemVerRangeItem[]}
 	 */
-	const toFixed = range => {
+	const toFixed = (range) => {
 		if (range.length === 1) {
 			// Special case for "*" is "x.x.x" instead of "="
 			return [0];
@@ -166,7 +167,7 @@ module.exports.parseRange = str => {
 	 * @param {SemVerRangeItem[]} range
 	 * @returns {SemVerRangeItem[]} result
 	 */
-	const negate = range => {
+	const negate = (range) => {
 		return [-(/** @type { [number]} */ (range)[0]) - 1, ...range.slice(1)];
 	};
 
@@ -174,7 +175,7 @@ module.exports.parseRange = str => {
 	 * @param {string} str str
 	 * @returns {SemVerRange}
 	 */
-	const parseSimple = str => {
+	const parseSimple = (str) => {
 		// simple       ::= primitive | partial | tilde | caret
 		// primitive    ::= ( '<' | '>' | '>=' | '<=' | '=' | '!' ) ( ' ' ) * partial
 		// tilde        ::= '~' ( ' ' ) * partial
@@ -253,21 +254,31 @@ module.exports.parseRange = str => {
 	 * @param {string} str str
 	 * @returns {SemVerRange}
 	 */
-	const parseRange = str => {
+	const parseRange = (str) => {
 		// range      ::= hyphen | simple ( ' ' ( ' ' ) * simple ) * | ''
 		// hyphen     ::= partial ( ' ' ) * ' - ' ( ' ' ) * partial
 		const items = str.split(/\s+-\s+/);
 
 		if (items.length === 1) {
-			const items =
-				/** @type {SemVerRangeItem[][]} */
-				(
-					str
-						.trim()
-						.split(/(?<=[-0-9A-Za-z])\s+/g)
-						.map(parseSimple)
-				);
+			str = str.trim();
 
+			/** @type {SemVerRangeItem[][]} */
+			const items = [];
+			const r = /[-0-9A-Za-z]\s+/g;
+			var start = 0;
+			var match;
+			while ((match = r.exec(str))) {
+				const end = match.index + 1;
+				items.push(
+					/** @type {SemVerRangeItem[]} */
+					(parseSimple(str.slice(start, end).trim()))
+				);
+				start = end;
+			}
+			items.push(
+				/** @type {SemVerRangeItem[]} */
+				(parseSimple(str.slice(start).trim()))
+			);
 			return combine(items, 2);
 		}
 
@@ -282,7 +293,7 @@ module.exports.parseRange = str => {
 	 * @param {string} str str
 	 * @returns {SemVerRange}
 	 */
-	const parseLogicalOr = str => {
+	const parseLogicalOr = (str) => {
 		// range-set  ::= range ( logical-or range ) *
 		// logical-or ::= ( ' ' ) * '||' ( ' ' ) *
 		const items =
@@ -300,7 +311,7 @@ module.exports.parseRange = str => {
  * @param {SemVerRange} range
  * @returns {string}
  */
-const rangeToString = range => {
+const rangeToString = (range) => {
 	var fixCount = /** @type {number} */ (range[0]);
 	var str = "";
 	if (range.length === 1) {
@@ -419,7 +430,7 @@ const satisfy = (range, version) => {
 				/** @type {"s" | "n" | "u" | ""} */
 				(j < range.length ? (typeof range[j])[0] : "");
 
-			/** @type {number | string | undefined} */
+			/** @type {VersionValue | undefined} */
 			var versionValue;
 			/** @type {"n" | "s" | "u" | "o" | undefined} */
 			var versionType;
@@ -460,8 +471,8 @@ const satisfy = (range, version) => {
 						// Handles "cmp" cases
 						if (
 							negated
-								? versionValue > /** @type {(number | string)[]} */ (range)[j]
-								: versionValue < /** @type {(number | string)[]} */ (range)[j]
+								? versionValue > /** @type {VersionValue[]} */ (range)[j]
+								: versionValue < /** @type {VersionValue[]} */ (range)[j]
 						) {
 							return false;
 						}
@@ -522,7 +533,7 @@ module.exports.satisfy = satisfy;
  * @param {SemVerRange | string | number | false | undefined} json
  * @returns {string}
  */
-module.exports.stringifyHoley = json => {
+module.exports.stringifyHoley = (json) => {
 	switch (typeof json) {
 		case "undefined":
 			return "";
@@ -548,10 +559,10 @@ module.exports.stringifyHoley = json => {
  * @param {RuntimeTemplate} runtimeTemplate
  * @returns {string}
  */
-exports.parseVersionRuntimeCode = runtimeTemplate =>
+exports.parseVersionRuntimeCode = (runtimeTemplate) =>
 	`var parseVersion = ${runtimeTemplate.basicFunction("str", [
 		"// see webpack/lib/util/semver.js for original code",
-		`var p=${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return p.split(".").map((${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return+p==p?+p:p}))},n=/^([^-+]+)?(?:-([^+]+))?(?:\\+(.+))?$/.exec(str),r=n[1]?p(n[1]):[];return n[2]&&(r.length++,r.push.apply(r,p(n[2]))),n[3]&&(r.push([]),r.push.apply(r,p(n[3]))),r;`
+		`var p=${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return p.split(".").map(${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return+p==p?+p:p})},n=/^([^-+]+)?(?:-([^+]+))?(?:\\+(.+))?$/.exec(str),r=n[1]?p(n[1]):[];return n[2]&&(r.length++,r.push.apply(r,p(n[2]))),n[3]&&(r.push([]),r.push.apply(r,p(n[3]))),r;`
 	])}`;
 //#endregion
 
@@ -560,7 +571,7 @@ exports.parseVersionRuntimeCode = runtimeTemplate =>
  * @param {RuntimeTemplate} runtimeTemplate
  * @returns {string}
  */
-exports.versionLtRuntimeCode = runtimeTemplate =>
+exports.versionLtRuntimeCode = (runtimeTemplate) =>
 	`var versionLt = ${runtimeTemplate.basicFunction("a, b", [
 		"// see webpack/lib/util/semver.js for original code",
 		'a=parseVersion(a),b=parseVersion(b);for(var r=0;;){if(r>=a.length)return r<b.length&&"u"!=(typeof b[r])[0];var e=a[r],n=(typeof e)[0];if(r>=b.length)return"u"==n;var t=b[r],f=(typeof t)[0];if(n!=f)return"o"==n&&"n"==f||("s"==f||"u"==n);if("o"!=n&&"u"!=n&&e!=t)return e<t;r++}'
@@ -572,7 +583,7 @@ exports.versionLtRuntimeCode = runtimeTemplate =>
  * @param {RuntimeTemplate} runtimeTemplate
  * @returns {string}
  */
-exports.rangeToStringRuntimeCode = runtimeTemplate =>
+exports.rangeToStringRuntimeCode = (runtimeTemplate) =>
 	`var rangeToString = ${runtimeTemplate.basicFunction("range", [
 		"// see webpack/lib/util/semver.js for original code",
 		'var r=range[0],n="";if(1===range.length)return"*";if(r+.5){n+=0==r?">=":-1==r?"<":1==r?"^":2==r?"~":r>0?"=":"!=";for(var e=1,a=1;a<range.length;a++){e--,n+="u"==(typeof(t=range[a]))[0]?"-":(e>0?".":"")+(e=2,t)}return n}var g=[];for(a=1;a<range.length;a++){var t=range[a];g.push(0===t?"not("+o()+")":1===t?"("+o()+" || "+o()+")":2===t?g.pop()+" "+g.pop():rangeToString(t))}return o();function o(){return g.pop().replace(/^\\((.+)\\)$/,"$1")}'
@@ -584,7 +595,7 @@ exports.rangeToStringRuntimeCode = runtimeTemplate =>
  * @param {RuntimeTemplate} runtimeTemplate
  * @returns {string}
  */
-exports.satisfyRuntimeCode = runtimeTemplate =>
+exports.satisfyRuntimeCode = (runtimeTemplate) =>
 	`var satisfy = ${runtimeTemplate.basicFunction("range, version", [
 		"// see webpack/lib/util/semver.js for original code",
 		'if(0 in range){version=parseVersion(version);var e=range[0],r=e<0;r&&(e=-e-1);for(var n=0,i=1,a=!0;;i++,n++){var f,s,g=i<range.length?(typeof range[i])[0]:"";if(n>=version.length||"o"==(s=(typeof(f=version[n]))[0]))return!a||("u"==g?i>e&&!r:""==g!=r);if("u"==s){if(!a||"u"!=g)return!1}else if(a)if(g==s)if(i<=e){if(f!=range[i])return!1}else{if(r?f>range[i]:f<range[i])return!1;f!=range[i]&&(a=!1)}else if("s"!=g&&"n"!=g){if(r||i<=e)return!1;a=!1,i--}else{if(i<=e||s<g!=r)return!1;a=!1}else"s"!=g&&"n"!=g&&(a=!1,i--)}}var t=[],o=t.pop.bind(t);for(n=1;n<range.length;n++){var u=range[n];t.push(1==u?o()|o():2==u?o()&o():u?satisfy(u,version):!o())}return!!o();'