webpack 5.49.0 → 5.51.2

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/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.49.0",
+  "version": "5.51.2",
   "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",
@@ -65,6 +65,7 @@
     "is-ci": "^3.0.0",
     "istanbul": "^0.4.5",
     "jest": "^27.0.6",
+    "jest-cli": "^27.0.6",
     "jest-circus": "^27.0.6",
     "jest-diff": "^27.0.2",
     "jest-junit": "^12.0.0",

package/schemas/WebpackOptions.json

@@ -1213,7 +1213,7 @@
           ]
         },
         "frozen": {
-          "description": "When set, anything that would lead to an modification of the lockfile or any resource content, will result in an error.",
+          "description": "When set, anything that would lead to a modification of the lockfile or any resource content, will result in an error.",
           "type": "boolean"
         },
         "lockfileLocation": {

package/schemas/plugins/schemes/HttpUriPlugin.json

@@ -18,7 +18,7 @@
           ]
         },
         "frozen": {
-          "description": "When set, anything that would lead to an modification of the lockfile or any resource content, will result in an error.",
+          "description": "When set, anything that would lead to a modification of the lockfile or any resource content, will result in an error.",
           "type": "boolean"
         },
         "lockfileLocation": {

package/types.d.ts

@@ -767,6 +767,10 @@ declare class ChunkGraph {
 	attachModules(chunk: Chunk, modules: Iterable<Module>): void;
 	attachRuntimeModules(chunk: Chunk, modules: Iterable<RuntimeModule>): void;
 	attachFullHashModules(chunk: Chunk, modules: Iterable<RuntimeModule>): void;
+	attachDependentHashModules(
+		chunk: Chunk,
+		modules: Iterable<RuntimeModule>
+	): void;
 	replaceModule(oldModule: Module, newModule: Module): void;
 	isModuleInChunk(module: Module, chunk: Chunk): boolean;
 	isModuleInChunkGroup(module: Module, chunkGroup: ChunkGroup): boolean;
@@ -780,6 +784,7 @@ declare class ChunkGraph {
 	getNumberOfModuleChunks(module: Module): number;
 	getModuleRuntimes(module: Module): RuntimeSpecSet;
 	getNumberOfChunkModules(chunk: Chunk): number;
+	getNumberOfChunkFullHashModules(chunk: Chunk): number;
 	getChunkModulesIterable(chunk: Chunk): Iterable<Module>;
 	getChunkModulesIterableBySourceType(
 		chunk: Chunk,
@@ -831,6 +836,7 @@ declare class ChunkGraph {
 	): number;
 	canChunksBeIntegrated(chunkA: Chunk, chunkB: Chunk): boolean;
 	integrateChunks(chunkA: Chunk, chunkB: Chunk): void;
+	upgradeDependentToFullHashModules(chunk: Chunk): void;
 	isEntryModuleInChunk(module: Module, chunk: Chunk): boolean;
 	connectChunkAndEntryModule(
 		chunk: Chunk,
@@ -839,6 +845,7 @@ declare class ChunkGraph {
 	): void;
 	connectChunkAndRuntimeModule(chunk: Chunk, module: RuntimeModule): void;
 	addFullHashModuleToChunk(chunk: Chunk, module: RuntimeModule): void;
+	addDependentHashModuleToChunk(chunk: Chunk, module: RuntimeModule): void;
 	disconnectChunkAndEntryModule(chunk: Chunk, module: Module): void;
 	disconnectChunkAndRuntimeModule(chunk: Chunk, module: RuntimeModule): void;
 	disconnectEntryModule(module: Module): void;
@@ -856,6 +863,9 @@ declare class ChunkGraph {
 	getChunkFullHashModulesSet(
 		chunk: Chunk
 	): undefined | ReadonlySet<RuntimeModule>;
+	getChunkDependentHashModulesIterable(
+		chunk: Chunk
+	): undefined | Iterable<RuntimeModule>;
 	getChunkEntryModulesWithChunkGroupIterable(
 		chunk: Chunk
 	): Iterable<[Module, undefined | Entrypoint]>;
@@ -2388,6 +2398,17 @@ declare class ContextExclusionPlugin {
 	 */
 	apply(compiler: Compiler): void;
 }
+declare interface ContextFileSystemInfoEntry {
+	safeTime: number;
+	timestampHash?: string;
+	resolved?: ResolvedContextFileSystemInfoEntry;
+	symlinks?: Set<string>;
+}
+declare interface ContextHash {
+	hash: string;
+	resolved?: string;
+	symlinks?: Set<string>;
+}
 type ContextMode =
 	| "sync"
 	| "eager"
@@ -2455,6 +2476,13 @@ declare class ContextReplacementPlugin {
 	newContentRegExp: any;
 	apply(compiler?: any): void;
 }
+declare interface ContextTimestampAndHash {
+	safeTime: number;
+	timestampHash?: string;
+	hash: string;
+	resolved?: ResolvedContextTimestampAndHash;
+	symlinks?: Set<string>;
+}
 type CreateStatsOptionsContext = KnownCreateStatsOptionsContext &
 	Record<string, any>;
 type Declaration = FunctionDeclaration | VariableDeclaration | ClassDeclaration;
@@ -3968,8 +3996,13 @@ declare abstract class FileSystemInfo {
 	logger?: WebpackLogger;
 	fileTimestampQueue: AsyncQueue<string, string, null | FileSystemInfoEntry>;
 	fileHashQueue: AsyncQueue<string, string, null | string>;
-	contextTimestampQueue: AsyncQueue<string, string, null | FileSystemInfoEntry>;
-	contextHashQueue: AsyncQueue<string, string, null | string>;
+	contextTimestampQueue: AsyncQueue<
+		string,
+		string,
+		null | ContextFileSystemInfoEntry
+	>;
+	contextHashQueue: AsyncQueue<string, string, null | ContextHash>;
+	contextTshQueue: AsyncQueue<string, string, null | ContextTimestampAndHash>;
 	managedItemQueue: AsyncQueue<string, string, null | string>;
 	managedItemDirectoryQueue: AsyncQueue<string, string, Set<string>>;
 	managedPaths: string[];
@@ -3997,7 +4030,7 @@ declare abstract class FileSystemInfo {
 		path: string,
 		callback: (
 			arg0?: WebpackError,
-			arg1?: null | FileSystemInfoEntry | "ignore"
+			arg1?: null | "ignore" | ResolvedContextFileSystemInfoEntry
 		) => void
 	): void;
 	getFileHash(
@@ -4008,6 +4041,13 @@ declare abstract class FileSystemInfo {
 		path: string,
 		callback: (arg0?: WebpackError, arg1?: string) => void
 	): void;
+	getContextTsh(
+		path: string,
+		callback: (
+			arg0?: WebpackError,
+			arg1?: ResolvedContextTimestampAndHash
+		) => void
+	): void;
 	resolveBuildDependencies(
 		context: string,
 		deps: Iterable<string>,
@@ -4045,7 +4085,6 @@ declare abstract class FileSystemInfo {
 declare interface FileSystemInfoEntry {
 	safeTime: number;
 	timestamp?: number;
-	timestampHash?: string;
 }
 declare interface FileSystemStats {
 	isDirectory: () => boolean;
@@ -4301,7 +4340,7 @@ declare interface HttpUriOptions {
 	cacheLocation?: string | false;
 
 	/**
-	 * When set, anything that would lead to an modification of the lockfile or any resource content, will result in an error.
+	 * When set, anything that would lead to a modification of the lockfile or any resource content, will result in an error.
 	 */
 	frozen?: boolean;
 
@@ -4322,7 +4361,7 @@ declare class HttpUriPlugin {
 		 */
 		cacheLocation?: string | false;
 		/**
-		 * When set, anything that would lead to an modification of the lockfile or any resource content, will result in an error.
+		 * When set, anything that would lead to a modification of the lockfile or any resource content, will result in an error.
 		 */
 		frozen?: boolean;
 		/**
@@ -4504,6 +4543,10 @@ declare interface InputFileSystem {
 		arg0: string,
 		arg1: (arg0?: null | NodeJS.ErrnoException, arg1?: IStats) => void
 	) => void;
+	lstat?: (
+		arg0: string,
+		arg1: (arg0?: null | NodeJS.ErrnoException, arg1?: IStats) => void
+	) => void;
 	realpath?: (
 		arg0: string,
 		arg1: (arg0?: null | NodeJS.ErrnoException, arg1?: string | Buffer) => void
@@ -8470,6 +8513,7 @@ declare interface ParserOptionsByModuleTypeUnknown {
 }
 type ParserState = Record<string, any> & ParserStateBase;
 declare interface ParserStateBase {
+	source: string | Buffer;
 	current: NormalModule;
 	module: NormalModule;
 	compilation: Compilation;
@@ -9254,6 +9298,15 @@ declare interface ResolvePluginInstance {
 	apply: (resolver: Resolver) => void;
 }
 type ResolveRequest = BaseResolveRequest & Partial<ParsedIdentifier>;
+declare interface ResolvedContextFileSystemInfoEntry {
+	safeTime: number;
+	timestampHash?: string;
+}
+declare interface ResolvedContextTimestampAndHash {
+	safeTime: number;
+	timestampHash?: string;
+	hash: string;
+}
 declare abstract class Resolver {
 	fileSystem: FileSystem;
 	options: ResolveOptionsTypes;
@@ -9736,6 +9789,7 @@ declare class RuntimeModule extends Module {
 	chunk: Chunk;
 	chunkGraph: ChunkGraph;
 	fullHash: boolean;
+	dependentHash: boolean;
 	attach(compilation: Compilation, chunk: Chunk, chunkGraph?: ChunkGraph): void;
 	generate(): string;
 	getGeneratedCode(): string;
@@ -10325,9 +10379,9 @@ declare abstract class Snapshot {
 	fileTimestamps?: Map<string, FileSystemInfoEntry>;
 	fileHashes?: Map<string, string>;
 	fileTshs?: Map<string, string | TimestampAndHash>;
-	contextTimestamps?: Map<string, FileSystemInfoEntry>;
+	contextTimestamps?: Map<string, ResolvedContextFileSystemInfoEntry>;
 	contextHashes?: Map<string, string>;
-	contextTshs?: Map<string, string | TimestampAndHash>;
+	contextTshs?: Map<string, ResolvedContextTimestampAndHash>;
 	missingExistence?: Map<string, boolean>;
 	managedItemInfo?: Map<string, string>;
 	managedFiles?: Set<string>;
@@ -11241,7 +11295,6 @@ declare class Template {
 declare interface TimestampAndHash {
 	safeTime: number;
 	timestamp?: number;
-	timestampHash?: string;
 	hash: string;
 }
 
@@ -12035,6 +12088,7 @@ declare namespace exports {
 		export let hmrDownloadUpdateHandlers: string;
 		export let hmrModuleData: string;
 		export let hmrInvalidateModuleHandlers: string;
+		export let hmrRuntimeStatePrefix: string;
 		export let amdDefine: string;
 		export let amdOptions: string;
 		export let system: string;