webpack 5.51.0 → 5.52.1

package/lib/optimize/ConcatenatedModule.js

@@ -23,7 +23,7 @@ const { equals } = require("../util/ArrayHelpers");
 const LazySet = require("../util/LazySet");
 const { concatComparators, keepOriginalOrder } = require("../util/comparators");
 const createHash = require("../util/createHash");
-const contextify = require("../util/identifier").contextify;
+const { makePathsRelative } = require("../util/identifier");
 const makeSerializable = require("../util/makeSerializable");
 const propertyAccess = require("../util/propertyAccess");
 const {
@@ -1011,13 +1011,13 @@ class ConcatenatedModule extends Module {
 	}
 
 	static _createIdentifier(rootModule, modules, associatedObjectForCache) {
-		const cachedContextify = contextify.bindContextCache(
+		const cachedMakePathsRelative = makePathsRelative.bindContextCache(
 			rootModule.context,
 			associatedObjectForCache
 		);
 		let identifiers = [];
 		for (const module of modules) {
-			identifiers.push(cachedContextify(module.identifier()));
+			identifiers.push(cachedMakePathsRelative(module.identifier()));
 		}
 		identifiers.sort();
 		const hash = createHash("md4");

package/lib/optimize/MangleExportsPlugin.js

@@ -39,13 +39,28 @@ const comparator = compareSelect(e => e.name, compareStringsNumeric);
 /**
  * @param {boolean} deterministic use deterministic names
  * @param {ExportsInfo} exportsInfo exports info
+ * @param {boolean} isNamespace is namespace object
  * @returns {void}
  */
-const mangleExportsInfo = (deterministic, exportsInfo) => {
+const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 	if (!canMangle(exportsInfo)) return;
 	const usedNames = new Set();
 	/** @type {ExportInfo[]} */
 	const mangleableExports = [];
+
+	// Avoid to renamed exports that are not provided when
+	// 1. it's not a namespace export: non-provided exports can be found in prototype chain
+	// 2. there are other provided exports and deterministic mode is chosen:
+	//    non-provided exports would break the determinism
+	let avoidMangleNonProvided = !isNamespace;
+	if (!avoidMangleNonProvided && deterministic) {
+		for (const exportInfo of exportsInfo.ownedExports) {
+			if (exportInfo.provided !== false) {
+				avoidMangleNonProvided = true;
+				break;
+			}
+		}
+	}
 	for (const exportInfo of exportsInfo.ownedExports) {
 		const name = exportInfo.name;
 		if (!exportInfo.hasUsedName()) {
@@ -59,7 +74,7 @@ const mangleExportsInfo = (deterministic, exportsInfo) => {
 					name.length === 2 &&
 					/^[a-zA-Z_$][a-zA-Z0-9_$]|^[1-9][0-9]/.test(name)) ||
 				// Don't rename exports that are not provided
-				exportInfo.provided !== true
+				(avoidMangleNonProvided && exportInfo.provided !== true)
 			) {
 				exportInfo.setUsedName(name);
 				usedNames.add(name);
@@ -73,7 +88,7 @@ const mangleExportsInfo = (deterministic, exportsInfo) => {
 				used === UsageState.OnlyPropertiesUsed ||
 				used === UsageState.Unused
 			) {
-				mangleExportsInfo(deterministic, exportInfo.exportsInfo);
+				mangleExportsInfo(deterministic, exportInfo.exportsInfo, false);
 			}
 		}
 	}
@@ -143,8 +158,10 @@ class MangleExportsPlugin {
 				"MangleExportsPlugin",
 				modules => {
 					for (const module of modules) {
+						const isNamespace =
+							module.buildMeta && module.buildMeta.exportsType === "namespace";
 						const exportsInfo = moduleGraph.getExportsInfo(module);
-						mangleExportsInfo(deterministic, exportsInfo);
+						mangleExportsInfo(deterministic, exportsInfo, isNamespace);
 					}
 				}
 			);

package/lib/optimize/SplitChunksPlugin.js

@@ -1073,7 +1073,7 @@ module.exports = class SplitChunksPlugin {
 												"SplitChunksPlugin\n" +
 													`Cache group "${cacheGroup.key}" conflicts with existing chunk.\n` +
 													`Both have the same name "${name}" and existing chunk is not a parent of the selected modules.\n` +
-													"Use a different name for the cache group or make sure that the existing chunk is a parent (e. g. via dependsOn).\n" +
+													"Use a different name for the cache group or make sure that the existing chunk is a parent (e. g. via dependOn).\n" +
 													'HINT: You can omit "name" to automatically create a name.\n' +
 													"BREAKING CHANGE: webpack < 5 used to allow to use an entrypoint as splitChunk. " +
 													"This is no longer allowed when the entrypoint is not a parent of the selected modules.\n" +

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -30,6 +30,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 		this.global = global;
 		this.getFilenameForChunk = getFilenameForChunk;
 		this.allChunks = allChunks;
+		this.dependentHash = true;
 	}
 
 	/**

package/lib/runtime/RelativeUrlRuntimeModule.js

@@ -30,7 +30,7 @@ class RelativeUrlRuntimeModule extends HelperRuntimeModule {
 				`values.toString = values.toJSON = ${runtimeTemplate.returningFunction(
 					"url"
 				)};`,
-				"for (var key in values) Object.defineProperty(this, key, Object.assign({ enumerable: true, configurable: true, value: values[key] }));"
+				"for (var key in values) Object.defineProperty(this, key, { enumerable: true, configurable: true, value: values[key] });"
 			]),
 			"};",
 			`${RuntimeGlobals.relativeUrl}.prototype = URL.prototype;`

package/lib/serialization/ObjectMiddleware.js

@@ -510,11 +510,11 @@ class ObjectMiddleware extends SerializerMiddleware {
 				} else if (SerializerMiddleware.isLazy(item, this)) {
 					throw new Error("Not implemented");
 				} else {
-					result.push(
-						SerializerMiddleware.serializeLazy(item, data =>
-							this.serialize([data], context)
-						)
+					const data = SerializerMiddleware.serializeLazy(item, data =>
+						this.serialize([data], context)
 					);
+					SerializerMiddleware.setLazySerializedValue(item, data);
+					result.push(data);
 				}
 			} else if (item === undefined) {
 				result.push(ESCAPE, ESCAPE_UNDEFINED);

package/lib/util/identifier.js

@@ -15,6 +15,13 @@ const WINDOWS_PATH_SEPARATOR_REGEXP = /\\/g;
  * @property {Map<string, Map<string, string>>=} relativePaths
  */
 
+const relativePathToRequest = relativePath => {
+	if (relativePath === "") return "./.";
+	if (relativePath === "..") return "../.";
+	if (relativePath.startsWith("../")) return relativePath;
+	return `./${relativePath}`;
+};
+
 /**
  * @param {string} context context for relative path
  * @param {string} maybeAbsolutePath path to make relative
@@ -36,10 +43,7 @@ const absoluteToRequest = (context, maybeAbsolutePath) => {
 			querySplitPos === -1
 				? maybeAbsolutePath
 				: maybeAbsolutePath.slice(0, querySplitPos);
-		resource = path.posix.relative(context, resource);
-		if (!resource.startsWith("../")) {
-			resource = "./" + resource;
-		}
+		resource = relativePathToRequest(path.posix.relative(context, resource));
 		return querySplitPos === -1
 			? resource
 			: resource + maybeAbsolutePath.slice(querySplitPos);
@@ -53,10 +57,9 @@ const absoluteToRequest = (context, maybeAbsolutePath) => {
 				: maybeAbsolutePath.slice(0, querySplitPos);
 		resource = path.win32.relative(context, resource);
 		if (!WINDOWS_ABS_PATH_REGEXP.test(resource)) {
-			resource = resource.replace(WINDOWS_PATH_SEPARATOR_REGEXP, "/");
-			if (!resource.startsWith("../")) {
-				resource = "./" + resource;
-			}
+			resource = relativePathToRequest(
+				resource.replace(WINDOWS_PATH_SEPARATOR_REGEXP, "/")
+			);
 		}
 		return querySplitPos === -1
 			? resource
@@ -214,6 +217,21 @@ const _makePathsRelative = (context, identifier) => {
 
 exports.makePathsRelative = makeCacheable(_makePathsRelative);
 
+/**
+ *
+ * @param {string} context context for relative path
+ * @param {string} identifier identifier for path
+ * @returns {string} a converted relative path
+ */
+const _makePathsAbsolute = (context, identifier) => {
+	return identifier
+		.split(SEGMENTS_SPLIT_REGEXP)
+		.map(str => requestToAbsolute(context, str))
+		.join("");
+};
+
+exports.makePathsAbsolute = makeCacheable(_makePathsAbsolute);
+
 /**
  * @param {string} context absolute context path
  * @param {string} request any request string may containing absolute paths, query string, etc.

package/lib/util/internalSerializables.js

@@ -164,6 +164,7 @@ module.exports = {
 	DllModule: () => require("../DllModule"),
 	ExternalModule: () => require("../ExternalModule"),
 	FileSystemInfo: () => require("../FileSystemInfo"),
+	InitFragment: () => require("../InitFragment"),
 	InvalidDependenciesModuleWarning: () =>
 		require("../InvalidDependenciesModuleWarning"),
 	Module: () => require("../Module"),

package/lib/util/propertyAccess.js

@@ -6,6 +6,59 @@
 "use strict";
 
 const SAFE_IDENTIFIER = /^[_a-zA-Z$][_a-zA-Z$0-9]*$/;
+const RESERVED_IDENTIFER = new Set([
+	"break",
+	"case",
+	"catch",
+	"class",
+	"const",
+	"continue",
+	"debugger",
+	"default",
+	"delete",
+	"do",
+	"else",
+	"export",
+	"extends",
+	"finally",
+	"for",
+	"function",
+	"if",
+	"import",
+	"in",
+	"instanceof",
+	"new",
+	"return",
+	"super",
+	"switch",
+	"this",
+	"throw",
+	"try",
+	"typeof",
+	"var",
+	"void",
+	"while",
+	"with",
+	"enum",
+	// strict mode
+	"implements",
+	"interface",
+	"let",
+	"package",
+	"private",
+	"protected",
+	"public",
+	"static",
+	"yield",
+	"yield",
+	// module code
+	"await",
+	// skip future reserved keywords defined under ES1 till ES3
+	// additional
+	"null",
+	"true",
+	"false"
+]);
 
 const propertyAccess = (properties, start = 0) => {
 	let str = "";
@@ -13,7 +66,7 @@ const propertyAccess = (properties, start = 0) => {
 		const p = properties[i];
 		if (`${+p}` === p) {
 			str += `[${p}]`;
-		} else if (SAFE_IDENTIFIER.test(p)) {
+		} else if (SAFE_IDENTIFIER.test(p) && !RESERVED_IDENTIFER.has(p)) {
 			str += `.${p}`;
 		} else {
 			str += `[${JSON.stringify(p)}]`;

package/lib/util/serialization.js

@@ -111,9 +111,13 @@ 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;
 					};
 				}
 			}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.51.0",
+  "version": "5.52.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",
@@ -58,7 +58,7 @@
     "eslint-plugin-jest": "^24.3.6",
     "eslint-plugin-jsdoc": "^33.0.0",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-prettier": "^4.0.0",
     "file-loader": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^6.0.5",
     "husky": "^6.0.0",
@@ -66,6 +66,7 @@
     "istanbul": "^0.4.5",
     "jest": "^27.0.6",
     "jest-circus": "^27.0.6",
+    "jest-cli": "^27.0.6",
     "jest-diff": "^27.0.2",
     "jest-junit": "^12.0.0",
     "json-loader": "^0.5.7",