webpack 5.90.2 → 5.91.0

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -25,6 +25,14 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("./WebAssemblyUtils").UsedWasmDependency} UsedWasmDependency */
+/** @typedef {import("@webassemblyjs/ast").Instruction} Instruction */
+/** @typedef {import("@webassemblyjs/ast").ModuleImport} ModuleImport */
+/** @typedef {import("@webassemblyjs/ast").ModuleExport} ModuleExport */
+/** @typedef {import("@webassemblyjs/ast").Global} Global */
+/**
+ * @template T
+ * @typedef {import("@webassemblyjs/ast").NodePath<T>} NodePath
+ */
 
 /**
  * @typedef {(buf: ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
@@ -32,7 +40,7 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 
 /**
  * @template T
- * @param {Function[]} fns transforms
+ * @param {((prev: ArrayBuffer) => ArrayBuffer)[]} fns transforms
  * @returns {Function} composed transform
  */
 const compose = (...fns) => {
@@ -47,7 +55,8 @@ const compose = (...fns) => {
 /**
  * Removes the start instruction
  *
- * @param {Object} state unused state
+ * @param {Object} state state
+ * @param {Object} state.ast Module's ast
  * @returns {ArrayBufferTransform} transform
  */
 const removeStartFunc = state => bin => {
@@ -118,7 +127,7 @@ const getNextTypeIndex = ast => {
 /**
  * Get next func index
  *
- * The Func section metadata provide informations for implemented funcs
+ * 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.
  *
@@ -169,7 +178,9 @@ const createDefaultInitForGlobal = globalType => {
  *
  * Note that globals will become mutable.
  *
- * @param {Object} state unused state
+ * @param {Object} state transformation state
+ * @param {Object} state.ast Module's ast
+ * @param {t.Instruction[]} state.additionalInitCode list of addition instructions for the init function
  * @returns {ArrayBufferTransform} transform
  */
 const rewriteImportedGlobals = state => bin => {
@@ -180,7 +191,7 @@ const rewriteImportedGlobals = state => bin => {
 	bin = editWithAST(state.ast, bin, {
 		ModuleImport(path) {
 			if (t.isGlobalType(path.node.descr)) {
-				const globalType = path.node.descr;
+				const globalType = /** @type {TODO} */ (path.node.descr);
 
 				globalType.mutability = "var";
 
@@ -197,6 +208,9 @@ const rewriteImportedGlobals = state => bin => {
 
 		// in order to preserve non-imported global's order we need to re-inject
 		// those as well
+		/**
+		 * @param {NodePath<Global>} path path
+		 */
 		Global(path) {
 			const { node } = path;
 			const [init] = node.init;
@@ -246,6 +260,9 @@ const rewriteExportNames =
 	({ ast, moduleGraph, module, externalExports, runtime }) =>
 	bin => {
 		return editWithAST(ast, bin, {
+			/**
+			 * @param {NodePath<ModuleExport>} path path
+			 */
 			ModuleExport(path) {
 				const isExternal = externalExports.has(path.node.name);
 				if (isExternal) {
@@ -259,7 +276,7 @@ const rewriteExportNames =
 					path.remove();
 					return;
 				}
-				path.node.name = usedName;
+				path.node.name = /** @type {string} */ (usedName);
 			}
 		});
 	};
@@ -275,6 +292,9 @@ const rewriteImports =
 	({ ast, usedDependencyMap }) =>
 	bin => {
 		return editWithAST(ast, bin, {
+			/**
+			 * @param {NodePath<ModuleImport>} path path
+			 */
 			ModuleImport(path) {
 				const result = usedDependencyMap.get(
 					path.node.module + ":" + path.node.name
@@ -326,6 +346,7 @@ const addInitFunction =
 			);
 		});
 
+		/** @type {Instruction[]} */
 		const funcBody = [];
 		importedGlobals.forEach((importedGlobal, index) => {
 			const args = [t.indexLiteral(index)];

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/wasm-sync/WebAssemblyParser.js

@@ -97,8 +97,9 @@ class WebAssemblyParser extends Parser {
 		// extract imports and exports
 		/** @type {string[]} */
 		const exports = [];
-		let jsIncompatibleExports = (state.module.buildMeta.jsIncompatibleExports =
-			undefined);
+		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
+		/** @type {Record<string, string> | undefined} */
+		let jsIncompatibleExports = (buildMeta.jsIncompatibleExports = undefined);
 
 		/** @type {TODO[]} */
 		const importedGlobals = [];
@@ -118,7 +119,8 @@ class WebAssemblyParser extends Parser {
 					if (incompatibleType) {
 						if (jsIncompatibleExports === undefined) {
 							jsIncompatibleExports =
-								state.module.buildMeta.jsIncompatibleExports = {};
+								/** @type {BuildMeta} */
+								(state.module.buildMeta).jsIncompatibleExports = {};
 						}
 						jsIncompatibleExports[node.name] = incompatibleType;
 					}
@@ -127,7 +129,8 @@ class WebAssemblyParser extends Parser {
 				exports.push(node.name);
 
 				if (node.descr && node.descr.exportType === "Global") {
-					const refNode = importedGlobals[node.descr.id.value];
+					const refNode =
+						importedGlobals[/** @type {TODO} */ (node.descr.id.value)];
 					if (refNode) {
 						const dep = new WebAssemblyExportImportedDependency(
 							node.name,

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -15,6 +15,7 @@ const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 /**
  * @typedef {Object} JsonpCompilationPluginHooks
@@ -48,7 +49,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @param {Set<string>} runtimeRequirements runtime requirements
+	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
 	 */
 	constructor(runtimeRequirements) {
 		super("jsonp chunk loading", RuntimeModule.STAGE_ATTACH);

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);
 			}
@@ -111,7 +113,7 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 	/**
 	 * @param {WebpackOptions | (ReadonlyArray<WebpackOptions> & MultiCompilerOptions)} options options
 	 * @param {Callback<Stats> & Callback<MultiStats>=} callback callback
-	 * @returns {Compiler | MultiCompiler} Compiler or MultiCompiler
+	 * @returns {Compiler | MultiCompiler | null} Compiler or MultiCompiler
 	 */
 	(options, callback) => {
 		const create = () => {
@@ -154,13 +156,17 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 				} else {
 					compiler.run((err, stats) => {
 						compiler.close(err2 => {
-							callback(err || err2, stats);
+							callback(
+								err || err2,
+								/** @type {options extends WebpackOptions ? Stats : MultiStats} */
+								(stats)
+							);
 						});
 					});
 				}
 				return compiler;
 			} catch (err) {
-				process.nextTick(() => callback(err));
+				process.nextTick(() => callback(/** @type {Error} */ (err)));
 				return null;
 			}
 		} else {

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -18,10 +18,11 @@ const { getUndoPath } = require("../util/identifier");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 	/**
-	 * @param {Set<string>} runtimeRequirements runtime requirements
+	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
 	 * @param {boolean} withCreateScriptUrl with createScriptUrl support
 	 */
 	constructor(runtimeRequirements, withCreateScriptUrl) {

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "webpack",
-  "version": "5.90.2",
+  "version": "5.91.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",
   "dependencies": {
     "@types/eslint-scope": "^3.7.3",
     "@types/estree": "^1.0.5",
-    "@webassemblyjs/ast": "^1.11.5",
-    "@webassemblyjs/wasm-edit": "^1.11.5",
-    "@webassemblyjs/wasm-parser": "^1.11.5",
+    "@webassemblyjs/ast": "^1.12.1",
+    "@webassemblyjs/wasm-edit": "^1.12.1",
+    "@webassemblyjs/wasm-parser": "^1.12.1",
     "acorn": "^8.7.1",
     "acorn-import-assertions": "^1.9.0",
     "browserslist": "^4.21.10",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.15.0",
+    "enhanced-resolve": "^5.16.0",
     "es-module-lexer": "^1.2.1",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
     "glob-to-regexp": "^0.4.1",
-    "graceful-fs": "^4.2.9",
+    "graceful-fs": "^4.2.11",
     "json-parse-even-better-errors": "^2.3.1",
     "loader-runner": "^4.2.0",
     "mime-types": "^2.1.27",
@@ -27,7 +27,7 @@
     "schema-utils": "^3.2.0",
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.3.10",
-    "watchpack": "^2.4.0",
+    "watchpack": "^2.4.1",
     "webpack-sources": "^3.2.3"
   },
   "peerDependenciesMeta": {
@@ -38,9 +38,10 @@
   "devDependencies": {
     "@babel/core": "^7.23.7",
     "@babel/preset-react": "^7.23.3",
+    "@types/glob-to-regexp": "^0.4.4",
     "@types/jest": "^29.5.11",
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^20.1.7",
+    "@types/node": "^20.11.27",
     "assemblyscript": "^0.27.22",
     "babel-loader": "^8.1.0",
     "benchmark": "^2.1.4",
@@ -49,7 +50,7 @@
     "coffeescript": "^2.5.1",
     "core-js": "^3.6.5",
     "coveralls": "^3.1.0",
-    "cspell": "^6.31.1",
+    "cspell": "^8.6.0",
     "css-loader": "^5.0.1",
     "date-fns": "^3.2.0",
     "es5-ext": "^0.10.53",
@@ -61,9 +62,9 @@
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-prettier": "^5.1.3",
     "file-loader": "^6.0.0",
-    "fork-ts-checker-webpack-plugin": "^8.0.0",
+    "fork-ts-checker-webpack-plugin": "^9.0.2",
     "hash-wasm": "^4.9.0",
-    "husky": "^8.0.3",
+    "husky": "^9.0.11",
     "is-ci": "^3.0.0",
     "istanbul": "^0.4.5",
     "jest": "^29.7.0",
@@ -76,16 +77,16 @@
     "json5": "^2.1.3",
     "less": "^4.0.0",
     "less-loader": "^8.0.0",
-    "lint-staged": "^13.2.1",
+    "lint-staged": "^15.2.2",
     "lodash": "^4.17.19",
     "lodash-es": "^4.17.15",
-    "memfs": "^3.5.0",
+    "memfs": "^4.7.7",
     "mini-css-extract-plugin": "^1.6.1",
     "mini-svg-data-uri": "^1.2.3",
     "nyc": "^15.1.0",
-    "open-cli": "^7.2.0",
-    "prettier-2": "npm:prettier@^2",
+    "open-cli": "^8.0.0",
     "prettier": "^3.2.1",
+    "prettier-2": "npm:prettier@^2",
     "pretty-format": "^29.5.0",
     "pug": "^3.0.0",
     "pug-loader": "^2.4.0",
@@ -99,11 +100,11 @@
     "style-loader": "^2.0.0",
     "terser": "^5.26.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.23.1",
-    "ts-loader": "^9.4.2",
-    "typescript": "^5.0.4",
+    "tooling": "webpack/tooling#v1.23.3",
+    "ts-loader": "^9.5.1",
+    "typescript": "^5.4.2",
     "url-loader": "^4.1.0",
-    "wast-loader": "^1.11.5",
+    "wast-loader": "^1.12.1",
     "webassembly-feature": "1.3.0",
     "webpack-cli": "^5.0.1",
     "xxhashjs": "^0.2.2",
@@ -154,12 +155,12 @@
     "type-lint": "tsc",
     "typings-test": "tsc -p tsconfig.types.test.json",
     "module-typings-test": "tsc -p tsconfig.module.test.json",
-    "spellcheck": "cspell --no-progress \"**\"",
+    "spellcheck": "cspell --cache --no-must-find-files --quiet \"**/*.*\"",
     "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": "node node_modules/prettier/bin/prettier.cjs --cache .",
+    "prepare": "husky",
+    "pretty-lint-base": "node node_modules/prettier/bin/prettier.cjs --cache --ignore-unknown .",
     "pretty-lint-fix": "yarn pretty-lint-base --loglevel warn --write",
     "pretty-lint": "yarn pretty-lint-base --check",
     "yarn-lint": "yarn-deduplicate --fail --list -s highest yarn.lock",
@@ -182,10 +183,8 @@
       "eslint --cache --fix"
     ],
     "*": [
-      "prettier --cache --ignore-unknown"
-    ],
-    "*.md|{.github,benchmark,bin,examples,hot,lib,schemas,setup,tooling}/**/*.{md,yml,yaml,js,json}": [
-      "cspell"
+      "prettier --cache --write --ignore-unknown",
+      "cspell --cache --no-must-find-files"
     ]
   }
 }