webpack 5.52.0 → 5.55.0

package/lib/util/WeakTupleMap.js

@@ -7,87 +7,20 @@
 
 const isWeakKey = thing => typeof thing === "object" && thing !== null;
 
-class WeakTupleNode {
-	constructor() {
-		this.f = 0;
-		/** @type {any} */
-		this.v = undefined;
-		/** @type {Map<object, WeakTupleNode> | undefined} */
-		this.m = undefined;
-		/** @type {WeakMap<object, WeakTupleNode> | undefined} */
-		this.w = undefined;
-	}
-
-	getValue() {
-		return this.v;
-	}
-
-	hasValue() {
-		return (this.f & 1) === 1;
-	}
-
-	setValue(v) {
-		this.f |= 1;
-		this.v = v;
-	}
-
-	deleteValue() {
-		this.f &= 6;
-		this.v = undefined;
-	}
-
-	peek(thing) {
-		if (isWeakKey(thing)) {
-			if ((this.f & 4) !== 4) return undefined;
-			return this.w.get(thing);
-		} else {
-			if ((this.f & 2) !== 2) return undefined;
-			return this.m.get(thing);
-		}
-	}
-
-	get(thing) {
-		if (isWeakKey(thing)) {
-			if ((this.f & 4) !== 4) {
-				const newMap = new WeakMap();
-				this.f |= 4;
-				const newNode = new WeakTupleNode();
-				(this.w = newMap).set(thing, newNode);
-				return newNode;
-			}
-			const entry = this.w.get(thing);
-			if (entry !== undefined) {
-				return entry;
-			}
-			const newNode = new WeakTupleNode();
-			this.w.set(thing, newNode);
-			return newNode;
-		} else {
-			if ((this.f & 2) !== 2) {
-				const newMap = new Map();
-				this.f |= 2;
-				const newNode = new WeakTupleNode();
-				(this.m = newMap).set(thing, newNode);
-				return newNode;
-			}
-			const entry = this.m.get(thing);
-			if (entry !== undefined) {
-				return entry;
-			}
-			const newNode = new WeakTupleNode();
-			this.m.set(thing, newNode);
-			return newNode;
-		}
-	}
-}
-
 /**
  * @template {any[]} T
  * @template V
  */
 class WeakTupleMap {
 	constructor() {
-		this._node = new WeakTupleNode();
+		/** @private */
+		this.f = 0;
+		/** @private @type {any} */
+		this.v = undefined;
+		/** @private @type {Map<object, WeakTupleMap<T, V>> | undefined} */
+		this.m = undefined;
+		/** @private @type {WeakMap<object, WeakTupleMap<T, V>> | undefined} */
+		this.w = undefined;
 	}
 
 	/**
@@ -95,11 +28,12 @@ class WeakTupleMap {
 	 * @returns {void}
 	 */
 	set(...args) {
-		let node = this._node;
+		/** @type {WeakTupleMap<T, V>} */
+		let node = this;
 		for (let i = 0; i < args.length - 1; i++) {
-			node = node.get(args[i]);
+			node = node._get(args[i]);
 		}
-		node.setValue(args[args.length - 1]);
+		node._setValue(args[args.length - 1]);
 	}
 
 	/**
@@ -107,12 +41,13 @@ class WeakTupleMap {
 	 * @returns {boolean} true, if the tuple is in the Set
 	 */
 	has(...args) {
-		let node = this._node;
+		/** @type {WeakTupleMap<T, V>} */
+		let node = this;
 		for (let i = 0; i < args.length; i++) {
-			node = node.peek(args[i]);
+			node = node._peek(args[i]);
 			if (node === undefined) return false;
 		}
-		return node.hasValue();
+		return node._hasValue();
 	}
 
 	/**
@@ -120,12 +55,13 @@ class WeakTupleMap {
 	 * @returns {V} the value
 	 */
 	get(...args) {
-		let node = this._node;
+		/** @type {WeakTupleMap<T, V>} */
+		let node = this;
 		for (let i = 0; i < args.length; i++) {
-			node = node.peek(args[i]);
+			node = node._peek(args[i]);
 			if (node === undefined) return undefined;
 		}
-		return node.getValue();
+		return node._getValue();
 	}
 
 	/**
@@ -133,14 +69,15 @@ class WeakTupleMap {
 	 * @returns {V} the value
 	 */
 	provide(...args) {
-		let node = this._node;
+		/** @type {WeakTupleMap<T, V>} */
+		let node = this;
 		for (let i = 0; i < args.length - 1; i++) {
-			node = node.get(args[i]);
+			node = node._get(args[i]);
 		}
-		if (node.hasValue()) return node.getValue();
+		if (node._hasValue()) return node._getValue();
 		const fn = args[args.length - 1];
 		const newValue = fn(...args.slice(0, -1));
-		node.setValue(newValue);
+		node._setValue(newValue);
 		return newValue;
 	}
 
@@ -149,19 +86,85 @@ class WeakTupleMap {
 	 * @returns {void}
 	 */
 	delete(...args) {
-		let node = this._node;
+		/** @type {WeakTupleMap<T, V>} */
+		let node = this;
 		for (let i = 0; i < args.length; i++) {
-			node = node.peek(args[i]);
+			node = node._peek(args[i]);
 			if (node === undefined) return;
 		}
-		node.deleteValue();
+		node._deleteValue();
 	}
 
 	/**
 	 * @returns {void}
 	 */
 	clear() {
-		this._node = new WeakTupleNode();
+		this.f = 0;
+		this.v = undefined;
+		this.w = undefined;
+		this.m = undefined;
+	}
+
+	_getValue() {
+		return this.v;
+	}
+
+	_hasValue() {
+		return (this.f & 1) === 1;
+	}
+
+	_setValue(v) {
+		this.f |= 1;
+		this.v = v;
+	}
+
+	_deleteValue() {
+		this.f &= 6;
+		this.v = undefined;
+	}
+
+	_peek(thing) {
+		if (isWeakKey(thing)) {
+			if ((this.f & 4) !== 4) return undefined;
+			return this.w.get(thing);
+		} else {
+			if ((this.f & 2) !== 2) return undefined;
+			return this.m.get(thing);
+		}
+	}
+
+	_get(thing) {
+		if (isWeakKey(thing)) {
+			if ((this.f & 4) !== 4) {
+				const newMap = new WeakMap();
+				this.f |= 4;
+				const newNode = new WeakTupleMap();
+				(this.w = newMap).set(thing, newNode);
+				return newNode;
+			}
+			const entry = this.w.get(thing);
+			if (entry !== undefined) {
+				return entry;
+			}
+			const newNode = new WeakTupleMap();
+			this.w.set(thing, newNode);
+			return newNode;
+		} else {
+			if ((this.f & 2) !== 2) {
+				const newMap = new Map();
+				this.f |= 2;
+				const newNode = new WeakTupleMap();
+				(this.m = newMap).set(thing, newNode);
+				return newNode;
+			}
+			const entry = this.m.get(thing);
+			if (entry !== undefined) {
+				return entry;
+			}
+			const newNode = new WeakTupleMap();
+			this.m.set(thing, newNode);
+			return newNode;
+		}
 	}
 }
 

package/lib/util/createHash.js

@@ -125,6 +125,8 @@ class DebugHash extends Hash {
 }
 
 let crypto = undefined;
+let createXXHash64 = undefined;
+let BatchedHash = undefined;
 
 /**
  * Creates a hash by name or function
@@ -139,6 +141,14 @@ module.exports = algorithm => {
 		// TODO add non-cryptographic algorithm here
 		case "debug":
 			return new DebugHash();
+		case "xxhash64":
+			if (createXXHash64 === undefined) {
+				createXXHash64 = require("./hash/xxhash64");
+				if (BatchedHash === undefined) {
+					BatchedHash = require("./hash/BatchedHash");
+				}
+			}
+			return new BatchedHash(createXXHash64());
 		default:
 			if (crypto === undefined) crypto = require("crypto");
 			return new BulkUpdateDecorator(

package/lib/util/hash/BatchedHash.js

@@ -0,0 +1,65 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const Hash = require("../Hash");
+
+const MAX_STRING_LENGTH = 21845;
+
+class BatchedHash extends Hash {
+	constructor(hash) {
+		super();
+		this.string = undefined;
+		this.encoding = undefined;
+		this.hash = hash;
+	}
+
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @param {string|Buffer} data data
+	 * @param {string=} inputEncoding data encoding
+	 * @returns {this} updated hash
+	 */
+	update(data, inputEncoding) {
+		if (this.string !== undefined) {
+			if (
+				typeof data === "string" &&
+				inputEncoding === this.encoding &&
+				this.string.length + data.length < MAX_STRING_LENGTH
+			) {
+				this.string += data;
+				return this;
+			}
+			this.hash.update(this.string, this.encoding);
+			this.string = undefined;
+		}
+		if (typeof data === "string") {
+			if (data.length < MAX_STRING_LENGTH) {
+				this.string = data;
+				this.encoding = inputEncoding;
+			} else {
+				this.hash.update(data, inputEncoding);
+			}
+		} else {
+			this.hash.update(data);
+		}
+		return this;
+	}
+
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @param {string=} encoding encoding of the return value
+	 * @returns {string|Buffer} digest
+	 */
+	digest(encoding) {
+		if (this.string !== undefined) {
+			this.hash.update(this.string, this.encoding);
+		}
+		return this.hash.digest(encoding);
+	}
+}
+
+module.exports = BatchedHash;

package/lib/util/hash/xxhash64.js

@@ -0,0 +1,154 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+//#region wasm code: xxhash64 (../../../assembly/hash/xxhash64.asm.ts) --initialMemory 1
+const xxhash64 = new WebAssembly.Module(
+	Buffer.from(
+		// 1180 bytes
+		"AGFzbQEAAAABCAJgAX8AYAAAAwQDAQAABQMBAAEGGgV+AUIAC34BQgALfgFCAAt+AUIAC34BQgALByIEBGluaXQAAAZ1cGRhdGUAAQVmaW5hbAACBm1lbW9yeQIACrwIAzAAQtbrgu7q/Yn14AAkAELP1tO+0ser2UIkAUIAJAJC+erQ0OfJoeThACQDQgAkBAvUAQIBfwR+IABFBEAPCyMEIACtfCQEIwAhAiMBIQMjAiEEIwMhBQNAIAIgASkDAELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiECIAMgASkDCELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEDIAQgASkDEELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEEIAUgASkDGELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEFIAAgAUEgaiIBSw0ACyACJAAgAyQBIAQkAiAFJAMLsgYCAX8EfiMEQgBSBH4jACICQgGJIwEiA0IHiXwjAiIEQgyJfCMDIgVCEol8IAJCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0gA0LP1tO+0ser2UJ+Qh+JQoeVr6+Ytt6bnn9+hUKHla+vmLbem55/fkKdo7Xqg7GNivoAfSAEQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IAVCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0FQsXP2bLx5brqJwsjBCAArXx8IQIDQCABQQhqIABNBEAgAiABKQMAQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQhuJQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IQIgAUEIaiEBDAELCyABQQRqIABNBEACfyACIAE1AgBCh5Wvr5i23puef36FQheJQs/W077Sx6vZQn5C+fPd8Zn2masWfCECIAFBBGoLIQELA0AgACABRwRAIAIgATEAAELFz9my8eW66id+hUILiUKHla+vmLbem55/fiECIAFBAWohAQwBCwtBACACIAJCIYiFQs/W077Sx6vZQn4iAiACQh2IhUL5893xmfaZqxZ+IgIgAkIgiIUiAjcDAEEAIAJCIIgiA0L//wODQiCGIANCgID8/w+DQhCIhCIDQv+BgIDwH4NCEIYgA0KA/oOAgOA/g0IIiIQiA0KPgLyA8IHAB4NCCIYgA0LwgcCHgJ6A+ACDQgSIhCIDQoaMmLDgwIGDBnxCBIhCgYKEiJCgwIABg0InfiADQrDgwIGDhoyYMIR8NwMAQQggAkL/////D4MiAkL//wODQiCGIAJCgID8/w+DQhCIhCICQv+BgIDwH4NCEIYgAkKA/oOAgOA/g0IIiIQiAkKPgLyA8IHAB4NCCIYgAkLwgcCHgJ6A+ACDQgSIhCICQoaMmLDgwIGDBnxCBIhCgYKEiJCgwIABg0InfiACQrDgwIGDhoyYMIR8NwMACw==",
+		"base64"
+	)
+);
+//#endregion
+
+class XxHash64 {
+	/**
+	 * @param {WebAssembly.Instance} instance wasm instance
+	 */
+	constructor(instance) {
+		const exports = /** @type {any} */ (instance.exports);
+		exports.init();
+		this.exports = exports;
+		this.mem = Buffer.from(exports.memory.buffer, 0, 65536);
+		this.buffered = 0;
+	}
+
+	reset() {
+		this.buffered = 0;
+		this.exports.init();
+	}
+
+	/**
+	 * @param {Buffer | string} data data
+	 * @param {BufferEncoding=} encoding encoding
+	 * @returns {this} itself
+	 */
+	update(data, encoding) {
+		if (typeof data === "string") {
+			if (data.length < 21845) {
+				this._updateWithShortString(data, encoding);
+				return this;
+			} else {
+				data = Buffer.from(data, encoding);
+			}
+		}
+		this._updateWithBuffer(data);
+		return this;
+	}
+
+	/**
+	 * @param {string} data data
+	 * @param {BufferEncoding=} encoding encoding
+	 * @returns {void}
+	 */
+	_updateWithShortString(data, encoding) {
+		const { exports, buffered, mem } = this;
+		let endPos;
+		if (data.length < 70) {
+			if (!encoding || encoding === "utf-8" || encoding === "utf8") {
+				endPos = buffered;
+				for (let i = 0; i < data.length; i++) {
+					const cc = data.charCodeAt(i);
+					if (cc < 0x80) mem[endPos++] = cc;
+					else if (cc < 0x800) {
+						mem[endPos] = (cc >> 6) | 0xc0;
+						mem[endPos + 1] = (cc & 0x3f) | 0x80;
+						endPos += 2;
+					} else {
+						// bail-out for weird chars
+						endPos += mem.write(data.slice(endPos), endPos, encoding);
+						break;
+					}
+				}
+			} else if (encoding === "latin1") {
+				endPos = buffered;
+				for (let i = 0; i < data.length; i++) {
+					const cc = data.charCodeAt(i);
+					mem[endPos++] = cc;
+				}
+			} else {
+				endPos = buffered + mem.write(data, buffered, encoding);
+			}
+		} else {
+			endPos = buffered + mem.write(data, buffered, encoding);
+		}
+		if (endPos < 32) {
+			this.buffered = endPos;
+		} else {
+			const l = (endPos >> 5) << 5;
+			exports.update(l);
+			const newBuffered = endPos - l;
+			this.buffered = newBuffered;
+			if (newBuffered > 0) mem.copyWithin(0, l, endPos);
+		}
+	}
+
+	/**
+	 * @param {Buffer} data data
+	 * @returns {void}
+	 */
+	_updateWithBuffer(data) {
+		const { exports, buffered, mem } = this;
+		const length = data.length;
+		if (buffered + length < 32) {
+			data.copy(mem, buffered, 0, length);
+			this.buffered += length;
+		} else {
+			const l = ((buffered + length) >> 5) << 5;
+			if (l > 65536) {
+				let i = 65536 - buffered;
+				data.copy(mem, buffered, 0, i);
+				exports.update(65536);
+				const stop = l - buffered - 65536;
+				while (i < stop) {
+					data.copy(mem, 0, i, i + 65536);
+					exports.update(65536);
+					i += 65536;
+				}
+				data.copy(mem, 0, i, l - buffered);
+				exports.update(l - buffered - i);
+			} else {
+				data.copy(mem, buffered, 0, l - buffered);
+				exports.update(l);
+			}
+			const newBuffered = length + buffered - l;
+			this.buffered = newBuffered;
+			if (newBuffered > 0) data.copy(mem, 0, length - newBuffered, length);
+		}
+	}
+
+	digest(type) {
+		const { exports, buffered, mem } = this;
+		exports.final(buffered);
+		instancesPool.push(this);
+		return mem.toString("latin1", 0, 16);
+	}
+}
+
+const instancesPool = [];
+
+const create = () => {
+	if (instancesPool.length > 0) {
+		const old = instancesPool.pop();
+		old.reset();
+		return old;
+	} else {
+		return new XxHash64(new WebAssembly.Instance(xxhash64));
+	}
+};
+
+module.exports = create;

package/lib/util/internalSerializables.js

@@ -189,6 +189,7 @@ module.exports = {
 	UnsupportedFeatureWarning: () => require("../UnsupportedFeatureWarning"),
 	"util/LazySet": () => require("../util/LazySet"),
 	UnhandledSchemeError: () => require("../UnhandledSchemeError"),
+	NodeStuffInWebError: () => require("../NodeStuffInWebError"),
 	WebpackError: () => require("../WebpackError"),
 
 	"util/registerExternalSerializer": () => {

package/lib/util/serialization.js

@@ -89,15 +89,15 @@ module.exports = {
 						);
 					};
 				}
-			}),
+			}, "md4"),
 			binaryMiddleware
 		]));
 	},
-	createFileSerializer: fs => {
+	createFileSerializer: (fs, hashFunction) => {
 		registerSerializers();
 		const Serializer = getSerializer();
 		const FileMiddleware = require("../serialization/FileMiddleware");
-		const fileMiddleware = new FileMiddleware(fs);
+		const fileMiddleware = new FileMiddleware(fs, hashFunction);
 		const binaryMiddleware = getBinaryMiddlewareInstance();
 		const SerializerMiddleware = getSerializerMiddleware();
 		const SingleItemMiddleware = getSingleItemMiddleware();
@@ -111,12 +111,16 @@ module.exports = {
 						);
 					};
 					context.writeSeparate = (value, options) => {
-						context.write(
-							SerializerMiddleware.createLazy(value, fileMiddleware, options)
+						const lazy = SerializerMiddleware.createLazy(
+							value,
+							fileMiddleware,
+							options
 						);
+						context.write(lazy);
+						return lazy;
 					};
 				}
-			}),
+			}, hashFunction),
 			binaryMiddleware,
 			fileMiddleware
 		]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.52.0",
+  "version": "5.55.0",
   "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,8 +14,8 @@
     "acorn-import-assertions": "^1.7.6",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.8.0",
-    "es-module-lexer": "^0.7.1",
+    "enhanced-resolve": "^5.8.3",
+    "es-module-lexer": "^0.9.0",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
     "glob-to-regexp": "^0.4.1",
@@ -39,8 +39,9 @@
     "@babel/core": "^7.11.1",
     "@babel/preset-react": "^7.10.4",
     "@types/es-module-lexer": "^0.4.1",
-    "@types/jest": "^26.0.24",
+    "@types/jest": "^27.0.1",
     "@types/node": "^15.0.1",
+    "assemblyscript": "^0.19.16",
     "babel-loader": "^8.1.0",
     "benchmark": "^2.1.4",
     "bundle-loader": "^0.5.6",
@@ -61,6 +62,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "file-loader": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^6.0.5",
+    "hash-wasm": "^4.9.0",
     "husky": "^6.0.0",
     "is-ci": "^3.0.0",
     "istanbul": "^0.4.5",
@@ -96,7 +98,7 @@
     "style-loader": "^2.0.0",
     "terser": "^5.7.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.19.0",
+    "tooling": "webpack/tooling#v1.20.0",
     "ts-loader": "^8.0.2",
     "typescript": "^4.2.0-beta",
     "url-loader": "^4.1.0",
@@ -156,8 +158,8 @@
     "type-lint": "tsc",
     "typings-lint": "tsc -p tsconfig.test.json",
     "spellcheck": "cspell \"{.github,benchmark,bin,examples,hot,lib,schemas,setup,tooling}/**/*.{md,yml,yaml,js,json}\" \"*.md\"",
-    "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/precompile-schemas && 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/precompile-schemas --write && node node_modules/tooling/generate-types --no-template-literals --write",
+    "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 tooling/generate-wasm-code.js && node node_modules/tooling/format-file-header && node node_modules/tooling/compile-to-definitions && node node_modules/tooling/precompile-schemas && 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 tooling/generate-wasm-code.js --write && node node_modules/tooling/format-file-header --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/precompile-schemas --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\"",
@@ -209,6 +211,8 @@
       "<rootDir>/test/fixtures/temp-cache-fixture",
       "<rootDir>/test/fixtures/temp-",
       "<rootDir>/benchmark",
+      "<rootDir>/assembly",
+      "<rootDir>/tooling",
       "<rootDir>/examples/*/dist",
       "<rootDir>/coverage",
       "<rootDir>/.eslintcache"