webpack 5.90.1 → 5.90.3

package/lib/container/ContainerEntryModule.js

@@ -23,6 +23,7 @@ const ContainerExposedDependency = require("./ContainerExposedDependency");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
@@ -54,7 +55,7 @@ class ContainerEntryModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return SOURCE_TYPES;

package/lib/container/FallbackModule.js

@@ -22,6 +22,7 @@ const FallbackItemDependency = require("./FallbackItemDependency");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
@@ -116,7 +117,7 @@ class FallbackModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;

package/lib/container/RemoteModule.js

@@ -21,6 +21,7 @@ const RemoteToExternalDependency = require("./RemoteToExternalDependency");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
@@ -119,7 +120,7 @@ class RemoteModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;

package/lib/css/CssLoadingRuntimeModule.js

@@ -226,7 +226,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 							`module.exports = exports;`
 						)}).bind(null, exports); ${
 							withHmr ? "moduleIds.push(token); " : ""
-						}token = ""; exports = {}; exportsWithId.length = 0; }`,
+						}token = ""; exports = {}; exportsWithId.length = 0; exportsWithDashes.length = 0; }`,
 						`else if(cc == ${cc("\\")}) { token += data[++i] }`,
 						`else { token += data[i]; }`
 					]),

package/lib/dependencies/ExportsInfoDependency.js

@@ -25,7 +25,7 @@ const NullDependency = require("./NullDependency");
 /**
  * @param {ModuleGraph} moduleGraph the module graph
  * @param {Module} module the module
- * @param {string | null} exportName name of the export if any
+ * @param {string[] | null} exportName name of the export if any
  * @param {string | null} property name of the requested property
  * @param {RuntimeSpec} runtime for which runtime
  * @returns {any} value of the property
@@ -51,23 +51,19 @@ const getProperty = (moduleGraph, module, exportName, property, runtime) => {
 	switch (property) {
 		case "canMangle": {
 			const exportsInfo = moduleGraph.getExportsInfo(module);
-			const exportInfo = exportsInfo.getExportInfo(
-				/** @type {string} */ (exportName)
-			);
+			const exportInfo = exportsInfo.getExportInfo(exportName[0]);
 			if (exportInfo) return exportInfo.canMangle;
 			return exportsInfo.otherExportsInfo.canMangle;
 		}
 		case "used":
 			return (
-				moduleGraph
-					.getExportsInfo(module)
-					.getUsed(/** @type {string} */ (exportName), runtime) !==
+				moduleGraph.getExportsInfo(module).getUsed(exportName, runtime) !==
 				UsageState.Unused
 			);
 		case "useInfo": {
 			const state = moduleGraph
 				.getExportsInfo(module)
-				.getUsed(/** @type {string} */ (exportName), runtime);
+				.getUsed(exportName, runtime);
 			switch (state) {
 				case UsageState.Used:
 				case UsageState.OnlyPropertiesUsed:
@@ -83,9 +79,7 @@ const getProperty = (moduleGraph, module, exportName, property, runtime) => {
 			}
 		}
 		case "provideInfo":
-			return moduleGraph
-				.getExportsInfo(module)
-				.isExportProvided(/** @type {string} */ (exportName));
+			return moduleGraph.getExportsInfo(module).isExportProvided(exportName);
 	}
 	return undefined;
 };
@@ -93,7 +87,7 @@ const getProperty = (moduleGraph, module, exportName, property, runtime) => {
 class ExportsInfoDependency extends NullDependency {
 	/**
 	 * @param {Range} range range
-	 * @param {TODO} exportName export name
+	 * @param {string[] | null} exportName export name
 	 * @param {string | null} property property
 	 */
 	constructor(range, exportName, property) {

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -143,7 +143,8 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		let ids = this.getIds(moduleGraph);
-		if (ids.length === 0) return this._getReferencedExportsInDestructuring();
+		if (ids.length === 0)
+			return this._getReferencedExportsInDestructuring(moduleGraph);
 		let namespaceObjectAsContext = this.namespaceObjectAsContext;
 		if (ids[0] === "default") {
 			const selfModule = moduleGraph.getParentModule(this);
@@ -160,7 +161,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 				case "default-only":
 				case "default-with-named":
 					if (ids.length === 1)
-						return this._getReferencedExportsInDestructuring();
+						return this._getReferencedExportsInDestructuring(moduleGraph);
 					ids = ids.slice(1);
 					namespaceObjectAsContext = true;
 					break;
@@ -178,21 +179,30 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 			ids = ids.slice(0, -1);
 		}
 
-		return this._getReferencedExportsInDestructuring(ids);
+		return this._getReferencedExportsInDestructuring(moduleGraph, ids);
 	}
 
 	/**
+	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {string[]=} ids ids
 	 * @returns {(string[] | ReferencedExport)[]} referenced exports
 	 */
-	_getReferencedExportsInDestructuring(ids) {
+	_getReferencedExportsInDestructuring(moduleGraph, ids) {
 		if (this.referencedPropertiesInDestructuring) {
 			/** @type {ReferencedExport[]} */
 			const refs = [];
+			const importedModule = moduleGraph.getModule(this);
+			const canMangle =
+				Array.isArray(ids) &&
+				ids.length > 0 &&
+				!moduleGraph
+					.getExportsInfo(importedModule)
+					.getExportInfo(ids[0])
+					.isReexport();
 			for (const key of this.referencedPropertiesInDestructuring) {
 				refs.push({
 					name: ids ? ids.concat([key]) : [key],
-					canMangle: false
+					canMangle
 				});
 			}
 			return refs;

package/lib/dependencies/ImportParserPlugin.js

@@ -287,6 +287,7 @@ class ImportParserPlugin {
 						exports
 					);
 					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+					dep.optional = !!parser.scope.inTry;
 					depBlock.addDependency(dep);
 					parser.state.current.addBlock(depBlock);
 				}

package/lib/dependencies/WorkerDependency.js

@@ -29,7 +29,7 @@ class WorkerDependency extends ModuleDependency {
 	 * @param {string} request request
 	 * @param {Range} range range
 	 * @param {Object} workerDependencyOptions options
-	 * @param {string} workerDependencyOptions.publicPath public path for the worker
+	 * @param {string=} workerDependencyOptions.publicPath public path for the worker
 	 */
 	constructor(request, range, workerDependencyOptions) {
 		super(request);

package/lib/dependencies/WorkerPlugin.js

@@ -71,10 +71,10 @@ const PLUGIN_NAME = "WorkerPlugin";
 
 class WorkerPlugin {
 	/**
-	 * @param {ChunkLoading} chunkLoading chunk loading
-	 * @param {WasmLoading} wasmLoading wasm loading
-	 * @param {OutputModule} module output module
-	 * @param {WorkerPublicPath} workerPublicPath worker public path
+	 * @param {ChunkLoading=} chunkLoading chunk loading
+	 * @param {WasmLoading=} wasmLoading wasm loading
+	 * @param {OutputModule=} module output module
+	 * @param {WorkerPublicPath=} workerPublicPath worker public path
 	 */
 	constructor(chunkLoading, wasmLoading, module, workerPublicPath) {
 		this._chunkLoading = chunkLoading;

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -215,7 +215,7 @@ module.exports = function () {
 		for (var i = 0; i < registeredStatusHandlers.length; i++)
 			results[i] = registeredStatusHandlers[i].call(null, newStatus);
 
-		return Promise.all(results);
+		return Promise.all(results).then(function () {});
 	}
 
 	function unblock() {

package/lib/hmr/LazyCompilationPlugin.js

@@ -27,6 +27,7 @@ const { registerNotSerializable } = require("../util/serialization");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
 /** @typedef {import("../ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
 /** @typedef {import("../RequestShortener")} RequestShortener */
@@ -190,7 +191,7 @@ class LazyCompilationProxyModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;

package/lib/optimize/ConcatenatedModule.js

@@ -52,6 +52,7 @@ const {
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
@@ -710,7 +711,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;

package/lib/runtime/AutoPublicPathRuntimeModule.js

@@ -56,7 +56,7 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
 								"if(scripts.length) {",
 								Template.indent([
 									"var i = scripts.length - 1;",
-									"while (i > -1 && !scriptUrl) scriptUrl = scripts[i--].src;"
+									"while (i > -1 && (!scriptUrl || !/^http(s?):/.test(scriptUrl))) scriptUrl = scripts[i--].src;"
 								]),
 								"}"
 							]),

package/lib/sharing/ConsumeSharedModule.js

@@ -25,6 +25,7 @@ const ConsumeSharedFallbackDependency = require("./ConsumeSharedFallbackDependen
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
@@ -147,7 +148,7 @@ class ConsumeSharedModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;

package/lib/sharing/ProvideSharedModule.js

@@ -21,6 +21,7 @@ const ProvideForSharedDependency = require("./ProvideForSharedDependency");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
@@ -120,7 +121,7 @@ class ProvideSharedModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;

package/lib/util/memoize.js

@@ -23,6 +23,8 @@ const memoize = fn => {
 			cache = true;
 			// Allow to clean up memory for fn
 			// and all dependent resources
+			// eslint-disable-next-line no-warning-comments
+			// @ts-ignore
 			fn = undefined;
 			return /** @type {T} */ (result);
 		}

package/lib/util/numberHash.js

@@ -47,14 +47,9 @@ const FNV_PRIME_64 = BigInt("0x100000001B3");
 function fnv1a32(str) {
 	let hash = FNV_OFFSET_32;
 	for (let i = 0, len = str.length; i < len; i++) {
-		let code = str.charCodeAt(i);
-		if (code > 0xff) {
-			hash ^= code & 0xff;
-			hash = (hash * FNV_PRIME_32) | 0;
-			code >>= 8;
-		}
-		hash ^= code;
-		hash = (hash * FNV_PRIME_32) | 0;
+		hash ^= str.charCodeAt(i);
+		// Use Math.imul to do c-style 32-bit multiplication and keep only the 32 least significant bits
+		hash = Math.imul(hash, FNV_PRIME_32);
 	}
 	// Force the result to be positive
 	return hash & MASK_31;
@@ -69,13 +64,7 @@ function fnv1a32(str) {
 function fnv1a64(str) {
 	let hash = FNV_OFFSET_64;
 	for (let i = 0, len = str.length; i < len; i++) {
-		let code = str.charCodeAt(i);
-		if (code > 0xff) {
-			hash ^= BigInt(code & 0xff);
-			hash = BigInt.asUintN(64, hash * FNV_PRIME_64);
-			code >>= 8;
-		}
-		hash ^= BigInt(code);
+		hash ^= BigInt(str.charCodeAt(i));
 		hash = BigInt.asUintN(64, hash * FNV_PRIME_64);
 	}
 	return hash;

package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js

@@ -19,6 +19,7 @@ const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDe
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @typedef {import("../Module")} Module */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 
@@ -127,7 +128,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 						const defineStatement = Template.asString([
 							`${exportProp} = ${runtimeTemplate.exportFromImport({
 								moduleGraph,
-								module: moduleGraph.getModule(dep),
+								module: /** @type {Module} */ (moduleGraph.getModule(dep)),
 								request: dep.request,
 								importVar: importData.importVar,
 								originModule: module,

package/lib/webpack.js

@@ -20,6 +20,7 @@ const NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
 const memoize = require("./util/memoize");
 
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
+/** @typedef {import("../declarations/WebpackOptions").WebpackPluginFunction} WebpackPluginFunction */
 /** @typedef {import("./Compiler").WatchOptions} WatchOptions */
 /** @typedef {import("./MultiCompiler").MultiCompilerOptions} MultiCompilerOptions */
 /** @typedef {import("./MultiStats")} MultiStats */
@@ -30,7 +31,7 @@ const getValidateSchema = memoize(() => require("./validateSchema"));
 /**
  * @template T
  * @callback Callback
- * @param {Error=} err
+ * @param {(Error | null)=} err
  * @param {T=} stats
  * @returns {void}
  */
@@ -71,7 +72,8 @@ const createCompiler = rawOptions => {
 	if (Array.isArray(options.plugins)) {
 		for (const plugin of options.plugins) {
 			if (typeof plugin === "function") {
-				plugin.call(compiler, compiler);
+				/** @type {WebpackPluginFunction} */
+				(plugin).call(compiler, compiler);
 			} else if (plugin) {
 				plugin.apply(compiler);
 			}
@@ -160,7 +162,7 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 				}
 				return compiler;
 			} catch (err) {
-				process.nextTick(() => callback(err));
+				process.nextTick(() => callback(/** @type {Error} */ (err)));
 				return null;
 			}
 		} else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.90.1",
+  "version": "5.90.3",
   "author": "Tobias Koppers @sokra",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -57,7 +57,7 @@
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^27.6.3",
-    "eslint-plugin-jsdoc": "^43.0.5",
+    "eslint-plugin-jsdoc": "^48.1.0",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-prettier": "^5.1.3",
     "file-loader": "^6.0.0",