webpack 5.65.0 → 5.69.0

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -9,6 +9,8 @@
 /** @typedef {import("./StatsPrinter")} StatsPrinter */
 /** @typedef {import("./StatsPrinter").StatsPrinterContext} StatsPrinterContext */
 
+const DATA_URI_CONTENT_LENGTH = 16;
+
 const plural = (n, singular, plural) => (n === 1 ? singular : plural);
 
 /**
@@ -26,6 +28,23 @@ const printSizes = (sizes, { formatSize = n => `${n}` }) => {
 	}
 };
 
+const getResourceName = resource => {
+	const dataUrl = /^data:[^,]+,/.exec(resource);
+	if (!dataUrl) return resource;
+
+	const len = dataUrl[0].length + DATA_URI_CONTENT_LENGTH;
+	if (resource.length < len) return resource;
+	return `${resource.slice(
+		0,
+		Math.min(resource.length - /* '..'.length */ 2, len)
+	)}..`;
+};
+
+const getModuleName = name => {
+	const [, prefix, resource] = /^(.*!)?([^!]*)$/.exec(name);
+	return [prefix, getResourceName(resource)];
+};
+
 const mapLines = (str, fn) => str.split("\n").map(fn).join("\n");
 
 /**
@@ -38,6 +57,10 @@ const isValidId = id => {
 	return typeof id === "number" || id;
 };
 
+const moreCount = (list, count) => {
+	return list && list.length > 0 ? `+ ${count}` : `${count}`;
+};
+
 /** @type {Record<string, (thing: any, context: StatsPrinterContext, printer: StatsPrinter) => string | void>} */
 const SIMPLE_PRINTERS = {
 	"compilation.summary!": (
@@ -163,13 +186,24 @@ const SIMPLE_PRINTERS = {
 	},
 	"compilation.assetsByChunkName": () => "",
 
-	"compilation.filteredModules": filteredModules =>
+	"compilation.filteredModules": (
+		filteredModules,
+		{ compilation: { modules } }
+	) =>
 		filteredModules > 0
-			? `${filteredModules} ${plural(filteredModules, "module", "modules")}`
+			? `${moreCount(modules, filteredModules)} ${plural(
+					filteredModules,
+					"module",
+					"modules"
+			  )}`
 			: undefined,
 	"compilation.filteredAssets": (filteredAssets, { compilation: { assets } }) =>
 		filteredAssets > 0
-			? `${filteredAssets} ${plural(filteredAssets, "asset", "assets")}`
+			? `${moreCount(assets, filteredAssets)} ${plural(
+					filteredAssets,
+					"asset",
+					"assets"
+			  )}`
 			: undefined,
 	"compilation.logging": (logging, context, printer) =>
 		Array.isArray(logging)
@@ -262,15 +296,19 @@ const SIMPLE_PRINTERS = {
 	"asset.separator!": () => "\n",
 	"asset.filteredRelated": (filteredRelated, { asset: { related } }) =>
 		filteredRelated > 0
-			? `${filteredRelated} related ${plural(
+			? `${moreCount(related, filteredRelated)} related ${plural(
 					filteredRelated,
 					"asset",
 					"assets"
 			  )}`
 			: undefined,
-	"asset.filteredChildren": filteredChildren =>
+	"asset.filteredChildren": (filteredChildren, { asset: { children } }) =>
 		filteredChildren > 0
-			? `${filteredChildren} ${plural(filteredChildren, "asset", "assets")}`
+			? `${moreCount(children, filteredChildren)} ${plural(
+					filteredChildren,
+					"asset",
+					"assets"
+			  )}`
 			: undefined,
 
 	assetChunk: (id, { formatChunkId }) => formatChunkId(id),
@@ -282,8 +320,8 @@ const SIMPLE_PRINTERS = {
 	"module.id": (id, { formatModuleId }) =>
 		isValidId(id) ? formatModuleId(id) : undefined,
 	"module.name": (name, { bold }) => {
-		const [, prefix, resource] = /^(.*!)?([^!]*)$/.exec(name);
-		return (prefix || "") + bold(resource);
+		const [prefix, resource] = getModuleName(name);
+		return `${prefix || ""}${bold(resource || "")}`;
 	},
 	"module.identifier": identifier => undefined,
 	"module.layer": (layer, { formatLayer }) =>
@@ -366,21 +404,29 @@ const SIMPLE_PRINTERS = {
 	"module.issuerPath": (issuerPath, { module }) =>
 		module.profile ? undefined : "",
 	"module.profile": profile => undefined,
-	"module.filteredModules": filteredModules =>
+	"module.filteredModules": (filteredModules, { module: { modules } }) =>
 		filteredModules > 0
-			? `${filteredModules} nested ${plural(
+			? `${moreCount(modules, filteredModules)} nested ${plural(
 					filteredModules,
 					"module",
 					"modules"
 			  )}`
 			: undefined,
-	"module.filteredReasons": filteredReasons =>
+	"module.filteredReasons": (filteredReasons, { module: { reasons } }) =>
 		filteredReasons > 0
-			? `${filteredReasons} ${plural(filteredReasons, "reason", "reasons")}`
+			? `${moreCount(reasons, filteredReasons)} ${plural(
+					filteredReasons,
+					"reason",
+					"reasons"
+			  )}`
 			: undefined,
-	"module.filteredChildren": filteredChildren =>
+	"module.filteredChildren": (filteredChildren, { module: { children } }) =>
 		filteredChildren > 0
-			? `${filteredChildren} ${plural(filteredChildren, "module", "modules")}`
+			? `${moreCount(children, filteredChildren)} ${plural(
+					filteredChildren,
+					"module",
+					"modules"
+			  )}`
 			: undefined,
 	"module.separator!": () => "\n",
 
@@ -388,7 +434,8 @@ const SIMPLE_PRINTERS = {
 	"moduleIssuer.profile.total": (value, { formatTime }) => formatTime(value),
 
 	"moduleReason.type": type => type,
-	"moduleReason.userRequest": (userRequest, { cyan }) => cyan(userRequest),
+	"moduleReason.userRequest": (userRequest, { cyan }) =>
+		cyan(getResourceName(userRequest)),
 	"moduleReason.moduleId": (moduleId, { formatModuleId }) =>
 		isValidId(moduleId) ? formatModuleId(moduleId) : undefined,
 	"moduleReason.module": (module, { magenta }) => magenta(module),
@@ -397,9 +444,16 @@ const SIMPLE_PRINTERS = {
 	"moduleReason.active": (active, { formatFlag }) =>
 		active ? undefined : formatFlag("inactive"),
 	"moduleReason.resolvedModule": (module, { magenta }) => magenta(module),
-	"moduleReason.filteredChildren": filteredChildren =>
+	"moduleReason.filteredChildren": (
+		filteredChildren,
+		{ moduleReason: { children } }
+	) =>
 		filteredChildren > 0
-			? `${filteredChildren} ${plural(filteredChildren, "reason", "reasons")}`
+			? `${moreCount(children, filteredChildren)} ${plural(
+					filteredChildren,
+					"reason",
+					"reasons"
+			  )}`
 			: undefined,
 
 	"module.profile.total": (value, { formatTime }) => formatTime(value),
@@ -427,10 +481,21 @@ const SIMPLE_PRINTERS = {
 		size ? formatSize(size) : undefined,
 	"chunkGroup.auxiliaryAssetsSize": (size, { formatSize }) =>
 		size ? `(${formatSize(size)})` : undefined,
-	"chunkGroup.filteredAssets": n =>
-		n > 0 ? `${n} ${plural(n, "asset", "assets")}` : undefined,
-	"chunkGroup.filteredAuxiliaryAssets": n =>
-		n > 0 ? `${n} auxiliary ${plural(n, "asset", "assets")}` : undefined,
+	"chunkGroup.filteredAssets": (n, { chunkGroup: { assets } }) =>
+		n > 0
+			? `${moreCount(assets, n)} ${plural(n, "asset", "assets")}`
+			: undefined,
+	"chunkGroup.filteredAuxiliaryAssets": (
+		n,
+		{ chunkGroup: { auxiliaryAssets } }
+	) =>
+		n > 0
+			? `${moreCount(auxiliaryAssets, n)} auxiliary ${plural(
+					n,
+					"asset",
+					"assets"
+			  )}`
+			: undefined,
 	"chunkGroup.is!": () => "=",
 	"chunkGroupAsset.name": (asset, { green }) => green(asset),
 	"chunkGroupAsset.size": (size, { formatSize, chunkGroup }) =>
@@ -490,9 +555,9 @@ const SIMPLE_PRINTERS = {
 	"chunk.recorded": (recorded, { formatFlag, green }) =>
 		recorded ? green(formatFlag("recorded")) : undefined,
 	"chunk.reason": (reason, { yellow }) => (reason ? yellow(reason) : undefined),
-	"chunk.filteredModules": filteredModules =>
+	"chunk.filteredModules": (filteredModules, { chunk: { modules } }) =>
 		filteredModules > 0
-			? `${filteredModules} chunk ${plural(
+			? `${moreCount(modules, filteredModules)} chunk ${plural(
 					filteredModules,
 					"module",
 					"modules"

package/lib/util/ArrayHelpers.js

@@ -5,6 +5,14 @@
 
 "use strict";
 
+/**
+ * Compare two arrays or strings by performing strict equality check for each value.
+ * @template T [T=any]
+ * @param {ArrayLike<T>} a Array of values to be compared
+ * @param {ArrayLike<T>} b Array of values to be compared
+ * @returns {boolean} returns true if all the elements of passed arrays are strictly equal.
+ */
+
 exports.equals = (a, b) => {
 	if (a.length !== b.length) return false;
 	for (let i = 0; i < a.length; i++) {
@@ -14,13 +22,19 @@ exports.equals = (a, b) => {
 };
 
 /**
- *
- * @param {Array} arr Array of values to be partitioned
- * @param {(value: any) => boolean} fn Partition function which partitions based on truthiness of result.
- * @returns {[Array, Array]} returns the values of `arr` partitioned into two new arrays based on fn predicate.
+ * Partition an array by calling a predicate function on each value.
+ * @template T [T=any]
+ * @param {Array<T>} arr Array of values to be partitioned
+ * @param {(value: T) => boolean} fn Partition function which partitions based on truthiness of result.
+ * @returns {[Array<T>, Array<T>]} returns the values of `arr` partitioned into two new arrays based on fn predicate.
  */
 exports.groupBy = (arr = [], fn) => {
 	return arr.reduce(
+		/**
+		 * @param {[Array<T>, Array<T>]} groups An accumulator storing already partitioned values returned from previous call.
+		 * @param {T} value The value of the current element
+		 * @returns {[Array<T>, Array<T>]} returns an array of partitioned groups accumulator resulting from calling a predicate on the current value.
+		 */
 		(groups, value) => {
 			groups[fn(value) ? 0 : 1].push(value);
 			return groups;

package/lib/util/AsyncQueue.js

@@ -19,7 +19,7 @@ let inHandleResult = 0;
 /**
  * @template T
  * @callback Callback
- * @param {WebpackError=} err
+ * @param {(WebpackError | null)=} err
  * @param {T=} result
  */
 

package/lib/util/compileBooleanMatcher.js

@@ -18,7 +18,7 @@ const toSimpleString = str => {
 
 /**
  * @param {Record<string|number, boolean>} map value map
- * @returns {true|false|function(string): string} true/false, when unconditionally true/false, or a template function to determine the value at runtime
+ * @returns {boolean|(function(string): string)} true/false, when unconditionally true/false, or a template function to determine the value at runtime
  */
 const compileBooleanMatcher = map => {
 	const positiveItems = Object.keys(map).filter(i => map[i]);

package/lib/util/deterministicGrouping.js

@@ -498,7 +498,7 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 
 	// return the results
 	return result.map(group => {
-		/** @type {GroupedItems} */
+		/** @type {GroupedItems<T>} */
 		return {
 			key: group.key,
 			items: group.nodes.map(node => node.item),

package/lib/util/hash/xxhash64.js

@@ -10,8 +10,8 @@ const create = require("./wasm-hash");
 //#region wasm code: xxhash64 (../../../assembly/hash/xxhash64.asm.ts) --initialMemory 1
 const xxhash64 = new WebAssembly.Module(
 	Buffer.from(
-		// 1173 bytes
-		"AGFzbQEAAAABCAJgAX8AYAAAAwQDAQAABQMBAAEGGgV+AUIAC34BQgALfgFCAAt+AUIAC34BQgALByIEBGluaXQAAAZ1cGRhdGUAAQVmaW5hbAACBm1lbW9yeQIACrUIAzAAQtbrgu7q/Yn14AAkAELP1tO+0ser2UIkAUIAJAJC+erQ0OfJoeThACQDQgAkBAvUAQIBfwR+IABFBEAPCyMEIACtfCQEIwAhAiMBIQMjAiEEIwMhBQNAIAIgASkDAELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiECIAMgASkDCELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEDIAQgASkDEELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEEIAUgASkDGELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEFIAAgAUEgaiIBSw0ACyACJAAgAyQBIAQkAiAFJAMLqwYCAX8EfiMEQgBSBH4jACICQgGJIwEiA0IHiXwjAiIEQgyJfCMDIgVCEol8IAJCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0gA0LP1tO+0ser2UJ+Qh+JQoeVr6+Ytt6bnn9+hUKHla+vmLbem55/fkKdo7Xqg7GNivoAfSAEQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IAVCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0FQsXP2bLx5brqJwsjBCAArXx8IQIDQCABQQhqIABNBEAgAiABKQMAQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQhuJQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IQIgAUEIaiEBDAELCyABQQRqIABNBEACfyACIAE1AgBCh5Wvr5i23puef36FQheJQs/W077Sx6vZQn5C+fPd8Zn2masWfCECIAFBBGoLIQELA0AgACABRwRAIAIgATEAAELFz9my8eW66id+hUILiUKHla+vmLbem55/fiECIAFBAWohAQwBCwtBACACIAJCIYiFQs/W077Sx6vZQn4iAkIdiCAChUL5893xmfaZqxZ+IgJCIIggAoUiAkIgiCIDQv//A4NCIIYgA0KAgPz/D4NCEIiEIgNC/4GAgPAfg0IQhiADQoD+g4CA4D+DQgiIhCIDQo+AvIDwgcAHg0IIhiADQvCBwIeAnoD4AINCBIiEIgNChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IANCsODAgYOGjJgwhHw3AwBBCCACQv////8PgyICQv//A4NCIIYgAkKAgPz/D4NCEIiEIgJC/4GAgPAfg0IQhiACQoD+g4CA4D+DQgiIhCICQo+AvIDwgcAHg0IIhiACQvCBwIeAnoD4AINCBIiEIgJChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IAJCsODAgYOGjJgwhHw3AwAL",
+		// 1170 bytes
+		"AGFzbQEAAAABCAJgAX8AYAAAAwQDAQAABQMBAAEGGgV+AUIAC34BQgALfgFCAAt+AUIAC34BQgALByIEBGluaXQAAAZ1cGRhdGUAAQVmaW5hbAACBm1lbW9yeQIACrIIAzAAQtbrgu7q/Yn14AAkAELP1tO+0ser2UIkAUIAJAJC+erQ0OfJoeThACQDQgAkBAvUAQIBfwR+IABFBEAPCyMEIACtfCQEIwAhAiMBIQMjAiEEIwMhBQNAIAIgASkDAELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiECIAMgASkDCELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEDIAQgASkDEELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEEIAUgASkDGELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEFIAAgAUEgaiIBSw0ACyACJAAgAyQBIAQkAiAFJAMLqAYCAX8EfiMEQgBSBH4jACICQgGJIwEiA0IHiXwjAiIEQgyJfCMDIgVCEol8IAJCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0gA0LP1tO+0ser2UJ+Qh+JQoeVr6+Ytt6bnn9+hUKHla+vmLbem55/fkKdo7Xqg7GNivoAfSAEQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IAVCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0FQsXP2bLx5brqJwsjBCAArXx8IQIDQCABQQhqIABNBEAgAiABKQMAQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQhuJQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IQIgAUEIaiEBDAELCyABQQRqIABNBEAgAiABNQIAQoeVr6+Ytt6bnn9+hUIXiULP1tO+0ser2UJ+Qvnz3fGZ9pmrFnwhAiABQQRqIQELA0AgACABRwRAIAIgATEAAELFz9my8eW66id+hUILiUKHla+vmLbem55/fiECIAFBAWohAQwBCwtBACACIAJCIYiFQs/W077Sx6vZQn4iAkIdiCAChUL5893xmfaZqxZ+IgJCIIggAoUiAkIgiCIDQv//A4NCIIYgA0KAgPz/D4NCEIiEIgNC/4GAgPAfg0IQhiADQoD+g4CA4D+DQgiIhCIDQo+AvIDwgcAHg0IIhiADQvCBwIeAnoD4AINCBIiEIgNChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IANCsODAgYOGjJgwhHw3AwBBCCACQv////8PgyICQv//A4NCIIYgAkKAgPz/D4NCEIiEIgJC/4GAgPAfg0IQhiACQoD+g4CA4D+DQgiIhCICQo+AvIDwgcAHg0IIhiACQvCBwIeAnoD4AINCBIiEIgJChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IAJCsODAgYOGjJgwhHw3AwAL",
 		"base64"
 	)
 );

package/lib/util/identifier.js

@@ -81,7 +81,49 @@ const requestToAbsolute = (context, relativePath) => {
 	return relativePath;
 };
 
-const makeCacheable = fn => {
+const makeCacheable = realFn => {
+	/** @type {WeakMap<object, Map<string, ParsedResource>>} */
+	const cache = new WeakMap();
+
+	const getCache = associatedObjectForCache => {
+		const entry = cache.get(associatedObjectForCache);
+		if (entry !== undefined) return entry;
+		/** @type {Map<string, ParsedResource>} */
+		const map = new Map();
+		cache.set(associatedObjectForCache, map);
+		return map;
+	};
+
+	/**
+	 * @param {string} str the path with query and fragment
+	 * @param {Object=} associatedObjectForCache an object to which the cache will be attached
+	 * @returns {ParsedResource} parsed parts
+	 */
+	const fn = (str, associatedObjectForCache) => {
+		if (!associatedObjectForCache) return realFn(str);
+		const cache = getCache(associatedObjectForCache);
+		const entry = cache.get(str);
+		if (entry !== undefined) return entry;
+		const result = realFn(str);
+		cache.set(str, result);
+		return result;
+	};
+
+	fn.bindCache = associatedObjectForCache => {
+		const cache = getCache(associatedObjectForCache);
+		return str => {
+			const entry = cache.get(str);
+			if (entry !== undefined) return entry;
+			const result = realFn(str);
+			cache.set(str, result);
+			return result;
+		};
+	};
+
+	return fn;
+};
+
+const makeCacheableWithContext = fn => {
 	/** @type {WeakMap<object, Map<string, Map<string, string>>>} */
 	const cache = new WeakMap();
 
@@ -215,7 +257,7 @@ const _makePathsRelative = (context, identifier) => {
 		.join("");
 };
 
-exports.makePathsRelative = makeCacheable(_makePathsRelative);
+exports.makePathsRelative = makeCacheableWithContext(_makePathsRelative);
 
 /**
  *
@@ -230,7 +272,7 @@ const _makePathsAbsolute = (context, identifier) => {
 		.join("");
 };
 
-exports.makePathsAbsolute = makeCacheable(_makePathsAbsolute);
+exports.makePathsAbsolute = makeCacheableWithContext(_makePathsAbsolute);
 
 /**
  * @param {string} context absolute context path
@@ -244,7 +286,7 @@ const _contextify = (context, request) => {
 		.join("!");
 };
 
-const contextify = makeCacheable(_contextify);
+const contextify = makeCacheableWithContext(_contextify);
 exports.contextify = contextify;
 
 /**
@@ -259,13 +301,15 @@ const _absolutify = (context, request) => {
 		.join("!");
 };
 
-const absolutify = makeCacheable(_absolutify);
+const absolutify = makeCacheableWithContext(_absolutify);
 exports.absolutify = absolutify;
 
 const PATH_QUERY_FRAGMENT_REGEXP =
 	/^((?:\0.|[^?#\0])*)(\?(?:\0.|[^#\0])*)?(#.*)?$/;
+const PATH_QUERY_REGEXP = /^((?:\0.|[^?\0])*)(\?.*)?$/;
 
 /** @typedef {{ resource: string, path: string, query: string, fragment: string }} ParsedResource */
+/** @typedef {{ resource: string, path: string, query: string }} ParsedResourceWithoutFragment */
 
 /**
  * @param {string} str the path with query and fragment
@@ -280,47 +324,24 @@ const _parseResource = str => {
 		fragment: match[3] || ""
 	};
 };
-exports.parseResource = (realFn => {
-	/** @type {WeakMap<object, Map<string, ParsedResource>>} */
-	const cache = new WeakMap();
+exports.parseResource = makeCacheable(_parseResource);
 
-	const getCache = associatedObjectForCache => {
-		const entry = cache.get(associatedObjectForCache);
-		if (entry !== undefined) return entry;
-		/** @type {Map<string, ParsedResource>} */
-		const map = new Map();
-		cache.set(associatedObjectForCache, map);
-		return map;
-	};
-
-	/**
-	 * @param {string} str the path with query and fragment
-	 * @param {Object=} associatedObjectForCache an object to which the cache will be attached
-	 * @returns {ParsedResource} parsed parts
-	 */
-	const fn = (str, associatedObjectForCache) => {
-		if (!associatedObjectForCache) return realFn(str);
-		const cache = getCache(associatedObjectForCache);
-		const entry = cache.get(str);
-		if (entry !== undefined) return entry;
-		const result = realFn(str);
-		cache.set(str, result);
-		return result;
-	};
-
-	fn.bindCache = associatedObjectForCache => {
-		const cache = getCache(associatedObjectForCache);
-		return str => {
-			const entry = cache.get(str);
-			if (entry !== undefined) return entry;
-			const result = realFn(str);
-			cache.set(str, result);
-			return result;
-		};
+/**
+ * Parse resource, skips fragment part
+ * @param {string} str the path with query and fragment
+ * @returns {ParsedResourceWithoutFragment} parsed parts
+ */
+const _parseResourceWithoutFragment = str => {
+	const match = PATH_QUERY_REGEXP.exec(str);
+	return {
+		resource: str,
+		path: match[1].replace(/\0(.)/g, "$1"),
+		query: match[2] ? match[2].replace(/\0(.)/g, "$1") : ""
 	};
-
-	return fn;
-})(_parseResource);
+};
+exports.parseResourceWithoutFragment = makeCacheable(
+	_parseResourceWithoutFragment
+);
 
 /**
  * @param {string} filename the filename which should be undone

package/lib/util/internalSerializables.js

@@ -67,6 +67,16 @@ module.exports = {
 		require("../dependencies/ContextElementDependency"),
 	"dependencies/CriticalDependencyWarning": () =>
 		require("../dependencies/CriticalDependencyWarning"),
+	"dependencies/CssImportDependency": () =>
+		require("../dependencies/CssImportDependency"),
+	"dependencies/CssLocalIdentifierDependency": () =>
+		require("../dependencies/CssLocalIdentifierDependency"),
+	"dependencies/CssSelfLocalIdentifierDependency": () =>
+		require("../dependencies/CssSelfLocalIdentifierDependency"),
+	"dependencies/CssExportDependency": () =>
+		require("../dependencies/CssExportDependency"),
+	"dependencies/CssUrlDependency": () =>
+		require("../dependencies/CssUrlDependency"),
 	"dependencies/DelegatedSourceDependency": () =>
 		require("../dependencies/DelegatedSourceDependency"),
 	"dependencies/DllEntryDependency": () =>
@@ -175,6 +185,7 @@ module.exports = {
 	ModuleParseError: () => require("../ModuleParseError"),
 	ModuleWarning: () => require("../ModuleWarning"),
 	NormalModule: () => require("../NormalModule"),
+	RawDataUrlModule: () => require("../asset/RawDataUrlModule"),
 	RawModule: () => require("../RawModule"),
 	"sharing/ConsumeSharedModule": () =>
 		require("../sharing/ConsumeSharedModule"),

package/lib/util/nonNumericOnlyHash.js

@@ -0,0 +1,22 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Ivan Kopeykin @vankop
+*/
+
+"use strict";
+
+const A_CODE = "a".charCodeAt(0);
+
+/**
+ * @param {string} hash hash
+ * @param {number} hashLength hash length
+ * @returns {string} returns hash that has at least one non numeric char
+ */
+module.exports = (hash, hashLength) => {
+	if (hashLength < 1) return "";
+	const slice = hash.slice(0, hashLength);
+	if (slice.match(/[^\d]/)) return slice;
+	return `${String.fromCharCode(
+		A_CODE + (parseInt(hash[0], 10) % 6)
+	)}${slice.slice(1)}`;
+};

package/lib/util/semver.js

@@ -89,7 +89,9 @@ exports.versionLt = versionLt;
  */
 exports.parseRange = str => {
 	const splitAndConvert = str => {
-		return str.split(".").map(item => (`${+item}` === item ? +item : item));
+		return str
+			.split(".")
+			.map(item => (item !== "NaN" && `${+item}` === item ? +item : item));
 	};
 	// see https://docs.npmjs.com/misc/semver#range-grammar for grammar
 	const parsePartial = str => {
@@ -131,13 +133,15 @@ exports.parseRange = str => {
 		return [-range[0] - 1, ...range.slice(1)];
 	};
 	const parseSimple = str => {
-		// simple     ::= primitive | partial | tilde | caret
-		// primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' ) partial
-		// tilde      ::= '~' partial
-		// caret      ::= '^' partial
+		// simple       ::= primitive | partial | tilde | caret
+		// primitive    ::= ( '<' | '>' | '>=' | '<=' | '=' | '!' ) ( ' ' ) * partial
+		// tilde        ::= '~' ( ' ' ) * partial
+		// caret        ::= '^' ( ' ' ) * partial
 		const match = /^(\^|~|<=|<|>=|>|=|v|!)/.exec(str);
 		const start = match ? match[0] : "";
-		const remainder = parsePartial(str.slice(start.length));
+		const remainder = parsePartial(
+			start.length ? str.slice(start.length).trim() : str.trim()
+		);
 		switch (start) {
 			case "^":
 				if (remainder.length > 1 && remainder[1] === 0) {
@@ -191,11 +195,14 @@ exports.parseRange = str => {
 		return [, ...arr, ...items.slice(1).map(() => fn)];
 	};
 	const parseRange = str => {
-		// range      ::= hyphen | simple ( ' ' simple ) * | ''
-		// hyphen     ::= partial ' - ' partial
-		const items = str.split(" - ");
+		// range      ::= hyphen | simple ( ' ' ( ' ' ) * simple ) * | ''
+		// hyphen     ::= partial ( ' ' ) * ' - ' ( ' ' ) * partial
+		const items = str.split(/\s+-\s+/);
 		if (items.length === 1) {
-			const items = str.trim().split(/\s+/g).map(parseSimple);
+			const items = str
+				.trim()
+				.split(/(?<=[-0-9A-Za-z])\s+/g)
+				.map(parseSimple);
 			return combine(items, 2);
 		}
 		const a = parsePartial(items[0]);

package/lib/wasm-async/AsyncWebAssemblyJavascriptGenerator.js

@@ -167,14 +167,20 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 						)}`,
 						`${RuntimeGlobals.asyncModule}(${
 							module.moduleArgument
-						}, ${runtimeTemplate.basicFunction(
-							"__webpack_handle_async_dependencies__",
+						}, async ${runtimeTemplate.basicFunction(
+							"__webpack_handle_async_dependencies__, __webpack_async_result__",
 							[
+								"try {",
 								importsCode,
 								`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${promises.join(
 									", "
 								)}]);`,
-								"return __webpack_async_dependencies__.then ? __webpack_async_dependencies__.then(__webpack_instantiate__) : __webpack_instantiate__(__webpack_async_dependencies__);"
+								`var [${promises.join(
+									", "
+								)}] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__;`,
+								`${importsCompatCode}await ${instantiateCall};`,
+								"__webpack_async_result__();",
+								"} catch(e) { __webpack_async_result__(e); }"
 							]
 						)}, 1);`
 				  ])

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -96,7 +96,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		)}]`;
 		const conditionMap = chunkGraph.getChunkConditionMap(chunk, chunkHasJs);
 		const hasJsMatcher = compileBooleanMatcher(conditionMap);
-		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph);
+		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph, chunkHasJs);
 
 		const stateExpression = withHmr
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_jsonp`
@@ -419,7 +419,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 									`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) && installedChunks[chunkId]) {`,
 									Template.indent("installedChunks[chunkId][0]();"),
 									"}",
-									"installedChunks[chunkIds[i]] = 0;"
+									"installedChunks[chunkId] = 0;"
 								]),
 								"}",
 								withOnChunkLoad

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -6,7 +6,6 @@
 "use strict";
 
 const RuntimeGlobals = require("../RuntimeGlobals");
-const CreateScriptUrlRuntimeModule = require("../runtime/CreateScriptUrlRuntimeModule");
 const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenciesPlugin");
 const ImportScriptsChunkLoadingRuntimeModule = require("./ImportScriptsChunkLoadingRuntimeModule");
 
@@ -43,7 +42,9 @@ class ImportScriptsChunkLoadingPlugin {
 					const withCreateScriptUrl = !!compilation.outputOptions.trustedTypes;
 					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
 					set.add(RuntimeGlobals.hasOwnProperty);
-					if (withCreateScriptUrl) set.add(RuntimeGlobals.createScriptUrl);
+					if (withCreateScriptUrl) {
+						set.add(RuntimeGlobals.createScriptUrl);
+					}
 					compilation.addRuntimeModule(
 						chunk,
 						new ImportScriptsChunkLoadingRuntimeModule(set, withCreateScriptUrl)
@@ -61,15 +62,6 @@ class ImportScriptsChunkLoadingPlugin {
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.baseURI)
 					.tap("ImportScriptsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.createScriptUrl)
-					.tap("RuntimePlugin", (chunk, set) => {
-						compilation.addRuntimeModule(
-							chunk,
-							new CreateScriptUrlRuntimeModule()
-						);
-						return true;
-					});
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.ensureChunkHandlers)

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -53,7 +53,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		const hasJsMatcher = compileBooleanMatcher(
 			chunkGraph.getChunkConditionMap(chunk, chunkHasJs)
 		);
-		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph);
+		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph, chunkHasJs);
 
 		const outputName = this.compilation.getPath(
 			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),