webpack 5.101.2 → 5.102.0

package/lib/wasm/EnableWasmLoadingPlugin.js

@@ -5,16 +5,17 @@
 
 "use strict";
 
-/** @typedef {import("../../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../../declarations/WebpackOptions").WasmLoadingType} WasmLoadingType */
 /** @typedef {import("../Compiler")} Compiler */
 
+/** @typedef {Set<WasmLoadingType>} WasmLoadingTypes */
+
 /** @type {WeakMap<Compiler, Set<WasmLoadingType>>} */
 const enabledTypes = new WeakMap();
 
 /**
  * @param {Compiler} compiler compiler instance
- * @returns {Set<WasmLoadingType>} enabled types
+ * @returns {WasmLoadingTypes} enabled types
  */
 const getEnabledTypes = (compiler) => {
 	let set = enabledTypes.get(compiler);

package/lib/wasm-async/AsyncWasmLoadingRuntimeModule.js

@@ -76,7 +76,11 @@ class AsyncWasmLoadingRuntimeModule extends RuntimeModule {
 			)})`
 		];
 		const getStreaming = () => {
-			const concat = (/** @type {string[]} */ ...text) => text.join("");
+			/**
+			 * @param {string[]} text text
+			 * @returns {string} merged text
+			 */
+			const concat = (...text) => text.join("");
 			return [
 				this.generateBeforeLoadBinaryCode
 					? this.generateBeforeLoadBinaryCode(wasmModuleSrcPath)

package/lib/wasm-async/AsyncWebAssemblyJavascriptGenerator.js

@@ -14,27 +14,16 @@ const Template = require("../Template");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} OutputOptions */
-/** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../NormalModule")} NormalModule */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 
 /**
  * @typedef {{ request: string, importVar: string }} ImportObjRequestItem
  */
 
 class AsyncWebAssemblyJavascriptGenerator extends Generator {
-	/**
-	 * @param {OutputOptions["webassemblyModuleFilename"]} filenameTemplate template for the WebAssembly module filename
-	 */
-	constructor(filenameTemplate) {
-		super();
-		this.filenameTemplate = filenameTemplate;
-	}
-
 	/**
 	 * @param {NormalModule} module fresh module
 	 * @returns {SourceTypes} available types (do not mutate)
@@ -69,7 +58,7 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 		runtimeRequirements.add(RuntimeGlobals.moduleId);
 		runtimeRequirements.add(RuntimeGlobals.exports);
 		runtimeRequirements.add(RuntimeGlobals.instantiateWasm);
-		/** @type {InitFragment<InitFragment<string>>[]} */
+		/** @type {InitFragment<GenerateContext>[]} */
 		const initFragments = [];
 		/** @type {Map<Module, ImportObjRequestItem>} */
 		const depModules = new Map();
@@ -93,7 +82,7 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 			}
 		}
 
-		/** @type {Array<string>} */
+		/** @type {string[]} */
 		const promises = [];
 
 		const importStatements = Array.from(

package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -15,7 +15,6 @@ const { compareModulesByIdOrIdentifier } = require("../util/comparators");
 const memoize = require("../util/memoize");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} OutputOptions */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
@@ -24,8 +23,6 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("../Template").RenderManifestEntry} RenderManifestEntry */
-/** @typedef {import("../Template").RenderManifestOptions} RenderManifestOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
 
 const getAsyncWebAssemblyGenerator = memoize(() =>
@@ -126,9 +123,7 @@ class AsyncWebAssemblyModulesPlugin {
 						const AsyncWebAssemblyGenerator = getAsyncWebAssemblyGenerator();
 
 						return Generator.byType({
-							javascript: new AsyncWebAssemblyJavascriptGenerator(
-								compilation.outputOptions.webassemblyModuleFilename
-							),
+							javascript: new AsyncWebAssemblyJavascriptGenerator(),
 							webassembly: new AsyncWebAssemblyGenerator(this.options)
 						});
 					});
@@ -147,9 +142,7 @@ class AsyncWebAssemblyModulesPlugin {
 						compareModulesByIdOrIdentifier(chunkGraph)
 					)) {
 						if (module.type === WEBASSEMBLY_MODULE_TYPE_ASYNC) {
-							const filenameTemplate =
-								/** @type {NonNullable<OutputOptions["webassemblyModuleFilename"]>} */
-								(outputOptions.webassemblyModuleFilename);
+							const filenameTemplate = outputOptions.webassemblyModuleFilename;
 
 							result.push({
 								render: () =>

package/lib/wasm-async/AsyncWebAssemblyParser.js

@@ -60,8 +60,9 @@ class WebAssemblyParser extends Parser {
 		// parse it
 		const program = decode(source, decoderOpts);
 		const module = program.body[0];
-		/** @type {Array<string>} */
+		/** @type {string[]} */
 		const exports = [];
+
 		t.traverse(module, {
 			ModuleExport({ node }) {
 				exports.push(node.name);

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -46,12 +46,14 @@ const getAllWasmModules = (moduleGraph, chunkGraph, chunk) => {
 	return array;
 };
 
+/** @typedef {string[]} Declarations */
+
 /**
  * generates the import object function for a module
  * @param {ChunkGraph} chunkGraph the chunk graph
  * @param {Module} module the module
  * @param {boolean | undefined} mangle mangle imports
- * @param {string[]} declarations array where declarations are pushed to
+ * @param {Declarations} declarations array where declarations are pushed to
  * @param {RuntimeSpec} runtime the runtime
  * @returns {string} source code
  */
@@ -63,7 +65,7 @@ const generateImportObject = (
 	runtime
 ) => {
 	const moduleGraph = chunkGraph.moduleGraph;
-	/** @type {Map<string, string | number>} */
+	/** @type {Map<string, ModuleId>} */
 	const waitForInstances = new Map();
 	const properties = [];
 	const usedWasmDependencies = WebAssemblyUtils.getUsedDependencies(
@@ -146,7 +148,7 @@ const generateImportObject = (
 			"};"
 		];
 	} else {
-		/** @type {Map<string, Array<{ name: string, value: string }>>} */
+		/** @type {Map<string, { name: string, value: string }[]>} */
 		const propertiesByModule = new Map();
 		for (const p of properties) {
 			let list = propertiesByModule.get(p.module);
@@ -253,7 +255,7 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 		const chunk = /** @type {Chunk} */ (this.chunk);
 		const wasmModules = getAllWasmModules(moduleGraph, chunkGraph, chunk);
 		const { mangleImports } = this;
-		/** @type {string[]} */
+		/** @type {Declarations} */
 		const declarations = [];
 		const importObjects = wasmModules.map((module) =>
 			generateImportObject(

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -16,13 +16,11 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("./WebAssemblyUtils").UsedWasmDependency} UsedWasmDependency */
 /** @typedef {import("@webassemblyjs/ast").Instruction} Instruction */
@@ -175,7 +173,7 @@ const createDefaultInitForGlobal = (globalType) => {
  */
 const rewriteImportedGlobals = (state) => (bin) => {
 	const additionalInitCode = state.additionalInitCode;
-	/** @type {Array<t.Global>} */
+	/** @type {t.Global[]} */
 	const newGlobals = [];
 
 	bin = editWithAST(state.ast, bin, {

package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js

@@ -17,13 +17,10 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../NormalModule")} NormalModule */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 
 class WebAssemblyJavascriptGenerator extends Generator {
 	/**
@@ -56,7 +53,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 			runtimeRequirements,
 			runtime
 		} = generateContext;
-		/** @type {InitFragment<InitFragment<string>>[]} */
+		/** @type {InitFragment<GenerateContext>[]} */
 		const initFragments = [];
 
 		const exportsInfo = moduleGraph.getExportsInfo(module);

package/lib/wasm-sync/WebAssemblyModulesPlugin.js

@@ -13,12 +13,8 @@ const { compareModulesByIdOrIdentifier } = require("../util/comparators");
 const memoize = require("../util/memoize");
 const WebAssemblyInInitialChunkError = require("./WebAssemblyInInitialChunkError");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} OutputOptions */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleTemplate")} ModuleTemplate */
-/** @typedef {import("../javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
 
 const getWebAssemblyGenerator = memoize(() =>
 	require("./WebAssemblyGenerator")
@@ -92,9 +88,7 @@ class WebAssemblyModulesPlugin {
 						compareModulesByIdOrIdentifier(chunkGraph)
 					)) {
 						if (module.type === WEBASSEMBLY_MODULE_TYPE_SYNC) {
-							const filenameTemplate =
-								/** @type {NonNullable<OutputOptions["webassemblyModuleFilename"]>} */
-								(outputOptions.webassemblyModuleFilename);
+							const filenameTemplate = outputOptions.webassemblyModuleFilename;
 
 							result.push({
 								render: () =>
@@ -123,6 +117,7 @@ class WebAssemblyModulesPlugin {
 
 				compilation.hooks.afterChunks.tap(PLUGIN_NAME, () => {
 					const chunkGraph = compilation.chunkGraph;
+					/** @type {Set<Module>} */
 					const initialWasmModules = new Set();
 					for (const chunk of compilation.chunks) {
 						if (chunk.canBeInitial()) {

package/lib/wasm-sync/WebAssemblyParser.js

@@ -14,8 +14,6 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 
 /** @typedef {import("@webassemblyjs/ast").ModuleImport} ModuleImport */
-/** @typedef {import("@webassemblyjs/ast").NumberLiteral} NumberLiteral */
-/** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
@@ -132,8 +130,7 @@ class WebAssemblyParser extends Parser {
 				exports.push(node.name);
 
 				if (node.descr && node.descr.exportType === "Global") {
-					const refNode =
-						importedGlobals[/** @type {NumberLiteral} */ (node.descr.id).value];
+					const refNode = importedGlobals[node.descr.id.value];
 					if (refNode) {
 						const dep = new WebAssemblyExportImportedDependency(
 							node.name,

package/lib/web/JsonpChunkLoadingPlugin.js

@@ -10,6 +10,7 @@ const JsonpChunkLoadingRuntimeModule = require("./JsonpChunkLoadingRuntimeModule
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 
 const PLUGIN_NAME = "JsonpChunkLoadingPlugin";
 
@@ -37,7 +38,7 @@ class JsonpChunkLoadingPlugin {
 			const onceForChunkSet = new WeakSet();
 			/**
 			 * @param {Chunk} chunk chunk
-			 * @param {Set<string>} set runtime requirements
+			 * @param {RuntimeRequirements} set runtime requirements
 			 */
 			const handler = (chunk, set) => {
 				if (onceForChunkSet.has(chunk)) return;

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -69,7 +69,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
 		}
-		return `${RuntimeGlobals.baseURI} = document.baseURI || self.location.href;`;
+		return `${RuntimeGlobals.baseURI} = (document && document.baseURI) || self.location.href;`;
 	}
 
 	/**

package/lib/web/JsonpTemplatePlugin.js

@@ -9,7 +9,6 @@ const ArrayPushCallbackChunkFormatPlugin = require("../javascript/ArrayPushCallb
 const EnableChunkLoadingPlugin = require("../javascript/EnableChunkLoadingPlugin");
 const JsonpChunkLoadingRuntimeModule = require("./JsonpChunkLoadingRuntimeModule");
 
-/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
 

package/lib/webpack.js

@@ -21,6 +21,7 @@ const memoize = require("./util/memoize");
 
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginFunction} WebpackPluginFunction */
+/** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptionsNormalizedWithDefaults */
 /** @typedef {import("./Compiler").WatchOptions} WatchOptions */
 /** @typedef {import("./MultiCompiler").MultiCompilerOptions} MultiCompilerOptions */
 /** @typedef {import("./MultiCompiler").MultiWebpackOptions} MultiWebpackOptions */
@@ -31,12 +32,15 @@ const getValidateSchema = memoize(() => require("./validateSchema"));
 
 /**
  * @template T
+ * @template [R=void]
  * @callback Callback
  * @param {Error | null} err
- * @param {T=} stats
- * @returns {void}
+ * @param {T=} result
+ * @returns {R}
  */
 
+/** @typedef {Callback<void>} ErrorCallback */
+
 /**
  * @param {ReadonlyArray<WebpackOptions>} childOptions options array
  * @param {MultiCompilerOptions} options options
@@ -92,7 +96,11 @@ const createCompiler = (rawOptions, compilerIndex) => {
 	}
 	compiler.hooks.environment.call();
 	compiler.hooks.afterEnvironment.call();
-	new WebpackOptionsApply().process(options, compiler);
+	new WebpackOptionsApply().process(
+		/** @type {WebpackOptionsNormalizedWithDefaults} */
+		(options),
+		compiler
+	);
 	compiler.hooks.initialize.call();
 	return compiler;
 };
@@ -113,8 +121,8 @@ const createCompiler = (rawOptions, compilerIndex) => {
 
 /**
  * @template T
- * @param {Array<T> | T} options options
- * @returns {Array<T>} array of options
+ * @param {T[] | T} options options
+ * @returns {T[]} array of options
  */
 const asArray = (options) =>
 	Array.isArray(options) ? [...options] : [options];
@@ -130,7 +138,11 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 	/** @type {WebpackCallback} */
 	(options, callback) => {
 		const create = () => {
-			if (!asArray(options).every(webpackOptionsSchemaCheck)) {
+			if (
+				!asArray(/** @type {WebpackOptions} */ (options)).every(
+					webpackOptionsSchemaCheck
+				)
+			) {
 				getValidateSchema()(webpackOptionsSchema, options);
 				util.deprecate(
 					() => {},
@@ -142,13 +154,14 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 			let compiler;
 			/** @type {boolean | undefined} */
 			let watch = false;
-			/** @type {WatchOptions|WatchOptions[]} */
+			/** @type {WatchOptions | WatchOptions[]} */
 			let watchOptions;
 			if (Array.isArray(options)) {
 				/** @type {MultiCompiler} */
 				compiler = createMultiCompiler(
 					options,
-					/** @type {MultiCompilerOptions} */ (options)
+					/** @type {MultiCompilerOptions} */
+					(options)
 				);
 				watch = options.some((options) => options.watch);
 				watchOptions = options.map((options) => options.watchOptions || {});

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -11,6 +11,7 @@ const ImportScriptsChunkLoadingRuntimeModule = require("./ImportScriptsChunkLoad
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 
 const PLUGIN_NAME = "ImportScriptsChunkLoadingPlugin";
 
@@ -42,7 +43,7 @@ class ImportScriptsChunkLoadingPlugin {
 			const onceForChunkSet = new WeakSet();
 			/**
 			 * @param {Chunk} chunk chunk
-			 * @param {Set<string>} set runtime requirements
+			 * @param {RuntimeRequirements} set runtime requirements
 			 */
 			const handler = (chunk, set) => {
 				if (onceForChunkSet.has(chunk)) return;

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -54,7 +54,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			/** @type {string} */ (compilation.outputOptions.path),
+			compilation.outputOptions.path,
 			false
 		);
 		return `${RuntimeGlobals.baseURI} = self.location + ${JSON.stringify(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.101.2",
+  "version": "5.102.0",
   "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.",
   "homepage": "https://github.com/webpack/webpack",
   "bugs": "https://github.com/webpack/webpack/issues",
@@ -89,7 +89,7 @@
     "@webassemblyjs/wasm-parser": "^1.14.1",
     "acorn": "^8.15.0",
     "acorn-import-phases": "^1.0.3",
-    "browserslist": "^4.24.0",
+    "browserslist": "^4.24.5",
     "chrome-trace-event": "^1.0.2",
     "enhanced-resolve": "^5.17.3",
     "es-module-lexer": "^1.2.1",
@@ -102,9 +102,9 @@
     "mime-types": "^2.1.27",
     "neo-async": "^2.6.2",
     "schema-utils": "^4.3.2",
-    "tapable": "^2.1.1",
+    "tapable": "^2.2.3",
     "terser-webpack-plugin": "^5.3.11",
-    "watchpack": "^2.4.1",
+    "watchpack": "^2.4.4",
     "webpack-sources": "^3.3.3"
   },
   "devDependencies": {
@@ -120,7 +120,7 @@
     "@types/mime-types": "^2.1.4",
     "@types/node": "^24.1.0",
     "@types/xxhashjs": "^0.2.4",
-    "assemblyscript": "^0.28.2",
+    "assemblyscript": "^0.28.5",
     "babel-loader": "^10.0.0",
     "bundle-loader": "^0.5.6",
     "coffee-loader": "^5.0.0",
@@ -139,18 +139,18 @@
     "eslint-plugin-jsdoc": "^51.2.3",
     "eslint-plugin-n": "^17.21.0",
     "eslint-plugin-prettier": "^5.5.0",
-    "eslint-plugin-unicorn": "^60.0.0",
+    "eslint-plugin-unicorn": "^61.0.1",
     "file-loader": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "globals": "^16.0.0",
     "hash-wasm": "^4.9.0",
     "husky": "^9.0.11",
     "istanbul": "^0.4.5",
-    "jest": "^30.0.5",
-    "jest-circus": "^30.0.5",
-    "jest-cli": "^30.0.5",
-    "jest-diff": "^30.0.5",
-    "jest-environment-node": "^30.0.5",
+    "jest": "^30.1.2",
+    "jest-circus": "^30.1.2",
+    "jest-cli": "^30.1.2",
+    "jest-diff": "^30.1.2",
+    "jest-environment-node": "^30.1.2",
     "jest-junit": "^16.0.0",
     "json-loader": "^0.5.7",
     "json5": "^2.1.3",
@@ -179,8 +179,8 @@
     "strip-ansi": "^6.0.0",
     "style-loader": "^4.0.0",
     "terser": "^5.43.1",
-    "three": "^0.179.1",
-    "tinybench": "^4.0.1",
+    "three": "^0.180.0",
+    "tinybench": "^5.0.0",
     "toml": "^3.0.0",
     "tooling": "webpack/tooling#v1.24.3",
     "ts-loader": "^9.5.1",