webpack 5.50.0 → 5.52.0

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/util/fs.js

@@ -59,6 +59,7 @@ const path = require("path");
 /** @typedef {function((NodeJS.ErrnoException | null)=, number=): void} NumberCallback */
 /** @typedef {function((NodeJS.ErrnoException | null)=, IStats=): void} StatsCallback */
 /** @typedef {function((NodeJS.ErrnoException | Error | null)=, any=): void} ReadJsonCallback */
+/** @typedef {function((NodeJS.ErrnoException | Error | null)=, IStats|string=): void} LstatReadlinkAbsoluteCallback */
 
 /**
  * @typedef {Object} Watcher
@@ -103,6 +104,7 @@ const path = require("path");
  * @property {function(string, BufferOrStringCallback): void} readlink
  * @property {function(string, DirentArrayCallback): void} readdir
  * @property {function(string, StatsCallback): void} stat
+ * @property {function(string, StatsCallback): void=} lstat
  * @property {(function(string, BufferOrStringCallback): void)=} realpath
  * @property {(function(string=): void)=} purge
  * @property {(function(string, string): string)=} join
@@ -282,3 +284,41 @@ const readJson = (fs, p, callback) => {
 	});
 };
 exports.readJson = readJson;
+
+/**
+ * @param {InputFileSystem} fs a file system
+ * @param {string} p an absolute path
+ * @param {ReadJsonCallback} callback callback
+ * @returns {void}
+ */
+const lstatReadlinkAbsolute = (fs, p, callback) => {
+	let i = 3;
+	const doReadLink = () => {
+		fs.readlink(p, (err, target) => {
+			if (err && --i > 0) {
+				// It might was just changed from symlink to file
+				// we retry 2 times to catch this case before throwing the error
+				return doStat();
+			}
+			if (err || !target) return doStat();
+			const value = target.toString();
+			callback(null, join(fs, dirname(fs, p), value));
+		});
+	};
+	const doStat = () => {
+		if ("lstat" in fs) {
+			return fs.lstat(p, (err, stats) => {
+				if (err) return callback(err);
+				if (stats.isSymbolicLink()) {
+					return doReadLink();
+				}
+				callback(null, stats);
+			});
+		} else {
+			return fs.stat(p, callback);
+		}
+	};
+	if ("lstat" in fs) return doStat();
+	doReadLink();
+};
+exports.lstatReadlinkAbsolute = lstatReadlinkAbsolute;

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/wasm-async/{AsyncWasmChunkLoadingRuntimeModule.js → AsyncWasmLoadingRuntimeModule.js}

@@ -9,9 +9,9 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
-class AsyncWasmChunkLoadingRuntimeModule extends RuntimeModule {
+class AsyncWasmLoadingRuntimeModule extends RuntimeModule {
 	constructor({ generateLoadBinaryCode, supportsStreaming }) {
-		super("wasm chunk loading", RuntimeModule.STAGE_ATTACH);
+		super("wasm loading", RuntimeModule.STAGE_NORMAL);
 		this.generateLoadBinaryCode = generateLoadBinaryCode;
 		this.supportsStreaming = supportsStreaming;
 	}
@@ -75,4 +75,4 @@ class AsyncWasmChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 }
 
-module.exports = AsyncWasmChunkLoadingRuntimeModule;
+module.exports = AsyncWasmLoadingRuntimeModule;

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -189,11 +189,17 @@ const generateImportObject = (
 };
 
 class WasmChunkLoadingRuntimeModule extends RuntimeModule {
-	constructor({ generateLoadBinaryCode, supportsStreaming, mangleImports }) {
+	constructor({
+		generateLoadBinaryCode,
+		supportsStreaming,
+		mangleImports,
+		runtimeRequirements
+	}) {
 		super("wasm chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.generateLoadBinaryCode = generateLoadBinaryCode;
 		this.supportsStreaming = supportsStreaming;
 		this.mangleImports = mangleImports;
+		this._runtimeRequirements = runtimeRequirements;
 	}
 
 	/**
@@ -203,6 +209,9 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 		const { chunkGraph, compilation, chunk, mangleImports } = this;
 		const { moduleGraph, outputOptions } = compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
+		const withHmr = this._runtimeRequirements.has(
+			RuntimeGlobals.hmrDownloadUpdateHandlers
+		);
 		const wasmModules = getAllWasmModules(moduleGraph, chunkGraph, chunk);
 		const declarations = [];
 		const importObjects = wasmModules.map(module => {
@@ -247,9 +256,16 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 				runtime: chunk.runtime
 			}
 		);
+
+		const stateExpression = withHmr
+			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_wasm`
+			: undefined;
+
 		return Template.asString([
 			"// object to store loaded and loading wasm modules",
-			"var installedWasmModules = {};",
+			`var installedWasmModules = ${
+				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
+			}{};`,
 			"",
 			// This function is used to delay reading the installed wasm module promises
 			// by a microtask. Sorting them doesn't help because there are edge cases where

package/lib/web/FetchCompileAsyncWasmPlugin.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const RuntimeGlobals = require("../RuntimeGlobals");
-const AsyncWasmChunkLoadingRuntimeModule = require("../wasm-async/AsyncWasmChunkLoadingRuntimeModule");
+const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRuntimeModule");
 
 /** @typedef {import("../Compiler")} Compiler */
 
@@ -48,7 +48,7 @@ class FetchCompileAsyncWasmPlugin {
 						set.add(RuntimeGlobals.publicPath);
 						compilation.addRuntimeModule(
 							chunk,
-							new AsyncWasmChunkLoadingRuntimeModule({
+							new AsyncWasmLoadingRuntimeModule({
 								generateLoadBinaryCode,
 								supportsStreaming: true
 							})

package/lib/web/FetchCompileWasmPlugin.js

@@ -58,7 +58,8 @@ class FetchCompileWasmPlugin {
 							new WasmChunkLoadingRuntimeModule({
 								generateLoadBinaryCode,
 								supportsStreaming: true,
-								mangleImports: this.options.mangleImports
+								mangleImports: this.options.mangleImports,
+								runtimeRequirements: set
 							})
 						);
 					});

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -98,6 +98,10 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		const hasJsMatcher = compileBooleanMatcher(conditionMap);
 		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph);
 
+		const stateExpression = withHmr
+			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_jsonp`
+			: undefined;
+
 		return Template.asString([
 			withBaseURI
 				? Template.asString([
@@ -108,7 +112,9 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 			"// object to store loaded and loading chunks",
 			"// undefined = chunk not loaded, null = chunk preloaded/prefetched",
 			"// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded",
-			"var installedChunks = {",
+			`var installedChunks = ${
+				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
+			}{`,
 			Template.indent(
 				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 0`).join(
 					",\n"
@@ -389,16 +395,23 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 								'// add "moreModules" to the modules object,',
 								'// then flag all "chunkIds" as loaded and fire callback',
 								"var moduleId, chunkId, i = 0;",
-								"for(moduleId in moreModules) {",
+								`if(chunkIds.some(${runtimeTemplate.returningFunction(
+									"installedChunks[id] !== 0",
+									"id"
+								)})) {`,
 								Template.indent([
-									`if(${RuntimeGlobals.hasOwnProperty}(moreModules, moduleId)) {`,
-									Template.indent(
-										`${RuntimeGlobals.moduleFactories}[moduleId] = moreModules[moduleId];`
-									),
-									"}"
+									"for(moduleId in moreModules) {",
+									Template.indent([
+										`if(${RuntimeGlobals.hasOwnProperty}(moreModules, moduleId)) {`,
+										Template.indent(
+											`${RuntimeGlobals.moduleFactories}[moduleId] = moreModules[moduleId];`
+										),
+										"}"
+									]),
+									"}",
+									"if(runtime) var result = runtime(__webpack_require__);"
 								]),
 								"}",
-								"if(runtime) var result = runtime(__webpack_require__);",
 								"if(parentChunkLoadingFunction) parentChunkLoadingFunction(data);",
 								"for(;i < chunkIds.length; i++) {",
 								Template.indent([

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -67,6 +67,10 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 			false
 		);
 
+		const stateExpression = withHmr
+			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_importScripts`
+			: undefined;
+
 		return Template.asString([
 			withBaseURI
 				? Template.asString([
@@ -78,7 +82,9 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 			"",
 			"// object to store loaded chunks",
 			'// "1" means "already loaded"',
-			"var installedChunks = {",
+			`var installedChunks = ${
+				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
+			}{`,
 			Template.indent(
 				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 1`).join(
 					",\n"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.50.0",
+  "version": "5.52.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",
@@ -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",