webpack 5.23.0 → 5.24.3

package/lib/optimize/RealContentHashPlugin.js

@@ -28,6 +28,27 @@ const addToList = (itemOrItems, list) => {
 	}
 };
 
+/**
+ * @template T
+ * @param {T[]} input list
+ * @param {function(T): Buffer} fn map function
+ * @returns {Buffer[]} buffers without duplicates
+ */
+const mapAndDeduplicateBuffers = (input, fn) => {
+	// Buffer.equals compares size first so this should be efficient enough
+	// If it becomes a performance problem we can use a map and group by size
+	// instead of looping over all assets.
+	const result = [];
+	outer: for (const value of input) {
+		const buf = fn(value);
+		for (const other of result) {
+			if (buf.equals(other)) continue outer;
+		}
+		result.push(buf);
+	}
+	return result;
+};
+
 /**
  * Escapes regular expression metacharacters
  * @param {string} str String to quote
@@ -331,7 +352,7 @@ ${referencingAssets
 									: computeNewContent(asset)
 							)
 						);
-						const assetsContent = assets.map(asset => {
+						const assetsContent = mapAndDeduplicateBuffers(assets, asset => {
 							if (asset.ownHashes.has(oldHash)) {
 								return asset.newSourceWithoutOwn
 									? asset.newSourceWithoutOwn.buffer()

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -264,8 +264,24 @@ class SideEffectsFlagPlugin {
 												moduleGraph,
 												({ module }) =>
 													module.getSideEffectsConnectionState(moduleGraph) ===
-													false
+													false,
+												({ module: newModule, export: exportName }) => {
+													moduleGraph.updateModule(dep, newModule);
+													moduleGraph.addExplanation(
+														dep,
+														"(skipped side-effect-free modules)"
+													);
+													const ids = dep.getIds(moduleGraph);
+													dep.setIds(
+														moduleGraph,
+														exportName
+															? [...exportName, ...ids.slice(1)]
+															: ids.slice(1)
+													);
+													return moduleGraph.getConnection(dep);
+												}
 											);
+											continue;
 										}
 										// TODO improve for nested imports
 										const ids = dep.getIds(moduleGraph);

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -460,7 +460,7 @@ const EXTRACT_ERROR = {
 /** @type {SimpleExtractors} */
 const SIMPLE_EXTRACTORS = {
 	compilation: {
-		_: (object, compilation, context) => {
+		_: (object, compilation, context, options) => {
 			if (!context.makePathsRelative) {
 				context.makePathsRelative = makePathsRelative.bindContextCache(
 					compilation.compiler.context,
@@ -495,6 +495,144 @@ const SIMPLE_EXTRACTORS = {
 			if (compilation.needAdditionalPass) {
 				object.needAdditionalPass = true;
 			}
+
+			const { logging, loggingDebug, loggingTrace } = options;
+			if (logging || (loggingDebug && loggingDebug.length > 0)) {
+				const util = require("util");
+				object.logging = {};
+				let acceptedTypes;
+				let collapsedGroups = false;
+				switch (logging) {
+					default:
+						acceptedTypes = new Set();
+						break;
+					case "error":
+						acceptedTypes = new Set([LogType.error]);
+						break;
+					case "warn":
+						acceptedTypes = new Set([LogType.error, LogType.warn]);
+						break;
+					case "info":
+						acceptedTypes = new Set([
+							LogType.error,
+							LogType.warn,
+							LogType.info
+						]);
+						break;
+					case "log":
+						acceptedTypes = new Set([
+							LogType.error,
+							LogType.warn,
+							LogType.info,
+							LogType.log,
+							LogType.group,
+							LogType.groupEnd,
+							LogType.groupCollapsed,
+							LogType.clear
+						]);
+						break;
+					case "verbose":
+						acceptedTypes = new Set([
+							LogType.error,
+							LogType.warn,
+							LogType.info,
+							LogType.log,
+							LogType.group,
+							LogType.groupEnd,
+							LogType.groupCollapsed,
+							LogType.profile,
+							LogType.profileEnd,
+							LogType.time,
+							LogType.status,
+							LogType.clear
+						]);
+						collapsedGroups = true;
+						break;
+				}
+				const cachedMakePathsRelative = makePathsRelative.bindContextCache(
+					options.context,
+					compilation.compiler.root
+				);
+				let depthInCollapsedGroup = 0;
+				for (const [origin, logEntries] of compilation.logging) {
+					const debugMode = loggingDebug.some(fn => fn(origin));
+					if (logging === false && !debugMode) continue;
+					/** @type {KnownStatsLoggingEntry[]} */
+					const groupStack = [];
+					/** @type {KnownStatsLoggingEntry[]} */
+					const rootList = [];
+					let currentList = rootList;
+					let processedLogEntries = 0;
+					for (const entry of logEntries) {
+						let type = entry.type;
+						if (!debugMode && !acceptedTypes.has(type)) continue;
+
+						// Expand groups in verbose and debug modes
+						if (
+							type === LogType.groupCollapsed &&
+							(debugMode || collapsedGroups)
+						)
+							type = LogType.group;
+
+						if (depthInCollapsedGroup === 0) {
+							processedLogEntries++;
+						}
+
+						if (type === LogType.groupEnd) {
+							groupStack.pop();
+							if (groupStack.length > 0) {
+								currentList = groupStack[groupStack.length - 1].children;
+							} else {
+								currentList = rootList;
+							}
+							if (depthInCollapsedGroup > 0) depthInCollapsedGroup--;
+							continue;
+						}
+						let message = undefined;
+						if (entry.type === LogType.time) {
+							message = `${entry.args[0]}: ${
+								entry.args[1] * 1000 + entry.args[2] / 1000000
+							} ms`;
+						} else if (entry.args && entry.args.length > 0) {
+							message = util.format(entry.args[0], ...entry.args.slice(1));
+						}
+						/** @type {KnownStatsLoggingEntry} */
+						const newEntry = {
+							...entry,
+							type,
+							message,
+							trace: loggingTrace ? entry.trace : undefined,
+							children:
+								type === LogType.group || type === LogType.groupCollapsed
+									? []
+									: undefined
+						};
+						currentList.push(newEntry);
+						if (newEntry.children) {
+							groupStack.push(newEntry);
+							currentList = newEntry.children;
+							if (depthInCollapsedGroup > 0) {
+								depthInCollapsedGroup++;
+							} else if (type === LogType.groupCollapsed) {
+								depthInCollapsedGroup = 1;
+							}
+						}
+					}
+					let name = cachedMakePathsRelative(origin).replace(/\|/g, " ");
+					if (name in object.logging) {
+						let i = 1;
+						while (`${name}#${i}` in object.logging) {
+							i++;
+						}
+						name = `${name}#${i}`;
+					}
+					object.logging[name] = {
+						entries: rootList,
+						filteredEntries: logEntries.length - processedLogEntries,
+						debug: debugMode
+					};
+				}
+			}
 		},
 		hash: (object, compilation) => {
 			object.hash = compilation.hash;
@@ -738,135 +876,6 @@ const SIMPLE_EXTRACTORS = {
 				}
 			}
 		},
-		logging: (object, compilation, _context, options, factory) => {
-			const util = require("util");
-			const { loggingDebug, loggingTrace, context } = options;
-			object.logging = {};
-			let acceptedTypes;
-			let collapsedGroups = false;
-			switch (options.logging) {
-				case "none":
-					acceptedTypes = new Set([]);
-					break;
-				case "error":
-					acceptedTypes = new Set([LogType.error]);
-					break;
-				case "warn":
-					acceptedTypes = new Set([LogType.error, LogType.warn]);
-					break;
-				case "info":
-					acceptedTypes = new Set([LogType.error, LogType.warn, LogType.info]);
-					break;
-				case "log":
-					acceptedTypes = new Set([
-						LogType.error,
-						LogType.warn,
-						LogType.info,
-						LogType.log,
-						LogType.group,
-						LogType.groupEnd,
-						LogType.groupCollapsed,
-						LogType.clear
-					]);
-					break;
-				case "verbose":
-					acceptedTypes = new Set([
-						LogType.error,
-						LogType.warn,
-						LogType.info,
-						LogType.log,
-						LogType.group,
-						LogType.groupEnd,
-						LogType.groupCollapsed,
-						LogType.profile,
-						LogType.profileEnd,
-						LogType.time,
-						LogType.status,
-						LogType.clear
-					]);
-					collapsedGroups = true;
-					break;
-			}
-			const cachedMakePathsRelative = makePathsRelative.bindContextCache(
-				context,
-				compilation.compiler.root
-			);
-			let depthInCollapsedGroup = 0;
-			for (const [origin, logEntries] of compilation.logging) {
-				const debugMode = loggingDebug.some(fn => fn(origin));
-				/** @type {KnownStatsLoggingEntry[]} */
-				const groupStack = [];
-				/** @type {KnownStatsLoggingEntry[]} */
-				const rootList = [];
-				let currentList = rootList;
-				let processedLogEntries = 0;
-				for (const entry of logEntries) {
-					let type = entry.type;
-					if (!debugMode && !acceptedTypes.has(type)) continue;
-
-					// Expand groups in verbose and debug modes
-					if (type === LogType.groupCollapsed && (debugMode || collapsedGroups))
-						type = LogType.group;
-
-					if (depthInCollapsedGroup === 0) {
-						processedLogEntries++;
-					}
-
-					if (type === LogType.groupEnd) {
-						groupStack.pop();
-						if (groupStack.length > 0) {
-							currentList = groupStack[groupStack.length - 1].children;
-						} else {
-							currentList = rootList;
-						}
-						if (depthInCollapsedGroup > 0) depthInCollapsedGroup--;
-						continue;
-					}
-					let message = undefined;
-					if (entry.type === LogType.time) {
-						message = `${entry.args[0]}: ${
-							entry.args[1] * 1000 + entry.args[2] / 1000000
-						} ms`;
-					} else if (entry.args && entry.args.length > 0) {
-						message = util.format(entry.args[0], ...entry.args.slice(1));
-					}
-					/** @type {KnownStatsLoggingEntry} */
-					const newEntry = {
-						...entry,
-						type,
-						message,
-						trace: loggingTrace ? entry.trace : undefined,
-						children:
-							type === LogType.group || type === LogType.groupCollapsed
-								? []
-								: undefined
-					};
-					currentList.push(newEntry);
-					if (newEntry.children) {
-						groupStack.push(newEntry);
-						currentList = newEntry.children;
-						if (depthInCollapsedGroup > 0) {
-							depthInCollapsedGroup++;
-						} else if (type === LogType.groupCollapsed) {
-							depthInCollapsedGroup = 1;
-						}
-					}
-				}
-				let name = cachedMakePathsRelative(origin).replace(/\|/g, " ");
-				if (name in object.logging) {
-					let i = 1;
-					while (`${name}#${i}` in object.logging) {
-						i++;
-					}
-					name = `${name}#${i}`;
-				}
-				object.logging[name] = {
-					entries: rootList,
-					filteredEntries: logEntries.length - processedLogEntries,
-					debug: debugMode
-				};
-			}
-		},
 		children: (object, compilation, context, options, factory) => {
 			const { type } = context;
 			object.children = factory.create(
@@ -1895,7 +1904,7 @@ const ASSETS_GROUPERS = {
 	}
 };
 
-/** @type {function(string): Record<string, (groupConfigs: GroupConfig[], context: StatsFactoryContext, options: NormalizedStatsOptions) => void>} */
+/** @type {function("module" | "chunk" | "root-of-chunk" | "nested"): Record<string, (groupConfigs: GroupConfig[], context: StatsFactoryContext, options: NormalizedStatsOptions) => void>} */
 const MODULES_GROUPERS = type => ({
 	_: (groupConfigs, context, options) => {
 		const groupByFlag = (name, type, exclude) => {

package/lib/util/SetHelpers.js

@@ -73,7 +73,22 @@ const first = set => {
 	return entry.done ? undefined : entry.value;
 };
 
+/**
+ * @template T
+ * @param {Set<T>} a first
+ * @param {Set<T>} b second
+ * @returns {Set<T>} combined set, may be identical to a or b
+ */
+const combine = (a, b) => {
+	if (b.size === 0) return a;
+	if (a.size === 0) return b;
+	const set = new Set(a);
+	for (const item of b) set.add(item);
+	return set;
+};
+
 exports.intersect = intersect;
 exports.isSubset = isSubset;
 exports.find = find;
 exports.first = first;
+exports.combine = combine;

package/lib/util/fs.js

@@ -64,6 +64,8 @@ const path = require("path");
  * @typedef {Object} Watcher
  * @property {function(): void} close closes the watcher and all underlying file watchers
  * @property {function(): void} pause closes the watcher, but keeps underlying file watchers alive until the next watch call
+ * @property {function(): Set<string>=} getAggregatedChanges get current aggregated changes that have not yet send to callback
+ * @property {function(): Set<string>=} getAggregatedRemovals get current aggregated removals that have not yet send to callback
  * @property {function(): Map<string, FileSystemInfoEntry | "ignore">} getFileTimeInfoEntries get info about files
  * @property {function(): Map<string, FileSystemInfoEntry | "ignore">} getContextTimeInfoEntries get info about directories
  */

package/lib/util/semver.js

@@ -215,11 +215,11 @@ exports.parseRange = str => {
 
 /* eslint-disable eqeqeq */
 const rangeToString = range => {
+	var fixCount = range[0];
+	var str = "";
 	if (range.length === 1) {
 		return "*";
-	} else if (0 in range) {
-		var str = "";
-		var fixCount = range[0];
+	} else if (fixCount + 0.5) {
 		str +=
 			fixCount == 0
 				? ">="
@@ -464,7 +464,7 @@ exports.versionLtRuntimeCode = runtimeTemplate =>
 exports.rangeToStringRuntimeCode = runtimeTemplate =>
 	`var rangeToString = ${runtimeTemplate.basicFunction("range", [
 		"// see webpack/lib/util/semver.js for original code",
-		'if(1===range.length)return"*";if(0 in range){var r="",n=range[0];r+=0==n?">=":-1==n?"<":1==n?"^":2==n?"~":n>0?"=":"!=";for(var e=1,a=1;a<range.length;a++){e--,r+="u"==(typeof(t=range[a]))[0]?"-":(e>0?".":"")+(e=2,t)}return r}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")}'
+		'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")}'
 	])}`;
 //#endregion
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.23.0",
+  "version": "5.24.3",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -14,7 +14,7 @@
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
     "enhanced-resolve": "^5.7.0",
-    "es-module-lexer": "^0.3.26",
+    "es-module-lexer": "^0.4.0",
     "eslint-scope": "^5.1.1",
     "events": "^3.2.0",
     "glob-to-regexp": "^0.4.1",
@@ -60,7 +60,7 @@
     "eslint-plugin-prettier": "^3.1.4",
     "file-loader": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^6.0.5",
-    "husky": "^5.0.9",
+    "husky": "^5.1.2",
     "is-ci": "^2.0.0",
     "istanbul": "^0.4.5",
     "jest": "^26.6.3",
@@ -154,6 +154,7 @@
     "special-lint": "node node_modules/tooling/lockfile-lint && node node_modules/tooling/schemas-lint && node node_modules/tooling/inherit-types && node node_modules/tooling/format-schemas && node tooling/generate-runtime-code.js && node node_modules/tooling/format-file-header && node node_modules/tooling/compile-to-definitions && node node_modules/tooling/generate-types --no-template-literals",
     "special-lint-fix": "node node_modules/tooling/inherit-types --write && node node_modules/tooling/format-schemas --write && node tooling/generate-runtime-code.js --write && node node_modules/tooling/format-file-header --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/generate-types --no-template-literals --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix && yarn pretty-lint-fix",
+    "prepare": "husky install",
     "pretty-lint-base": "prettier \"*.{ts,json,yml,yaml,md}\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.json\" \"examples/*.md\"",
     "pretty-lint-base-all": "yarn pretty-lint-base \"*.js\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.js\" \"test/*.js\" \"test/helpers/*.js\" \"test/{configCases,watchCases,statsCases,hotCases,benchmarkCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "pretty-lint-fix": "yarn pretty-lint-base-all --loglevel warn --write",
@@ -169,11 +170,6 @@
     "cover:types": "node node_modules/tooling/type-coverage",
     "cover:report": "istanbul report"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "lint-staged": {
     "*.js|{lib,setup,bin,hot,tooling,schemas}/**/*.js|test/*.js|{test,examples}/**/webpack.config.js}": [
       "eslint --cache"

package/schemas/WebpackOptions.json

@@ -13,6 +13,51 @@
         }
       ]
     },
+    "AssetFilterItemTypes": {
+      "description": "Filtering value, regexp or function.",
+      "cli": {
+        "helper": true
+      },
+      "anyOf": [
+        {
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        },
+        {
+          "type": "string",
+          "absolutePath": false
+        },
+        {
+          "instanceof": "Function",
+          "tsType": "((name: string, asset: import('../lib/stats/DefaultStatsFactoryPlugin').StatsAsset) => boolean)"
+        }
+      ]
+    },
+    "AssetFilterTypes": {
+      "description": "Filtering modules.",
+      "cli": {
+        "helper": true
+      },
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "description": "Rule to filter.",
+            "cli": {
+              "helper": true
+            },
+            "oneOf": [
+              {
+                "$ref": "#/definitions/AssetFilterItemTypes"
+              }
+            ]
+          }
+        },
+        {
+          "$ref": "#/definitions/AssetFilterItemTypes"
+        }
+      ]
+    },
     "AssetGeneratorDataUrl": {
       "description": "The options for data url generator.",
       "anyOf": [
@@ -1498,6 +1543,51 @@
       "description": "Enable production optimizations or development hints.",
       "enum": ["development", "production", "none"]
     },
+    "ModuleFilterItemTypes": {
+      "description": "Filtering value, regexp or function.",
+      "cli": {
+        "helper": true
+      },
+      "anyOf": [
+        {
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        },
+        {
+          "type": "string",
+          "absolutePath": false
+        },
+        {
+          "instanceof": "Function",
+          "tsType": "((name: string, module: import('../lib/stats/DefaultStatsFactoryPlugin').StatsModule, type: 'module' | 'chunk' | 'root-of-chunk' | 'nested') => boolean)"
+        }
+      ]
+    },
+    "ModuleFilterTypes": {
+      "description": "Filtering modules.",
+      "cli": {
+        "helper": true
+      },
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "description": "Rule to filter.",
+            "cli": {
+              "helper": true
+            },
+            "oneOf": [
+              {
+                "$ref": "#/definitions/ModuleFilterItemTypes"
+              }
+            ]
+          }
+        },
+        {
+          "$ref": "#/definitions/ModuleFilterItemTypes"
+        }
+      ]
+    },
     "ModuleOptions": {
       "description": "Options affecting the normal modules (`NormalModuleFactory`).",
       "type": "object",
@@ -3920,7 +4010,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/FilterTypes"
+              "$ref": "#/definitions/ModuleFilterTypes"
             }
           ]
         },
@@ -3928,7 +4018,7 @@
           "description": "Suppress assets that match the specified filters. Filters can be Strings, RegExps or Functions.",
           "oneOf": [
             {
-              "$ref": "#/definitions/FilterTypes"
+              "$ref": "#/definitions/AssetFilterTypes"
             }
           ]
         },
@@ -3939,7 +4029,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/FilterTypes"
+              "$ref": "#/definitions/ModuleFilterTypes"
             }
           ]
         },
@@ -4127,7 +4217,7 @@
           "description": "Suppress listing warnings that match the specified filters (they will still be counted). Filters can be Strings, RegExps or Functions.",
           "oneOf": [
             {
-              "$ref": "#/definitions/FilterTypes"
+              "$ref": "#/definitions/WarningFilterTypes"
             }
           ]
         }
@@ -4190,6 +4280,51 @@
       "type": "string",
       "minLength": 1
     },
+    "WarningFilterItemTypes": {
+      "description": "Filtering value, regexp or function.",
+      "cli": {
+        "helper": true
+      },
+      "anyOf": [
+        {
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        },
+        {
+          "type": "string",
+          "absolutePath": false
+        },
+        {
+          "instanceof": "Function",
+          "tsType": "((warning: import('../lib/stats/DefaultStatsFactoryPlugin').StatsError, value: string) => boolean)"
+        }
+      ]
+    },
+    "WarningFilterTypes": {
+      "description": "Filtering warnings.",
+      "cli": {
+        "helper": true
+      },
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "description": "Rule to filter.",
+            "cli": {
+              "helper": true
+            },
+            "oneOf": [
+              {
+                "$ref": "#/definitions/WarningFilterItemTypes"
+              }
+            ]
+          }
+        },
+        {
+          "$ref": "#/definitions/WarningFilterItemTypes"
+        }
+      ]
+    },
     "WasmLoading": {
       "description": "The method of loading WebAssembly Modules (methods included by default are 'fetch' (web/WebWorker), 'async-node' (node.js), but others might be added by plugins).",
       "anyOf": [