webpack 5.61.0 → 5.62.0

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -28,6 +28,8 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 
 const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
 
+const { ExportPresenceModes } = HarmonyImportDependency;
+
 class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	constructor(
 		request,
@@ -35,14 +37,14 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		ids,
 		name,
 		range,
-		strictExportPresence,
+		exportPresenceMode,
 		assertions
 	) {
 		super(request, sourceOrder, assertions);
 		this.ids = ids;
 		this.name = name;
 		this.range = range;
-		this.strictExportPresence = strictExportPresence;
+		this.exportPresenceMode = exportPresenceMode;
 		this.namespaceObjectAsContext = false;
 		this.call = undefined;
 		this.directImport = undefined;
@@ -153,19 +155,29 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		return [ids];
 	}
 
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @returns {number} effective mode
+	 */
+	_getEffectiveExportPresenceLevel(moduleGraph) {
+		if (this.exportPresenceMode !== ExportPresenceModes.AUTO)
+			return this.exportPresenceMode;
+		return moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
+			? ExportPresenceModes.ERROR
+			: ExportPresenceModes.WARN;
+	}
+
 	/**
 	 * Returns warnings
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {WebpackError[]} warnings
 	 */
 	getWarnings(moduleGraph) {
-		if (
-			this.strictExportPresence ||
-			moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
-		) {
-			return null;
+		const exportPresence = this._getEffectiveExportPresenceLevel(moduleGraph);
+		if (exportPresence === ExportPresenceModes.WARN) {
+			return this._getErrors(moduleGraph);
 		}
-		return this._getErrors(moduleGraph);
+		return null;
 	}
 
 	/**
@@ -174,10 +186,8 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 * @returns {WebpackError[]} errors
 	 */
 	getErrors(moduleGraph) {
-		if (
-			this.strictExportPresence ||
-			moduleGraph.getParentModule(this).buildMeta.strictHarmonyModule
-		) {
+		const exportPresence = this._getEffectiveExportPresenceLevel(moduleGraph);
+		if (exportPresence === ExportPresenceModes.ERROR) {
 			return this._getErrors(moduleGraph);
 		}
 		return null;
@@ -209,7 +219,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		write(this.ids);
 		write(this.name);
 		write(this.range);
-		write(this.strictExportPresence);
+		write(this.exportPresenceMode);
 		write(this.namespaceObjectAsContext);
 		write(this.call);
 		write(this.directImport);
@@ -224,7 +234,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		this.ids = read();
 		this.name = read();
 		this.range = read();
-		this.strictExportPresence = read();
+		this.exportPresenceMode = read();
 		this.namespaceObjectAsContext = read();
 		this.call = read();
 		this.directImport = read();

package/lib/dependencies/RequireEnsureDependency.js

@@ -85,14 +85,14 @@ RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends
 			source.replace(
 				contentRange[1],
 				errorHandlerRange[0] - 1,
-				").bind(null, __webpack_require__)).catch("
+				").bind(null, __webpack_require__))['catch']("
 			);
 			source.replace(errorHandlerRange[1], range[1] - 1, ")");
 		} else {
 			source.replace(
 				contentRange[1],
 				range[1] - 1,
-				`).bind(null, __webpack_require__)).catch(${RuntimeGlobals.uncaughtErrorHandler})`
+				`).bind(null, __webpack_require__))['catch'](${RuntimeGlobals.uncaughtErrorHandler})`
 			);
 		}
 	}

package/lib/hmr/lazyCompilationBackend.js

@@ -41,7 +41,12 @@ module.exports = options => (compiler, callback) => {
 	const listen =
 		typeof options.listen === "function"
 			? options.listen
-			: server => server.listen(options.listen);
+			: server => {
+					let listen = options.listen;
+					if (typeof listen === "object" && !("port" in listen))
+						listen = { ...listen, port: undefined };
+					server.listen(listen);
+			  };
 
 	const protocol = options.protocol || (isHttps ? "https" : "http");
 

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -211,7 +211,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 									RuntimeGlobals.getUpdateManifestFilename
 								}());`
 							]),
-							'}).catch(function(err) { if(err.code !== "MODULE_NOT_FOUND") throw err; });'
+							"})['catch'](function(err) { if(err.code !== 'MODULE_NOT_FOUND') throw err; });"
 						]),
 						"}"
 				  ])

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -56,6 +56,7 @@ class ModuleConcatenationPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		const { _backCompat: backCompat } = compiler;
 		compiler.hooks.compilation.tap("ModuleConcatenationPlugin", compilation => {
 			const moduleGraph = compilation.moduleGraph;
 			const bailoutReasonMap = new Map();
@@ -389,8 +390,10 @@ class ModuleConcatenationPlugin {
 							};
 
 							const integrate = () => {
-								ChunkGraph.setChunkGraphForModule(newModule, chunkGraph);
-								ModuleGraph.setModuleGraphForModule(newModule, moduleGraph);
+								if (backCompat) {
+									ChunkGraph.setChunkGraphForModule(newModule, chunkGraph);
+									ModuleGraph.setModuleGraphForModule(newModule, moduleGraph);
+								}
 
 								for (const warning of concatConfiguration.getWarningsSorted()) {
 									moduleGraph

package/lib/optimize/SplitChunksPlugin.js

@@ -102,6 +102,7 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
 
 /**
  * @typedef {Object} FallbackCacheGroup
+ * @property {ChunkFilterFunction} chunksFilter
  * @property {SplitChunksSizes} minSize
  * @property {SplitChunksSizes} maxAsyncSize
  * @property {SplitChunksSizes} maxInitialSize
@@ -658,6 +659,9 @@ module.exports = class SplitChunksPlugin {
 			automaticNameDelimiter: options.automaticNameDelimiter,
 			usedExports: options.usedExports,
 			fallbackCacheGroup: {
+				chunksFilter: normalizeChunksFilter(
+					fallbackCacheGroup.chunks || options.chunks || "all"
+				),
 				minSize: mergeSizes(
 					normalizeSizes(fallbackCacheGroup.minSize, defaultSizeTypes),
 					minSize
@@ -1598,6 +1602,7 @@ module.exports = class SplitChunksPlugin {
 					const { outputOptions } = compilation;
 
 					// Make sure that maxSize is fulfilled
+					const { fallbackCacheGroup } = this.options;
 					for (const chunk of Array.from(compilation.chunks)) {
 						const chunkConfig = maxSizeQueueMap.get(chunk);
 						const {
@@ -1605,7 +1610,9 @@ module.exports = class SplitChunksPlugin {
 							maxAsyncSize,
 							maxInitialSize,
 							automaticNameDelimiter
-						} = chunkConfig || this.options.fallbackCacheGroup;
+						} = chunkConfig || fallbackCacheGroup;
+						if (!chunkConfig && !fallbackCacheGroup.chunksFilter(chunk))
+							continue;
 						/** @type {SplitChunksSizes} */
 						let maxSize;
 						if (chunk.isOnlyInitial()) {

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -59,7 +59,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 							])});`,
 							`var obj = {};
 							obj[webpackThen] = ${runtimeTemplate.expressionFunction(
-								"queueFunction(queue, fn), dep.catch(reject)",
+								"queueFunction(queue, fn), dep['catch'](reject)",
 								"fn, reject"
 							)};`,
 							"return obj;"
@@ -114,7 +114,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 						"if (isEvaluating) { return completeFunction(fn); }",
 						"if (currentDeps) whenAll(currentDeps, fn, rejectFn);",
 						"queueFunction(queue, fn);",
-						"promise.catch(rejectFn);"
+						"promise['catch'](rejectFn);"
 					]
 				)};`,
 				"module.exports = promise;",

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -320,7 +320,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 											"var promise = moduleToHandlerMapping[id]();",
 											"if(promise.then) {",
 											Template.indent(
-												`promises.push(installedModules[id] = promise.then(onFactory).catch(onError));`
+												"promises.push(installedModules[id] = promise.then(onFactory)['catch'](onError));"
 											),
 											"} else onFactory(promise);"
 										]),

package/lib/sharing/ShareRuntimeModule.js

@@ -105,7 +105,7 @@ class ShareRuntimeModule extends RuntimeModule {
 							)}`,
 							"if(module.then) return promises.push(module.then(initFn, handleError));",
 							"var initResult = initFn(module);",
-							"if(initResult && initResult.then) return promises.push(initResult.catch(handleError));"
+							"if(initResult && initResult.then) return promises.push(initResult['catch'](handleError));"
 						]),
 						"} catch(err) { handleError(err); }"
 					])}`,

package/lib/util/deprecation.js

@@ -165,8 +165,16 @@ exports.arrayToSetDeprecation = (set, name) => {
 };
 
 exports.createArrayToSetDeprecationSet = name => {
-	class SetDeprecatedArray extends Set {}
-	exports.arrayToSetDeprecation(SetDeprecatedArray.prototype, name);
+	let initialized = false;
+	class SetDeprecatedArray extends Set {
+		constructor(items) {
+			super(items);
+			if (!initialized) {
+				initialized = true;
+				exports.arrayToSetDeprecation(SetDeprecatedArray.prototype, name);
+			}
+		}
+	}
 	return SetDeprecatedArray;
 };
 

package/lib/util/hash/BatchedHash.js

@@ -36,7 +36,11 @@ class BatchedHash extends Hash {
 			this.string = undefined;
 		}
 		if (typeof data === "string") {
-			if (data.length < MAX_SHORT_STRING) {
+			if (
+				data.length < MAX_SHORT_STRING &&
+				// base64 encoding is not valid since it may contain padding chars
+				(!inputEncoding || !inputEncoding.startsWith("ba"))
+			) {
 				this.string = data;
 				this.encoding = inputEncoding;
 			} else {

package/lib/util/hash/wasm-hash.js

@@ -72,7 +72,7 @@ class WasmHash {
 						endPos += 2;
 					} else {
 						// bail-out for weird chars
-						endPos += mem.write(data.slice(endPos), endPos, encoding);
+						endPos += mem.write(data.slice(i), endPos, encoding);
 						break;
 					}
 				}

package/lib/webpack.js

@@ -61,8 +61,7 @@ const createMultiCompiler = (childOptions, options) => {
 const createCompiler = rawOptions => {
 	const options = getNormalizedWebpackOptions(rawOptions);
 	applyWebpackOptionsBaseDefaults(options);
-	const compiler = new Compiler(options.context);
-	compiler.options = options;
+	const compiler = new Compiler(options.context, options);
 	new NodeEnvironmentPlugin({
 		infrastructureLogging: options.infrastructureLogging
 	}).apply(compiler);

package/module.d.ts

@@ -0,0 +1,200 @@
+declare namespace webpack {
+	type HotEvent =
+		| {
+				type: "disposed";
+				/** The module in question. */
+				moduleId: number;
+		  }
+		| {
+				type: "self-declined" | "unaccepted";
+				/** The module in question. */
+				moduleId: number;
+				/** the chain from where the update was propagated. */
+				chain: number[];
+		  }
+		| {
+				type: "declined";
+				/** The module in question. */
+				moduleId: number;
+				/** the chain from where the update was propagated. */
+				chain: number[];
+				/** the module id of the declining parent */
+				parentId: number;
+		  }
+		| {
+				type: "accepted";
+				/** The module in question. */
+				moduleId: number;
+				/** the chain from where the update was propagated. */
+				chain: number[];
+				/** the modules that are outdated and will be disposed */
+				outdatedModules: number[];
+				/** the accepted dependencies that are outdated */
+				outdatedDependencies: {
+					[id: number]: number[];
+				};
+		  }
+		| {
+				type: "accept-error-handler-errored";
+				/** The module in question. */
+				moduleId: number;
+				/** the module id owning the accept handler. */
+				dependencyId: number;
+				/** the thrown error */
+				error: Error;
+				/** the error thrown by the module before the error handler tried to handle it. */
+				originalError: Error;
+		  }
+		| {
+				type: "self-accept-error-handler-errored";
+				/** The module in question. */
+				moduleId: number;
+				/** the thrown error */
+				error: Error;
+				/** the error thrown by the module before the error handler tried to handle it. */
+				originalError: Error;
+		  }
+		| {
+				type: "accept-errored";
+				/** The module in question. */
+				moduleId: number;
+				/** the module id owning the accept handler. */
+				dependencyId: number;
+				/** the thrown error */
+				error: Error;
+		  }
+		| {
+				type: "self-accept-errored";
+				/** The module in question. */
+				moduleId: number;
+				/** the thrown error */
+				error: Error;
+		  };
+
+	interface ApplyOptions {
+		ignoreUnaccepted?: boolean;
+		ignoreDeclined?: boolean;
+		ignoreErrored?: boolean;
+		onDeclined?(callback: (info: HotEvent) => void): void;
+		onUnaccepted?(callback: (info: HotEvent) => void): void;
+		onAccepted?(callback: (info: HotEvent) => void): void;
+		onDisposed?(callback: (info: HotEvent) => void): void;
+		onErrored?(callback: (info: HotEvent) => void): void;
+	}
+
+	const enum HotUpdateStatus {
+		idle = "idle",
+		check = "check",
+		prepare = "prepare",
+		ready = "ready",
+		dispose = "dispose",
+		apply = "apply",
+		abort = "abort",
+		fail = "fail"
+	}
+
+	interface Hot {
+		accept: {
+			(
+				modules: string | string[],
+				callback?: (outdatedDependencies: string[]) => void,
+				errorHandler?: (
+					err: Error,
+					context: { moduleId: string | number; dependencyId: string | number }
+				) => void
+			): void;
+			(
+				errorHandler: (
+					err: Error,
+					ids: { moduleId: string | number; module: NodeJS.Module }
+				) => void
+			): void;
+		};
+		status(): HotUpdateStatus;
+		decline(module?: string | string[]): void;
+		dispose(callback: (data: object) => void): void;
+		addDisposeHandler(callback: (data: object) => void): void;
+		removeDisposeHandler(callback: (data: object) => void): void;
+		invalidate(): void;
+		addStatusHandler(callback: (status: HotUpdateStatus) => void): void;
+		removeStatusHandler(callback: (status: HotUpdateStatus) => void): void;
+		data: object;
+		check(
+			autoApply?: boolean | ApplyOptions
+		): Promise<(string | number)[] | null>;
+		apply(options?: ApplyOptions): Promise<(string | number)[] | null>;
+	}
+
+	interface ExportInfo {
+		used: boolean;
+		provideInfo: boolean | null | undefined;
+		useInfo: boolean | null | undefined;
+	}
+
+	interface ExportsInfo {
+		[k: string]: ExportInfo & ExportsInfo;
+	}
+
+	interface Context {
+		resolve(dependency: string): string | number;
+		keys(): Array<string>;
+		id: string | number;
+		(dependency: string): unknown;
+	}
+}
+
+interface ImportMeta {
+	url: string;
+	webpack: number;
+	webpackHot: webpack.Hot;
+}
+
+declare const __resourceQuery: string;
+declare var __webpack_public_path__: string;
+declare var __webpack_nonce__: string;
+declare const __webpack_chunkname__: string;
+declare var __webpack_base_uri__: string;
+declare var __webpack_runtime_id__: string;
+declare const __webpack_hash__: string;
+declare const __webpack_modules__: Record<string | number, NodeJS.Module>;
+declare const __webpack_require__: (id: string | number) => unknown;
+declare var __webpack_chunk_load__: (chunkId: string | number) => Promise<void>;
+declare var __webpack_get_script_filename__: (
+	chunkId: string | number
+) => string;
+declare var __webpack_is_included__: (request: string) => boolean;
+declare var __webpack_exports_info__: webpack.ExportsInfo;
+declare const __webpack_share_scopes__: Record<
+	string,
+	Record<
+		string,
+		{ loaded?: 1; get: () => Promise<unknown>; from: string; eager: boolean }
+	>
+>;
+declare var __webpack_init_sharing__: (scope: string) => Promise<void>;
+declare var __non_webpack_require__: (id: any) => unknown;
+declare const __system_context__: object;
+
+declare namespace NodeJS {
+	interface Module {
+		hot: webpack.Hot;
+	}
+
+	interface Require {
+		ensure(
+			dependencies: string[],
+			callback: (require: (module: string) => void) => void,
+			errorCallback?: (error: Error) => void,
+			chunkName?: string
+		): void;
+		context(
+			request: string,
+			includeSubdirectories?: boolean,
+			filter?: RegExp,
+			mode?: "sync" | "eager" | "weak" | "lazy" | "lazy-once"
+		): webpack.Context;
+		include(dependency: string): void;
+		resolveWeak(dependency: string): void;
+		onError?: (error: Error) => void;
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.61.0",
+  "version": "5.62.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",
@@ -39,7 +39,7 @@
     "@babel/core": "^7.11.1",
     "@babel/preset-react": "^7.10.4",
     "@types/es-module-lexer": "^0.4.1",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^27.0.2",
     "@types/node": "^15.0.1",
     "assemblyscript": "^0.19.16",
     "babel-loader": "^8.1.0",
@@ -66,11 +66,11 @@
     "husky": "^6.0.0",
     "is-ci": "^3.0.0",
     "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",
+    "jest": "^27.3.1",
+    "jest-circus": "^27.3.1",
+    "jest-cli": "^27.3.1",
+    "jest-diff": "^27.3.1",
+    "jest-junit": "^13.0.0",
     "json-loader": "^0.5.7",
     "json5": "^2.1.3",
     "less": "^4.0.0",
@@ -132,6 +132,7 @@
     "hot/",
     "schemas/",
     "SECURITY.md",
+    "module.d.ts",
     "types.d.ts"
   ],
   "scripts": {
@@ -153,17 +154,18 @@
     "type-report": "rimraf coverage && yarn cover:types && yarn cover:report && open-cli coverage/lcov-report/index.html",
     "pretest": "yarn lint",
     "prelint": "yarn setup",
-    "lint": "yarn code-lint && yarn special-lint && yarn type-lint && yarn typings-lint && yarn yarn-lint && yarn pretty-lint && yarn spellcheck",
+    "lint": "yarn code-lint && yarn special-lint && yarn type-lint && yarn typings-test && yarn module-typings-test && yarn yarn-lint && yarn pretty-lint && yarn spellcheck",
     "code-lint": "eslint . --ext '.js' --cache",
     "type-lint": "tsc",
-    "typings-lint": "tsc -p tsconfig.test.json",
+    "typings-test": "tsc -p tsconfig.types.test.json",
+    "module-typings-test": "tsc -p tsconfig.module.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 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\"",
-    "pretty-lint-base-all": "yarn pretty-lint-base \"*.js\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.js\" \"test/*.js\" \"test/helpers/*.js\" \"test/{configCases,watchCases,statsCases,hotCases,benchmarkCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "pretty-lint-base-all": "yarn pretty-lint-base \"*.js\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.js\" \"module.d.ts\" \"test/*.js\" \"test/helpers/*.js\" \"test/{configCases,watchCases,statsCases,hotCases,benchmarkCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "pretty-lint-fix": "yarn pretty-lint-base-all --loglevel warn --write",
     "pretty-lint": "yarn pretty-lint-base --check",
     "yarn-lint": "yarn-deduplicate --fail --list -s highest yarn.lock",