webpack 5.85.0 → 5.88.1

package/lib/wasm-async/AsyncWasmLoadingRuntimeModule.js

@@ -9,6 +9,9 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Compilation")} Compilation */
+
 /**
  * @typedef {Object} AsyncWasmLoadingRuntimeModuleOptions
  * @property {function(string): string} generateLoadBinaryCode
@@ -26,10 +29,11 @@ class AsyncWasmLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const { compilation, chunk } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const { outputOptions, runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.instantiateWasm;
 		const wasmModuleSrcPath = compilation.getPath(

package/lib/wasm-async/AsyncWebAssemblyParser.js

@@ -11,6 +11,8 @@ const Parser = require("../Parser");
 const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 
@@ -43,9 +45,11 @@ class WebAssemblyParser extends Parser {
 		}
 
 		// flag it as async module
-		state.module.buildInfo.strict = true;
-		state.module.buildMeta.exportsType = "namespace";
-		state.module.buildMeta.async = true;
+		const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);
+		buildInfo.strict = true;
+		const BuildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
+		BuildMeta.exportsType = "namespace";
+		BuildMeta.async = true;
 
 		// parse it
 		const program = decode(source, decoderOpts);

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -10,6 +10,7 @@ const Template = require("../Template");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
+/** @typedef {import("@webassemblyjs/ast").Signature} Signature */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
@@ -91,9 +92,11 @@ const generateImportObject = (
 				value: `${instanceVar}[${JSON.stringify(usedName)}]`
 			});
 		} else {
-			const params = description.signature.params.map(
-				(param, k) => "p" + k + param.valtype
-			);
+			const params =
+				/** @type {Signature} */
+				(description.signature).params.map(
+					(param, k) => "p" + k + param.valtype
+				);
 
 			const mod = `${RuntimeGlobals.moduleCache}[${JSON.stringify(
 				chunkGraph.getModuleId(importedModule)
@@ -130,6 +133,7 @@ const generateImportObject = (
 			"};"
 		];
 	} else {
+		/** @type {Map<string, Array<{ name: string, value: string }>>} */
 		const propertiesByModule = new Map();
 		for (const p of properties) {
 			let list = propertiesByModule.get(p.module);
@@ -222,23 +226,26 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const { chunkGraph, compilation, chunk, mangleImports } = this;
-		const { moduleGraph, outputOptions } = compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withHmr = this._runtimeRequirements.has(
 			RuntimeGlobals.hmrDownloadUpdateHandlers
 		);
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { moduleGraph, outputOptions } = compilation;
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const wasmModules = getAllWasmModules(moduleGraph, chunkGraph, chunk);
+		const { mangleImports } = this;
 		/** @type {string[]} */
 		const declarations = [];
 		const importObjects = wasmModules.map(module => {
 			return generateImportObject(
 				chunkGraph,
 				module,
-				this.mangleImports,
+				mangleImports,
 				declarations,
 				chunk.runtime
 			);

package/lib/wasm-sync/WasmFinalizeExportsPlugin.js

@@ -11,6 +11,7 @@ const UnsupportedWebAssemblyFeatureError = require("./UnsupportedWebAssemblyFeat
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 
 class WasmFinalizeExportsPlugin {
 	/**
@@ -27,7 +28,8 @@ class WasmFinalizeExportsPlugin {
 						// 1. if a WebAssembly module
 						if (module.type.startsWith("webassembly") === true) {
 							const jsIncompatibleExports =
-								module.buildMeta.jsIncompatibleExports;
+								/** @type {BuildMeta} */
+								(module.buildMeta).jsIncompatibleExports;
 
 							if (jsIncompatibleExports === undefined) {
 								continue;

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -174,6 +174,7 @@ const createDefaultInitForGlobal = globalType => {
  */
 const rewriteImportedGlobals = state => bin => {
 	const additionalInitCode = state.additionalInitCode;
+	/** @type {Array<t.Global>} */
 	const newGlobals = [];
 
 	bin = editWithAST(state.ast, bin, {

package/lib/wasm-sync/WebAssemblyParser.js

@@ -14,6 +14,8 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 
@@ -81,8 +83,10 @@ class WebAssemblyParser extends Parser {
 		}
 
 		// flag it as ESM
-		state.module.buildInfo.strict = true;
-		state.module.buildMeta.exportsType = "namespace";
+		/** @type {BuildInfo} */
+		(state.module.buildInfo).strict = true;
+		/** @type {BuildMeta} */
+		(state.module.buildMeta).exportsType = "namespace";
 
 		// parse it
 		const program = decode(source, decoderOpts);

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -14,6 +14,7 @@ const { getInitialChunkIds } = require("../javascript/StartupHelpers");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
 
 /**
  * @typedef {Object} JsonpCompilationPluginHooks
@@ -69,10 +70,10 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const { chunkGraph, compilation, chunk } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const {
 			runtimeTemplate,
 			outputOptions: {
@@ -108,9 +109,14 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		const withPreload = this._runtimeRequirements.has(
 			RuntimeGlobals.preloadChunkHandlers
 		);
+		const withFetchPriority = this._runtimeRequirements.has(
+			RuntimeGlobals.hasFetchPriority
+		);
 		const chunkLoadingGlobalExpr = `${globalObject}[${JSON.stringify(
 			chunkLoadingGlobal
 		)}]`;
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const conditionMap = chunkGraph.getChunkConditionMap(chunk, chunkHasJs);
 		const hasJsMatcher = compileBooleanMatcher(conditionMap);
 		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph, chunkHasJs);
@@ -138,7 +144,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 			withLoading
 				? Template.asString([
 						`${fn}.j = ${runtimeTemplate.basicFunction(
-							"chunkId, promises",
+							`chunkId, promises${withFetchPriority ? ", fetchPriority" : ""}`,
 							hasJsMatcher !== false
 								? Template.indent([
 										"// JSONP chunk loading for javascript",
@@ -190,7 +196,11 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 															"}"
 														]
 													)};`,
-													`${RuntimeGlobals.loadScript}(url, loadingEnded, "chunk-" + chunkId, chunkId);`
+													`${
+														RuntimeGlobals.loadScript
+													}(url, loadingEnded, "chunk-" + chunkId, chunkId${
+														withFetchPriority ? ", fetchPriority" : ""
+													});`
 												]),
 												hasJsMatcher === true
 													? "}"

package/lib/webpack.js

@@ -61,7 +61,10 @@ const createMultiCompiler = (childOptions, options) => {
 const createCompiler = rawOptions => {
 	const options = getNormalizedWebpackOptions(rawOptions);
 	applyWebpackOptionsBaseDefaults(options);
-	const compiler = new Compiler(options.context, options);
+	const compiler = new Compiler(
+		/** @type {string} */ (options.context),
+		options
+	);
 	new NodeEnvironmentPlugin({
 		infrastructureLogging: options.infrastructureLogging
 	}).apply(compiler);
@@ -69,7 +72,7 @@ const createCompiler = rawOptions => {
 		for (const plugin of options.plugins) {
 			if (typeof plugin === "function") {
 				plugin.call(compiler, compiler);
-			} else {
+			} else if (plugin) {
 				plugin.apply(compiler);
 			}
 		}
@@ -96,6 +99,11 @@ const createCompiler = rawOptions => {
  * @returns {MultiCompiler} the multi compiler object
  */
 
+/**
+ * @template T
+ * @param {Array<T> | T} options options
+ * @returns {Array<T>} array of options
+ */
 const asArray = options =>
 	Array.isArray(options) ? Array.from(options) : [options];
 
@@ -117,6 +125,7 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 			}
 			/** @type {MultiCompiler|Compiler} */
 			let compiler;
+			/** @type {boolean | undefined} */
 			let watch = false;
 			/** @type {WatchOptions|WatchOptions[]} */
 			let watchOptions;

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -16,6 +16,8 @@ const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const { getUndoPath } = require("../util/identifier");
 
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Compilation")} Compilation */
 
 class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 	/**
@@ -38,8 +40,9 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
 		}
-		const outputName = this.compilation.getPath(
-			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const outputName = compilation.getPath(
+			getChunkFilenameTemplate(chunk, compilation.outputOptions),
 			{
 				chunk,
 				contentHashType: "javascript"
@@ -47,7 +50,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			/** @type {string} */ (this.compilation.outputOptions.path),
+			/** @type {string} */ (compilation.outputOptions.path),
 			false
 		);
 		return `${RuntimeGlobals.baseURI} = self.location + ${JSON.stringify(
@@ -56,19 +59,10 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const {
-			chunk,
-			chunkGraph,
-			compilation: {
-				runtimeTemplate,
-				outputOptions: { chunkLoadingGlobal, hotUpdateGlobal }
-			},
-			_withCreateScriptUrl: withCreateScriptUrl
-		} = this;
-		const globalObject = runtimeTemplate.globalObject;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this.runtimeRequirements.has(RuntimeGlobals.baseURI);
 		const withLoading = this.runtimeRequirements.has(
@@ -80,9 +74,12 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		const withHmrManifest = this.runtimeRequirements.has(
 			RuntimeGlobals.hmrDownloadManifest
 		);
+		const globalObject = compilation.runtimeTemplate.globalObject;
 		const chunkLoadingGlobalExpr = `${globalObject}[${JSON.stringify(
-			chunkLoadingGlobal
+			compilation.outputOptions.chunkLoadingGlobal
 		)}]`;
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const hasJsMatcher = compileBooleanMatcher(
 			chunkGraph.getChunkConditionMap(chunk, chunkHasJs)
 		);
@@ -91,6 +88,8 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		const stateExpression = withHmr
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_importScripts`
 			: undefined;
+		const runtimeTemplate = compilation.runtimeTemplate;
+		const { _withCreateScriptUrl: withCreateScriptUrl } = this;
 
 		return Template.asString([
 			withBaseURI ? this._generateBaseUri(chunk) : "// no baseURI",
@@ -169,7 +168,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 						Template.indent([
 							"var success = false;",
 							`${globalObject}[${JSON.stringify(
-								hotUpdateGlobal
+								compilation.outputOptions.hotUpdateGlobal
 							)}] = ${runtimeTemplate.basicFunction("_, moreModules, runtime", [
 								"for(var moduleId in moreModules) {",
 								Template.indent([

package/module.d.ts

@@ -174,6 +174,7 @@ interface ImportMeta {
 			exclude?: RegExp;
 			preload?: boolean | number;
 			prefetch?: boolean | number;
+			fetchPriority?: "low" | "high" | "auto";
 			chunkName?: string;
 			exports?: string | string[][];
 			mode?: "sync" | "eager" | "weak" | "lazy" | "lazy-once";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.85.0",
+  "version": "5.88.1",
   "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",
@@ -14,7 +14,7 @@
     "acorn-import-assertions": "^1.9.0",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.14.1",
+    "enhanced-resolve": "^5.15.0",
     "es-module-lexer": "^1.2.1",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
@@ -24,7 +24,7 @@
     "loader-runner": "^4.2.0",
     "mime-types": "^2.1.27",
     "neo-async": "^2.6.2",
-    "schema-utils": "^3.1.2",
+    "schema-utils": "^3.2.0",
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.3.7",
     "watchpack": "^2.4.0",
@@ -39,6 +39,7 @@
     "@babel/core": "^7.21.4",
     "@babel/preset-react": "^7.18.6",
     "@types/jest": "^29.5.0",
+    "@types/mime-types": "^2.1.1",
     "@types/node": "^20.1.7",
     "assemblyscript": "^0.27.2",
     "babel-loader": "^8.1.0",
@@ -97,7 +98,7 @@
     "style-loader": "^2.0.0",
     "terser": "^5.17.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.22.1",
+    "tooling": "webpack/tooling#v1.23.0",
     "ts-loader": "^9.4.2",
     "typescript": "^5.0.4",
     "url-loader": "^4.1.0",