webpack 5.41.0 → 5.41.1

package/lib/TemplatedPathPlugin.js

@@ -116,32 +116,30 @@ const replacePathVariables = (path, data, assetInfo) => {
 	// [path] - /some/path/
 	// [name] - file
 	// [ext] - .js
-	if (data.filename) {
-		if (typeof data.filename === "string") {
-			const { path: file, query, fragment } = parseResource(data.filename);
-
-			const ext = extname(file);
-			const base = basename(file);
-			const name = base.slice(0, base.length - ext.length);
-			const path = file.slice(0, file.length - base.length);
-
-			replacements.set("file", replacer(file));
-			replacements.set("query", replacer(query, true));
-			replacements.set("fragment", replacer(fragment, true));
-			replacements.set("path", replacer(path, true));
-			replacements.set("base", replacer(base));
-			replacements.set("name", replacer(name));
-			replacements.set("ext", replacer(ext, true));
-			// Legacy
-			replacements.set(
-				"filebase",
-				deprecated(
-					replacer(base),
-					"[filebase] is now [base]",
-					"DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_FILENAME"
-				)
-			);
-		}
+	if (typeof data.filename === "string") {
+		const { path: file, query, fragment } = parseResource(data.filename);
+
+		const ext = extname(file);
+		const base = basename(file);
+		const name = base.slice(0, base.length - ext.length);
+		const path = file.slice(0, file.length - base.length);
+
+		replacements.set("file", replacer(file));
+		replacements.set("query", replacer(query, true));
+		replacements.set("fragment", replacer(fragment, true));
+		replacements.set("path", replacer(path, true));
+		replacements.set("base", replacer(base));
+		replacements.set("name", replacer(name));
+		replacements.set("ext", replacer(ext, true));
+		// Legacy
+		replacements.set(
+			"filebase",
+			deprecated(
+				replacer(base),
+				"[filebase] is now [base]",
+				"DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_FILENAME"
+			)
+		);
 	}
 
 	// Compilation context

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -57,19 +57,23 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 								"completeQueue(queue);",
 								"queue = 0;"
 							])});`,
-							`var obj = { [webpackThen]: ${runtimeTemplate.expressionFunction(
+							`var obj = {};
+							obj[webpackThen] = ${runtimeTemplate.expressionFunction(
 								"queueFunction(queue, fn), dep.catch(reject)",
 								"fn, reject"
-							)} };`,
+							)};`,
 							"return obj;"
 						]),
 						"}"
 					]),
 					"}",
-					`return { [webpackThen]: ${runtimeTemplate.expressionFunction(
+					`var ret = {};
+					ret[webpackThen] = ${runtimeTemplate.expressionFunction(
 						"completeFunction(fn)",
 						"fn"
-					)}, [webpackExports]: dep };`
+					)};
+					ret[webpackExports] = dep;
+					return ret;`
 				])})`,
 				"deps"
 			)};`,

package/lib/serialization/BinaryMiddleware.js

@@ -165,12 +165,23 @@ class BinaryMiddleware extends SerializerMiddleware {
 		};
 		const flush = () => {
 			if (currentBuffer !== null) {
-				buffers.push(currentBuffer.slice(0, currentPosition));
+				buffers.push(
+					Buffer.from(
+						currentBuffer.buffer,
+						currentBuffer.byteOffset,
+						currentPosition
+					)
+				);
 				if (
 					!leftOverBuffer ||
 					leftOverBuffer.length < currentBuffer.length - currentPosition
-				)
-					leftOverBuffer = currentBuffer.slice(currentPosition);
+				) {
+					leftOverBuffer = Buffer.from(
+						currentBuffer.buffer,
+						currentBuffer.byteOffset + currentPosition,
+						currentBuffer.byteLength - currentPosition
+					);
+				}
 				currentBuffer = null;
 				buffersTotalLength += currentPosition;
 				currentPosition = 0;
@@ -554,10 +565,8 @@ class BinaryMiddleware extends SerializerMiddleware {
 			if (rem < n) {
 				return Buffer.concat([read(rem), read(n - rem)]);
 			}
-			const res = /** @type {Buffer} */ (currentBuffer).slice(
-				currentPosition,
-				currentPosition + n
-			);
+			const b = /** @type {Buffer} */ (currentBuffer);
+			const res = Buffer.from(b.buffer, b.byteOffset + currentPosition, n);
 			currentPosition += n;
 			checkOverflow();
 			return res;
@@ -579,10 +588,8 @@ class BinaryMiddleware extends SerializerMiddleware {
 			if (rem < n) {
 				n = rem;
 			}
-			const res = /** @type {Buffer} */ (currentBuffer).slice(
-				currentPosition,
-				currentPosition + n
-			);
+			const b = /** @type {Buffer} */ (currentBuffer);
+			const res = Buffer.from(b.buffer, b.byteOffset + currentPosition, n);
 			currentPosition += n;
 			checkOverflow();
 			return res;
@@ -735,7 +742,7 @@ class BinaryMiddleware extends SerializerMiddleware {
 				case STRING_HEADER:
 					return () => {
 						const len = readU32();
-						if (isInCurrentBuffer(len)) {
+						if (isInCurrentBuffer(len) && currentPosition + len < 0x7fffffff) {
 							result.push(
 								currentBuffer.toString(
 									undefined,
@@ -753,7 +760,7 @@ class BinaryMiddleware extends SerializerMiddleware {
 					return () => result.push("");
 				case SHORT_STRING_HEADER | 1:
 					return () => {
-						if (currentIsBuffer) {
+						if (currentIsBuffer && currentPosition < 0x7ffffffe) {
 							result.push(
 								currentBuffer.toString(
 									"latin1",
@@ -785,7 +792,10 @@ class BinaryMiddleware extends SerializerMiddleware {
 					} else if ((header & SHORT_STRING_HEADER) === SHORT_STRING_HEADER) {
 						const len = header & SHORT_STRING_LENGTH_MASK;
 						return () => {
-							if (isInCurrentBuffer(len)) {
+							if (
+								isInCurrentBuffer(len) &&
+								currentPosition + len < 0x7fffffff
+							) {
 								result.push(
 									currentBuffer.toString(
 										"latin1",

package/lib/serialization/FileMiddleware.js

@@ -280,8 +280,16 @@ const deserialize = async (middleware, name, readFile) => {
 	}
 	const sectionCount = readUInt32LE();
 	const lengths = [];
+	let lastLengthPositive = false;
 	for (let i = 0; i < sectionCount; i++) {
-		lengths.push(readInt32LE());
+		const value = readInt32LE();
+		const valuePositive = value >= 0;
+		if (lastLengthPositive && valuePositive) {
+			lengths[lengths.length - 1] += value;
+		} else {
+			lengths.push(value);
+			lastLengthPositive = valuePositive;
+		}
 	}
 	const result = [];
 	for (let length of lengths) {
@@ -307,13 +315,24 @@ const deserialize = async (middleware, name, readFile) => {
 			} else if (contentPosition !== 0) {
 				if (length <= contentItemLength - contentPosition) {
 					result.push(
-						contentItem.slice(contentPosition, contentPosition + length)
+						Buffer.from(
+							contentItem.buffer,
+							contentItem.byteOffset + contentPosition,
+							length
+						)
 					);
 					contentPosition += length;
 					length = 0;
 				} else {
-					result.push(contentItem.slice(contentPosition));
-					length -= contentItemLength - contentPosition;
+					const l = contentItemLength - contentPosition;
+					result.push(
+						Buffer.from(
+							contentItem.buffer,
+							contentItem.byteOffset + contentPosition,
+							l
+						)
+					);
+					length -= l;
 					contentPosition = contentItemLength;
 				}
 			} else {
@@ -322,7 +341,9 @@ const deserialize = async (middleware, name, readFile) => {
 					length -= contentItemLength;
 					contentPosition = contentItemLength;
 				} else {
-					result.push(contentItem.slice(0, length));
+					result.push(
+						Buffer.from(contentItem.buffer, contentItem.byteOffset, length)
+					);
 					contentPosition += length;
 					length = 0;
 				}
@@ -334,7 +355,9 @@ const deserialize = async (middleware, name, readFile) => {
 					length -= contentItemLength;
 					contentPosition = contentItemLength;
 				} else {
-					result.push(contentItem.slice(0, length));
+					result.push(
+						Buffer.from(contentItem.buffer, contentItem.byteOffset, length)
+					);
 					contentPosition += length;
 					length = 0;
 				}
@@ -462,6 +485,7 @@ class FileMiddleware extends SerializerMiddleware {
 							let readBuffer = currentBuffer;
 							let readOffset = currentBufferUsed;
 							let readLength = currentBuffer.length - currentBufferUsed;
+							// values passed to fs.read must be valid int32 values
 							if (readOffset > 0x7fffffff) {
 								readBuffer = currentBuffer.slice(readOffset);
 								readOffset = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.41.0",
+  "version": "5.41.1",
   "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",