webpack 5.97.1 → 5.99.0

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -30,6 +30,8 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 /** @typedef {import("@webassemblyjs/ast").ModuleImport} ModuleImport */
 /** @typedef {import("@webassemblyjs/ast").ModuleExport} ModuleExport */
 /** @typedef {import("@webassemblyjs/ast").Global} Global */
+/** @typedef {import("@webassemblyjs/ast").AST} AST */
+/** @typedef {import("@webassemblyjs/ast").GlobalType} GlobalType */
 /**
  * @template T
  * @typedef {import("@webassemblyjs/ast").NodePath<T>} NodePath
@@ -42,7 +44,7 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 /**
  * @template T
  * @param {((prev: ArrayBuffer) => ArrayBuffer)[]} fns transforms
- * @returns {Function} composed transform
+ * @returns {ArrayBufferTransform} composed transform
  */
 const compose = (...fns) =>
 	fns.reduce(
@@ -53,7 +55,7 @@ const compose = (...fns) =>
 /**
  * Removes the start instruction
  * @param {object} state state
- * @param {object} state.ast Module's ast
+ * @param {AST} state.ast Module's ast
  * @returns {ArrayBufferTransform} transform
  */
 const removeStartFunc = state => bin =>
@@ -65,7 +67,7 @@ const removeStartFunc = state => bin =>
 
 /**
  * Get imported globals
- * @param {object} ast Module's AST
+ * @param {AST} ast Module's AST
  * @returns {t.ModuleImport[]} - nodes
  */
 const getImportedGlobals = ast => {
@@ -85,7 +87,7 @@ const getImportedGlobals = ast => {
 
 /**
  * Get the count for imported func
- * @param {object} ast Module's AST
+ * @param {AST} ast Module's AST
  * @returns {number} - count
  */
 const getCountImportedFunc = ast => {
@@ -104,7 +106,7 @@ const getCountImportedFunc = ast => {
 
 /**
  * Get next type index
- * @param {object} ast Module's AST
+ * @param {AST} ast Module's AST
  * @returns {t.Index} - index
  */
 const getNextTypeIndex = ast => {
@@ -122,7 +124,7 @@ const getNextTypeIndex = ast => {
  * The Func section metadata provide information for implemented funcs
  * in order to have the correct index we shift the index by number of external
  * functions.
- * @param {object} ast Module's AST
+ * @param {AST} ast Module's AST
  * @param {number} countImportedFunc number of imported funcs
  * @returns {t.Index} - index
  */
@@ -168,7 +170,7 @@ const createDefaultInitForGlobal = globalType => {
  *
  * Note that globals will become mutable.
  * @param {object} state transformation state
- * @param {object} state.ast Module's ast
+ * @param {AST} state.ast Module's ast
  * @param {t.Instruction[]} state.additionalInitCode list of addition instructions for the init function
  * @returns {ArrayBufferTransform} transform
  */
@@ -180,7 +182,9 @@ const rewriteImportedGlobals = state => bin => {
 	bin = editWithAST(state.ast, bin, {
 		ModuleImport(path) {
 			if (t.isGlobalType(path.node.descr)) {
-				const globalType = /** @type {TODO} */ (path.node.descr);
+				const globalType =
+					/** @type {GlobalType} */
+					(path.node.descr);
 
 				globalType.mutability = "var";
 
@@ -238,7 +242,7 @@ const rewriteImportedGlobals = state => bin => {
 /**
  * Rewrite the export names
  * @param {object} state state
- * @param {object} state.ast Module's ast
+ * @param {AST} state.ast Module's ast
  * @param {Module} state.module Module
  * @param {ModuleGraph} state.moduleGraph module graph
  * @param {Set<string>} state.externalExports Module
@@ -272,7 +276,7 @@ const rewriteExportNames =
 /**
  * Mangle import names and modules
  * @param {object} state state
- * @param {object} state.ast Module's ast
+ * @param {AST} state.ast Module's ast
  * @param {Map<string, UsedWasmDependency>} state.usedDependencyMap mappings to mangle names
  * @returns {ArrayBufferTransform} transform
  */
@@ -300,7 +304,7 @@ const rewriteImports =
  *
  * The init function fills the globals given input arguments.
  * @param {object} state transformation state
- * @param {object} state.ast Module's ast
+ * @param {AST} state.ast Module's ast
  * @param {t.Identifier} state.initFuncId identifier of the init function
  * @param {t.Index} state.startAtFuncOffset index of the start function
  * @param {t.ModuleImport[]} state.importedGlobals list of imported globals
@@ -442,7 +446,9 @@ class WebAssemblyGenerator extends Generator {
 	 * @returns {Source | null} generated code
 	 */
 	generate(module, { moduleGraph, runtime }) {
-		const bin = /** @type {Source} */ (module.originalSource()).source();
+		const bin =
+			/** @type {Buffer} */
+			(/** @type {Source} */ (module.originalSource()).source());
 
 		const initFuncId = t.identifier("");
 
@@ -515,6 +521,16 @@ class WebAssemblyGenerator extends Generator {
 
 		return new RawSource(newBuf);
 	}
+
+	/**
+	 * @param {Error} error the error
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source | null} generated code
+	 */
+	generateError(error, module, generateContext) {
+		return new RawSource(error.message);
+	}
 }
 
 module.exports = WebAssemblyGenerator;

package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js

@@ -212,6 +212,16 @@ class WebAssemblyJavascriptGenerator extends Generator {
 		);
 		return InitFragment.addToSource(source, initFragments, generateContext);
 	}
+
+	/**
+	 * @param {Error} error the error
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source | null} generated code
+	 */
+	generateError(error, module, generateContext) {
+		return new RawSource(`throw new Error(${JSON.stringify(error.message)});`);
+	}
 }
 
 module.exports = WebAssemblyJavascriptGenerator;

package/lib/wasm-sync/WebAssemblyModulesPlugin.js

@@ -9,7 +9,7 @@ const Generator = require("../Generator");
 const { WEBASSEMBLY_MODULE_TYPE_SYNC } = require("../ModuleTypeConstants");
 const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
-const { compareModulesByIdentifier } = require("../util/comparators");
+const { compareModulesByIdOrIdentifier } = require("../util/comparators");
 const memoize = require("../util/memoize");
 const WebAssemblyInInitialChunkError = require("./WebAssemblyInInitialChunkError");
 
@@ -89,7 +89,7 @@ class WebAssemblyModulesPlugin {
 
 					for (const module of chunkGraph.getOrderedChunkModulesIterable(
 						chunk,
-						compareModulesByIdentifier
+						compareModulesByIdOrIdentifier(chunkGraph)
 					)) {
 						if (module.type === WEBASSEMBLY_MODULE_TYPE_SYNC) {
 							const filenameTemplate =

package/lib/wasm-sync/WebAssemblyParser.js

@@ -13,6 +13,8 @@ const StaticExportsDependency = require("../dependencies/StaticExportsDependency
 const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
 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 */
@@ -101,8 +103,9 @@ class WebAssemblyParser extends Parser {
 		/** @type {Record<string, string> | undefined} */
 		let jsIncompatibleExports = (buildMeta.jsIncompatibleExports = undefined);
 
-		/** @type {TODO[]} */
+		/** @type {(ModuleImport | null)[]} */
 		const importedGlobals = [];
+
 		t.traverse(module, {
 			ModuleExport({ node }) {
 				const descriptor = node.descr;
@@ -130,13 +133,14 @@ class WebAssemblyParser extends Parser {
 
 				if (node.descr && node.descr.exportType === "Global") {
 					const refNode =
-						importedGlobals[/** @type {TODO} */ (node.descr.id.value)];
+						importedGlobals[/** @type {NumberLiteral} */ (node.descr.id).value];
 					if (refNode) {
 						const dep = new WebAssemblyExportImportedDependency(
 							node.name,
 							refNode.module,
 							refNode.name,
-							refNode.descr.valtype
+							/** @type {string} */
+							(refNode.descr.valtype)
 						);
 
 						state.module.addDependency(dep);
@@ -170,7 +174,8 @@ class WebAssemblyParser extends Parser {
 					onlyDirectImport = "Table";
 				} else if (t.isFuncImportDescr(node.descr) === true) {
 					const incompatibleType = getJsIncompatibleType(
-						/** @type {t.Signature} */ (node.descr.signature)
+						/** @type {t.Signature} */
+						(node.descr.signature)
 					);
 					if (incompatibleType) {
 						onlyDirectImport = `Non-JS-compatible Func Signature (${incompatibleType})`;

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -80,7 +80,8 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 				chunkLoadingGlobal,
 				hotUpdateGlobal,
 				crossOriginLoading,
-				scriptType
+				scriptType,
+				charset
 			}
 		} = compilation;
 		const globalObject = runtimeTemplate.globalObject;
@@ -229,6 +230,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							linkPrefetch.call(
 								Template.asString([
 									"var link = document.createElement('link');",
+									charset ? "link.charset = 'utf-8';" : "",
 									crossOriginLoading
 										? `link.crossOrigin = ${JSON.stringify(
 												crossOriginLoading
@@ -268,7 +270,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 									scriptType && scriptType !== "module"
 										? `link.type = ${JSON.stringify(scriptType)};`
 										: "",
-									"link.charset = 'utf-8';",
+									charset ? "link.charset = 'utf-8';" : "",
 									`if (${RuntimeGlobals.scriptNonce}) {`,
 									Template.indent(
 										`link.setAttribute("nonce", ${RuntimeGlobals.scriptNonce});`

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -73,6 +73,9 @@ class ImportScriptsChunkLoadingPlugin {
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.baseURI)
 					.tap("ImportScriptsChunkLoadingPlugin", handler);
+				compilation.hooks.runtimeRequirementInTree
+					.for(RuntimeGlobals.onChunksLoaded)
+					.tap("ImportScriptsChunkLoadingPlugin", handler);
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.ensureChunkHandlers)

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -69,6 +69,9 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		const withLoading = this.runtimeRequirements.has(
 			RuntimeGlobals.ensureChunkHandlers
 		);
+		const withCallback = this.runtimeRequirements.has(
+			RuntimeGlobals.chunkCallback
+		);
 		const withHmr = this.runtimeRequirements.has(
 			RuntimeGlobals.hmrDownloadUpdateHandlers
 		);
@@ -107,7 +110,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 			),
 			"};",
 			"",
-			withLoading
+			withCallback || withLoading
 				? Template.asString([
 						"// importScripts chunk loading",
 						`var installChunk = ${runtimeTemplate.basicFunction("data", [
@@ -131,31 +134,33 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 						])};`
 					])
 				: "// no chunk install function needed",
-			withLoading
+			withCallback || withLoading
 				? Template.asString([
-						`${fn}.i = ${runtimeTemplate.basicFunction(
-							"chunkId, promises",
-							hasJsMatcher !== false
-								? [
-										'// "1" is the signal for "already loaded"',
-										"if(!installedChunks[chunkId]) {",
-										Template.indent([
-											hasJsMatcher === true
-												? "if(true) { // all chunks have JS"
-												: `if(${hasJsMatcher("chunkId")}) {`,
-											Template.indent(
-												`importScripts(${
-													withCreateScriptUrl
-														? `${RuntimeGlobals.createScriptUrl}(${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId))`
-														: `${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId)`
-												});`
-											),
-											"}"
-										]),
-										"}"
-									]
-								: "installedChunks[chunkId] = 1;"
-						)};`,
+						withLoading
+							? `${fn}.i = ${runtimeTemplate.basicFunction(
+									"chunkId, promises",
+									hasJsMatcher !== false
+										? [
+												'// "1" is the signal for "already loaded"',
+												"if(!installedChunks[chunkId]) {",
+												Template.indent([
+													hasJsMatcher === true
+														? "if(true) { // all chunks have JS"
+														: `if(${hasJsMatcher("chunkId")}) {`,
+													Template.indent(
+														`importScripts(${
+															withCreateScriptUrl
+																? `${RuntimeGlobals.createScriptUrl}(${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId))`
+																: `${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId)`
+														});`
+													),
+													"}"
+												]),
+												"}"
+											]
+										: "installedChunks[chunkId] = 1;"
+								)};`
+							: "",
 						"",
 						`var chunkLoadingGlobal = ${chunkLoadingGlobalExpr} = ${chunkLoadingGlobalExpr} || [];`,
 						"var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.97.1",
+  "version": "5.99.0",
   "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",
@@ -23,9 +23,9 @@
     "loader-runner": "^4.2.0",
     "mime-types": "^2.1.27",
     "neo-async": "^2.6.2",
-    "schema-utils": "^3.2.0",
+    "schema-utils": "^4.3.0",
     "tapable": "^2.1.1",
-    "terser-webpack-plugin": "^5.3.10",
+    "terser-webpack-plugin": "^5.3.11",
     "watchpack": "^2.4.1",
     "webpack-sources": "^3.2.3"
   },
@@ -35,16 +35,16 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.25.8",
+    "@babel/core": "^7.26.8",
     "@babel/preset-react": "^7.25.7",
-    "@eslint/js": "^9.12.0",
-    "@stylistic/eslint-plugin": "^2.9.0",
+    "@eslint/js": "^9.21.0",
+    "@stylistic/eslint-plugin": "^4.2.0",
     "@types/glob-to-regexp": "^0.4.4",
     "@types/jest": "^29.5.11",
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^22.0.0",
-    "assemblyscript": "^0.27.30",
-    "babel-loader": "^9.1.3",
+    "@types/node": "^22.13.10",
+    "assemblyscript": "^0.27.34",
+    "babel-loader": "^10.0.0",
     "benchmark": "^2.1.4",
     "bundle-loader": "^0.5.6",
     "coffee-loader": "^5.0.0",
@@ -55,19 +55,18 @@
     "date-fns": "^4.0.0",
     "es5-ext": "^0.10.53",
     "es6-promise-polyfill": "^1.2.0",
-    "eslint": "^9.12.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^9.21.0",
+    "eslint-config-prettier": "^10.1.1",
     "eslint-plugin-jest": "^28.6.0",
-    "eslint-plugin-jsdoc": "^48.10.1",
-    "eslint-plugin-n": "^17.11.1",
+    "eslint-plugin-jsdoc": "^50.6.3",
+    "eslint-plugin-n": "^17.16.2",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^56.0.0",
+    "eslint-plugin-unicorn": "^58.0.0",
     "file-loader": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
-    "globals": "^15.4.0",
+    "globals": "^16.0.0",
     "hash-wasm": "^4.9.0",
     "husky": "^9.0.11",
-    "is-ci": "^3.0.0",
     "istanbul": "^0.4.5",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
@@ -87,28 +86,28 @@
     "mini-svg-data-uri": "^1.2.3",
     "nyc": "^17.1.0",
     "open-cli": "^8.0.0",
-    "prettier": "^3.2.1",
+    "prettier": "^3.5.1",
     "prettier-2": "npm:prettier@^2",
     "pretty-format": "^29.5.0",
     "pug": "^3.0.3",
     "pug-loader": "^2.4.0",
     "raw-loader": "^4.0.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "rimraf": "^3.0.2",
     "script-loader": "^0.7.2",
     "simple-git": "^3.27.0",
     "strip-ansi": "^6.0.0",
     "style-loader": "^4.0.0",
-    "terser": "^5.34.1",
+    "terser": "^5.38.1",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.23.5",
+    "tooling": "webpack/tooling#v1.23.7",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.6.2",
+    "typescript": "^5.8.2",
     "url-loader": "^4.1.0",
     "wast-loader": "^1.12.1",
     "webassembly-feature": "1.3.0",
-    "webpack-cli": "^5.0.1",
+    "webpack-cli": "^6.0.1",
     "xxhashjs": "^0.2.2",
     "yamljs": "^0.3.0",
     "yarn-deduplicate": "^6.0.1"
@@ -153,8 +152,9 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "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 --cache .",
+    "code-lint": "node node_modules/eslint/bin/eslint.js --cache .",
     "type-lint": "tsc",
+    "type-validate": "tsc -p tsconfig.validation.json",
     "typings-test": "tsc -p tsconfig.types.test.json",
     "module-typings-test": "tsc -p tsconfig.module.test.json",
     "spellcheck": "cspell --cache --no-must-find-files --quiet \"**/*.*\"",
@@ -182,11 +182,12 @@
   },
   "lint-staged": {
     "*.{js,cjs,mjs}": [
-      "eslint --cache --fix"
+      "node node_modules/eslint/bin/eslint.js --cache --fix"
     ],
     "*": [
       "node node_modules/prettier/bin/prettier.cjs --cache --write --ignore-unknown",
       "cspell --cache --no-must-find-files"
     ]
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }