webpack 5.93.0 → 5.95.0

package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -208,9 +208,9 @@ class AsyncWebAssemblyModulesPlugin {
 					hooks.renderModuleContent.call(moduleSource, module, renderContext),
 				"AsyncWebAssemblyModulesPlugin.getCompilationHooks().renderModuleContent"
 			);
-		} catch (e) {
-			/** @type {WebpackError} */ (e).module = module;
-			throw e;
+		} catch (err) {
+			/** @type {WebpackError} */ (err).module = module;
+			throw err;
 		}
 	}
 }

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -13,6 +13,7 @@ const WebAssemblyUtils = require("./WebAssemblyUtils");
 /** @typedef {import("@webassemblyjs/ast").Signature} Signature */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
@@ -89,7 +90,8 @@ const generateImportObject = (
 			const instanceVar = `m${waitForInstances.size}`;
 			waitForInstances.set(
 				instanceVar,
-				chunkGraph.getModuleId(/** @type {Module} */ (importedModule))
+				/** @type {ModuleId} */
+				(chunkGraph.getModuleId(/** @type {Module} */ (importedModule)))
 			);
 			properties.push({
 				module,
@@ -100,7 +102,7 @@ const generateImportObject = (
 			const params =
 				/** @type {Signature} */
 				(description.signature).params.map(
-					(param, k) => "p" + k + param.valtype
+					(param, k) => `p${k}${param.valtype}`
 				);
 
 			const mod = `${RuntimeGlobals.moduleCache}[${JSON.stringify(
@@ -121,7 +123,7 @@ const generateImportObject = (
 				module,
 				name,
 				value: Template.asString([
-					modCode + `function(${params}) {`,
+					`${modCode}function(${params}) {`,
 					Template.indent([
 						`if(${cache} === undefined) ${cache} = ${modExports};`,
 						`return ${cache}[${JSON.stringify(usedName)}](${params});`
@@ -154,15 +156,15 @@ const generateImportObject = (
 		importObject = [
 			"return {",
 			Template.indent([
-				Array.from(propertiesByModule, ([module, list]) => {
-					return Template.asString([
+				Array.from(propertiesByModule, ([module, list]) =>
+					Template.asString([
 						`${JSON.stringify(module)}: {`,
 						Template.indent([
 							list.map(p => `${JSON.stringify(p.name)}: ${p.value}`).join(",\n")
 						]),
 						"}"
-					]);
-				}).join(",\n")
+					])
+				).join(",\n")
 			]),
 			"};"
 		];
@@ -200,13 +202,12 @@ const generateImportObject = (
 			]),
 			"},"
 		]);
-	} else {
-		return Template.asString([
-			`${moduleIdStringified}: function() {`,
-			Template.indent(importObject),
-			"},"
-		]);
 	}
+	return Template.asString([
+		`${moduleIdStringified}: function() {`,
+		Template.indent(importObject),
+		"},"
+	]);
 };
 
 /**
@@ -250,15 +251,15 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 		const { mangleImports } = this;
 		/** @type {string[]} */
 		const declarations = [];
-		const importObjects = wasmModules.map(module => {
-			return generateImportObject(
+		const importObjects = wasmModules.map(module =>
+			generateImportObject(
 				chunkGraph,
 				module,
 				mangleImports,
 				declarations,
 				chunk.runtime
-			);
-		});
+			)
+		);
 		const chunkModuleIdMap = chunkGraph.getChunkModuleIdMap(chunk, m =>
 			m.type.startsWith("webassembly")
 		);
@@ -331,7 +332,7 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 			`${fn}.wasm = function(chunkId, promises) {`,
 			Template.indent([
 				"",
-				`var wasmModules = wasmModuleMap[chunkId] || [];`,
+				"var wasmModules = wasmModuleMap[chunkId] || [];",
 				"",
 				"wasmModules.forEach(function(wasmModuleId, idx) {",
 				Template.indent([
@@ -342,7 +343,7 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 					Template.indent(["promises.push(installedWasmModuleData);"]),
 					"else {",
 					Template.indent([
-						`var importObject = wasmImportObjects[wasmModuleId]();`,
+						"var importObject = wasmImportObjects[wasmModuleId]();",
 						`var req = ${this.generateLoadBinaryCode(wasmModuleSrcPath)};`,
 						"var promise;",
 						this.supportsStreaming

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -43,33 +43,27 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
  * @param {((prev: ArrayBuffer) => ArrayBuffer)[]} fns transforms
  * @returns {Function} composed transform
  */
-const compose = (...fns) => {
-	return fns.reduce(
-		(prevFn, nextFn) => {
-			return value => nextFn(prevFn(value));
-		},
+const compose = (...fns) =>
+	fns.reduce(
+		(prevFn, nextFn) => value => nextFn(prevFn(value)),
 		value => value
 	);
-};
 
 /**
  * Removes the start instruction
- *
  * @param {object} state state
  * @param {object} state.ast Module's ast
  * @returns {ArrayBufferTransform} transform
  */
-const removeStartFunc = state => bin => {
-	return editWithAST(state.ast, bin, {
+const removeStartFunc = state => bin =>
+	editWithAST(state.ast, bin, {
 		Start(path) {
 			path.remove();
 		}
 	});
-};
 
 /**
  * Get imported globals
- *
  * @param {object} ast Module's AST
  * @returns {t.ModuleImport[]} - nodes
  */
@@ -90,7 +84,6 @@ const getImportedGlobals = ast => {
 
 /**
  * Get the count for imported func
- *
  * @param {object} ast Module's AST
  * @returns {number} - count
  */
@@ -110,7 +103,6 @@ const getCountImportedFunc = ast => {
 
 /**
  * Get next type index
- *
  * @param {object} ast Module's AST
  * @returns {t.Index} - index
  */
@@ -126,11 +118,9 @@ const getNextTypeIndex = ast => {
 
 /**
  * Get next func index
- *
  * 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 {number} countImportedFunc number of imported funcs
  * @returns {t.Index} - index
@@ -163,9 +153,8 @@ const createDefaultInitForGlobal = globalType => {
 		return t.objectInstruction("const", globalType.valtype, [
 			t.floatLiteral(66, false, false, "66")
 		]);
-	} else {
-		throw new Error("unknown type: " + globalType.valtype);
 	}
+	throw new Error(`unknown type: ${globalType.valtype}`);
 };
 
 /**
@@ -177,7 +166,6 @@ const createDefaultInitForGlobal = globalType => {
  * indices will be preserved.
  *
  * Note that globals will become mutable.
- *
  * @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
@@ -258,8 +246,8 @@ const rewriteImportedGlobals = state => bin => {
  */
 const rewriteExportNames =
 	({ ast, moduleGraph, module, externalExports, runtime }) =>
-	bin => {
-		return editWithAST(ast, bin, {
+	bin =>
+		editWithAST(ast, bin, {
 			/**
 			 * @param {NodePath<ModuleExport>} path path
 			 */
@@ -279,7 +267,6 @@ const rewriteExportNames =
 				path.node.name = /** @type {string} */ (usedName);
 			}
 		});
-	};
 
 /**
  * Mangle import names and modules
@@ -290,14 +277,14 @@ const rewriteExportNames =
  */
 const rewriteImports =
 	({ ast, usedDependencyMap }) =>
-	bin => {
-		return editWithAST(ast, bin, {
+	bin =>
+		editWithAST(ast, bin, {
 			/**
 			 * @param {NodePath<ModuleImport>} path path
 			 */
 			ModuleImport(path) {
 				const result = usedDependencyMap.get(
-					path.node.module + ":" + path.node.name
+					`${path.node.module}:${path.node.name}`
 				);
 
 				if (result !== undefined) {
@@ -306,13 +293,11 @@ const rewriteImports =
 				}
 			}
 		});
-	};
 
 /**
  * Add an init function.
  *
  * The init function fills the globals given input arguments.
- *
  * @param {object} state transformation state
  * @param {object} state.ast Module's ast
  * @param {t.Identifier} state.initFuncId identifier of the init function
@@ -348,7 +333,7 @@ const addInitFunction =
 
 		/** @type {Instruction[]} */
 		const funcBody = [];
-		importedGlobals.forEach((importedGlobal, index) => {
+		for (const [index, _importedGlobal] of importedGlobals.entries()) {
 			const args = [t.indexLiteral(index)];
 			const body = [
 				t.instruction("get_local", args),
@@ -356,7 +341,7 @@ const addInitFunction =
 			];
 
 			funcBody.push(...body);
-		});
+		}
 
 		if (typeof startAtFuncOffset === "number") {
 			funcBody.push(
@@ -410,7 +395,7 @@ const getUsedDependencyMap = (moduleGraph, module, mangle) => {
 		const dep = usedDep.dependency;
 		const request = dep.request;
 		const exportName = dep.name;
-		map.set(request + ":" + exportName, usedDep);
+		map.set(`${request}:${exportName}`, usedDep);
 	}
 	return map;
 };

package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js

@@ -201,7 +201,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 				copyAllExports
 					? `${module.moduleArgument}.exports = wasmExports;`
 					: "for(var name in wasmExports) " +
-						`if(name) ` +
+						"if(name) " +
 						`${module.exportsArgument}[name] = wasmExports[name];`,
 				"// exec imports from WebAssembly module (for esm order)",
 				importsCode,

package/lib/wasm-sync/WebAssemblyUtils.js

@@ -62,5 +62,5 @@ const getUsedDependencies = (moduleGraph, module, mangle) => {
 	return array;
 };
 
-exports.getUsedDependencies = getUsedDependencies;
-exports.MANGLED_MODULE = MANGLED_MODULE;
+module.exports.getUsedDependencies = getUsedDependencies;
+module.exports.MANGLED_MODULE = MANGLED_MODULE;

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -65,9 +65,8 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		const options = chunk.getEntryOptions();
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
-		} else {
-			return `${RuntimeGlobals.baseURI} = document.baseURI || self.location.href;`;
 		}
+		return `${RuntimeGlobals.baseURI} = document.baseURI || self.location.href;`;
 	}
 
 	/**
@@ -166,7 +165,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 												Template.indent([
 													"// setup Promise in chunk cache",
 													`var promise = new Promise(${runtimeTemplate.expressionFunction(
-														`installedChunkData = installedChunks[chunkId] = [resolve, reject]`,
+														"installedChunkData = installedChunks[chunkId] = [resolve, reject]",
 														"resolve, reject"
 													)});`,
 													"promises.push(installedChunkData[2] = promise);",

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -48,7 +48,9 @@ class ImportScriptsChunkLoadingPlugin {
 					if (onceForChunkSet.has(chunk)) return;
 					onceForChunkSet.add(chunk);
 					if (!isEnabledForChunk(chunk)) return;
-					const withCreateScriptUrl = !!compilation.outputOptions.trustedTypes;
+					const withCreateScriptUrl = Boolean(
+						compilation.outputOptions.trustedTypes
+					);
 					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
 					set.add(RuntimeGlobals.hasOwnProperty);
 					if (withCreateScriptUrl) {

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -55,7 +55,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 			false
 		);
 		return `${RuntimeGlobals.baseURI} = self.location + ${JSON.stringify(
-			rootOutputDir ? "/../" + rootOutputDir : ""
+			rootOutputDir ? `/../${rootOutputDir}` : ""
 		)};`;
 	}
 

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "webpack",
-  "version": "5.93.0",
+  "version": "5.95.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.12.1",
     "@webassemblyjs/wasm-edit": "^1.12.1",
@@ -14,7 +13,7 @@
     "acorn-import-attributes": "^1.9.5",
     "browserslist": "^4.21.10",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.17.0",
+    "enhanced-resolve": "^5.17.1",
     "es-module-lexer": "^1.2.1",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
@@ -39,29 +38,31 @@
     "@babel/core": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
     "@eslint/js": "^9.5.0",
+    "@stylistic/eslint-plugin": "^2.4.0",
+    "@types/eslint-scope": "^3.7.7",
     "@types/glob-to-regexp": "^0.4.4",
     "@types/jest": "^29.5.11",
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^20.11.27",
+    "@types/node": "^22.0.0",
     "assemblyscript": "^0.27.22",
-    "babel-loader": "^8.1.0",
+    "babel-loader": "^9.1.3",
     "benchmark": "^2.1.4",
     "bundle-loader": "^0.5.6",
-    "coffee-loader": "^1.0.0",
+    "coffee-loader": "^5.0.0",
     "coffeescript": "^2.5.1",
     "core-js": "^3.6.5",
-    "coveralls": "^3.1.0",
     "cspell": "^8.8.4",
-    "css-loader": "^5.0.1",
-    "date-fns": "^3.2.0",
+    "css-loader": "^7.1.2",
+    "date-fns": "^4.0.0",
     "es5-ext": "^0.10.53",
     "es6-promise-polyfill": "^1.2.0",
     "eslint": "^9.5.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^28.6.0",
-    "eslint-plugin-jsdoc": "^48.2.9",
+    "eslint-plugin-jsdoc": "^48.10.1",
     "eslint-plugin-n": "^17.8.1",
     "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-unicorn": "^55.0.0",
     "file-loader": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "globals": "^15.4.0",
@@ -78,12 +79,12 @@
     "json-loader": "^0.5.7",
     "json5": "^2.1.3",
     "less": "^4.0.0",
-    "less-loader": "^8.0.0",
+    "less-loader": "^12.2.0",
     "lint-staged": "^15.2.5",
     "lodash": "^4.17.19",
     "lodash-es": "^4.17.15",
     "memfs": "^4.9.2",
-    "mini-css-extract-plugin": "^1.6.1",
+    "mini-css-extract-plugin": "^2.9.0",
     "mini-svg-data-uri": "^1.2.3",
     "nyc": "^17.0.0",
     "open-cli": "^8.0.0",
@@ -99,12 +100,12 @@
     "script-loader": "^0.7.2",
     "simple-git": "^3.25.0",
     "strip-ansi": "^6.0.0",
-    "style-loader": "^2.0.0",
+    "style-loader": "^4.0.0",
     "terser": "^5.31.1",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.23.3",
+    "tooling": "webpack/tooling#v1.23.4",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.4.2",
+    "typescript": "^5.6.2",
     "url-loader": "^4.1.0",
     "wast-loader": "^1.12.1",
     "webassembly-feature": "1.3.0",
@@ -163,7 +164,7 @@
     "fix": "yarn code-lint --fix && yarn special-lint-fix && yarn pretty-lint-fix",
     "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-fix": "yarn pretty-lint-base --log-level warn --write",
     "pretty-lint": "yarn pretty-lint-base --check",
     "yarn-lint": "yarn-deduplicate --fail --list -s highest yarn.lock",
     "yarn-lint-fix": "yarn-deduplicate -s highest yarn.lock",
@@ -185,7 +186,7 @@
       "eslint --cache --fix"
     ],
     "*": [
-      "prettier --cache --write --ignore-unknown",
+      "node node_modules/prettier/bin/prettier.cjs --cache --write --ignore-unknown",
       "cspell --cache --no-must-find-files"
     ]
   }