webpack 5.85.0 → 5.88.1

package/lib/NodeStuffPlugin.js

@@ -21,14 +21,23 @@ const { relative } = require("./util/fs");
 const { parseResource } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
+/** @typedef {import("../declarations/WebpackOptions").NodeOptions} NodeOptions */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
+/** @typedef {import("./NormalModule")} NormalModule */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
 const PLUGIN_NAME = "NodeStuffPlugin";
 
 class NodeStuffPlugin {
+	/**
+	 * @param {NodeOptions} options options
+	 */
 	constructor(options) {
 		this.options = options;
 	}
@@ -43,6 +52,11 @@ class NodeStuffPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
+				/**
+				 * @param {JavascriptParser} parser the parser
+				 * @param {JavascriptParserOptions} parserOptions options
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (parserOptions.node === false) return;
 
@@ -56,10 +70,10 @@ class NodeStuffPlugin {
 						parser.hooks.expression.for("global").tap(PLUGIN_NAME, expr => {
 							const dep = new ConstDependency(
 								RuntimeGlobals.global,
-								expr.range,
+								/** @type {Range} */ (expr.range),
 								[RuntimeGlobals.global]
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 
 							// TODO webpack 6 remove
@@ -76,25 +90,31 @@ class NodeStuffPlugin {
 						parser.hooks.rename.for("global").tap(PLUGIN_NAME, expr => {
 							const dep = new ConstDependency(
 								RuntimeGlobals.global,
-								expr.range,
+								/** @type {Range} */ (expr.range),
 								[RuntimeGlobals.global]
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 							return false;
 						});
 					}
 
+					/**
+					 * @param {string} expressionName expression name
+					 * @param {(module: NormalModule) => string} fn function
+					 * @param {string=} warning warning
+					 * @returns {void}
+					 */
 					const setModuleConstant = (expressionName, fn, warning) => {
 						parser.hooks.expression
 							.for(expressionName)
 							.tap(PLUGIN_NAME, expr => {
 								const dep = new CachedConstDependency(
 									JSON.stringify(fn(parser.state.module)),
-									expr.range,
+									/** @type {Range} */ (expr.range),
 									expressionName
 								);
-								dep.loc = expr.loc;
+								dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 								parser.state.module.addPresentationalDependency(dep);
 
 								// TODO webpack 6 remove
@@ -108,6 +128,12 @@ class NodeStuffPlugin {
 							});
 					};
 
+					/**
+					 * @param {string} expressionName expression name
+					 * @param {string} value value
+					 * @param {string=} warning warning
+					 * @returns {void}
+					 */
 					const setConstant = (expressionName, value, warning) =>
 						setModuleConstant(expressionName, () => value, warning);
 

package/lib/ProgressPlugin.js

@@ -11,9 +11,20 @@ const NormalModule = require("./NormalModule");
 const createSchemaValidation = require("./util/create-schema-validation");
 const { contextify } = require("./util/identifier");
 
+/** @typedef {import("tapable").Tap} Tap */
 /** @typedef {import("../declarations/plugins/ProgressPlugin").HandlerFunction} HandlerFunction */
 /** @typedef {import("../declarations/plugins/ProgressPlugin").ProgressPluginArgument} ProgressPluginArgument */
 /** @typedef {import("../declarations/plugins/ProgressPlugin").ProgressPluginOptions} ProgressPluginOptions */
+/** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./Entrypoint").EntryOptions} EntryOptions */
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("./logging/Logger").Logger} Logger */
+
+/**
+ * @typedef {Object} CountsData
+ * @property {number} modulesCount modules count
+ * @property {number} dependenciesCount dependencies count
+ */
 
 const validate = createSchemaValidation(
 	require("../schemas/plugins/ProgressPlugin.check.js"),
@@ -23,14 +34,31 @@ const validate = createSchemaValidation(
 		baseDataPath: "options"
 	}
 );
+
+/**
+ * @param {number} a a
+ * @param {number} b b
+ * @param {number} c c
+ * @returns {number} median
+ */
 const median3 = (a, b, c) => {
 	return a + b + c - Math.max(a, b, c) - Math.min(a, b, c);
 };
 
+/**
+ * @param {boolean | null | undefined} profile need profile
+ * @param {Logger} logger logger
+ * @returns {defaultHandler} default handler
+ */
 const createDefaultHandler = (profile, logger) => {
-	/** @type {{ value: string, time: number }[]} */
+	/** @type {{ value: string | undefined, time: number }[]} */
 	const lastStateInfo = [];
 
+	/**
+	 * @param {number} percentage percentage
+	 * @param {string} msg message
+	 * @param {...string} args additional arguments
+	 */
 	const defaultHandler = (percentage, msg, ...args) => {
 		if (profile) {
 			if (percentage === 0) {
@@ -95,18 +123,18 @@ const createDefaultHandler = (profile, logger) => {
 
 /**
  * @callback ReportProgress
- * @param {number} p
- * @param {...string} [args]
+ * @param {number} p percentage
+ * @param {...string} args additional arguments
  * @returns {void}
  */
 
-/** @type {WeakMap<Compiler,ReportProgress>} */
+/** @type {WeakMap<Compiler, ReportProgress | undefined>} */
 const progressReporters = new WeakMap();
 
 class ProgressPlugin {
 	/**
 	 * @param {Compiler} compiler the current compiler
-	 * @returns {ReportProgress} a progress reporter, if any
+	 * @returns {ReportProgress | undefined} a progress reporter, if any
 	 */
 	static getReporter(compiler) {
 		return progressReporters.get(compiler);
@@ -288,6 +316,9 @@ class ProgressPlugin {
 		};
 
 		// only used when showActiveModules is set
+		/**
+		 * @param {Module} module the module
+		 */
 		const moduleBuild = module => {
 			const ident = module.identifier();
 			if (ident) {
@@ -297,11 +328,18 @@ class ProgressPlugin {
 			}
 		};
 
+		/**
+		 * @param {Dependency} entry entry dependency
+		 * @param {EntryOptions} options options object
+		 */
 		const entryAdd = (entry, options) => {
 			entriesCount++;
 			if (entriesCount < 5 || entriesCount % 10 === 0) updateThrottled();
 		};
 
+		/**
+		 * @param {Module} module the module
+		 */
 		const moduleDone = module => {
 			doneModules++;
 			if (showActiveModules) {
@@ -321,6 +359,10 @@ class ProgressPlugin {
 			if (doneModules < 50 || doneModules % 100 === 0) updateThrottled();
 		};
 
+		/**
+		 * @param {Dependency} entry entry dependency
+		 * @param {EntryOptions} options options object
+		 */
 		const entryDone = (entry, options) => {
 			doneEntries++;
 			update();
@@ -330,6 +372,7 @@ class ProgressPlugin {
 			.getCache("ProgressPlugin")
 			.getItemCache("counts", null);
 
+		/** @type {Promise<CountsData> | undefined} */
 		let cacheGetPromise;
 
 		compiler.hooks.beforeCompile.tap("ProgressPlugin", () => {
@@ -352,15 +395,17 @@ class ProgressPlugin {
 
 		compiler.hooks.afterCompile.tapPromise("ProgressPlugin", compilation => {
 			if (compilation.compiler.isChild()) return Promise.resolve();
-			return cacheGetPromise.then(async oldData => {
-				if (
-					!oldData ||
-					oldData.modulesCount !== modulesCount ||
-					oldData.dependenciesCount !== dependenciesCount
-				) {
-					await cache.storePromise({ modulesCount, dependenciesCount });
+			return /** @type {Promise<CountsData>} */ (cacheGetPromise).then(
+				async oldData => {
+					if (
+						!oldData ||
+						oldData.modulesCount !== modulesCount ||
+						oldData.dependenciesCount !== dependenciesCount
+					) {
+						await cache.storePromise({ modulesCount, dependenciesCount });
+					}
 				}
-			});
+			);
 		});
 
 		compiler.hooks.compilation.tap("ProgressPlugin", compilation => {
@@ -463,9 +508,9 @@ class ProgressPlugin {
 			};
 			const numberOfHooks = Object.keys(hooks).length;
 			Object.keys(hooks).forEach((name, idx) => {
-				const title = hooks[name];
+				const title = hooks[/** @type {keyof typeof hooks} */ (name)];
 				const percentage = (idx / numberOfHooks) * 0.25 + 0.7;
-				compilation.hooks[name].intercept({
+				compilation.hooks[/** @type {keyof typeof hooks} */ (name)].intercept({
 					name: "ProgressPlugin",
 					call() {
 						handler(percentage, "sealing", title);
@@ -500,6 +545,12 @@ class ProgressPlugin {
 				handler(0.65, "building");
 			}
 		});
+		/**
+		 * @param {TODO} hook hook
+		 * @param {number} progress progress from 0 to 1
+		 * @param {string} category category
+		 * @param {string} name name
+		 */
 		const interceptHook = (hook, progress, category, name) => {
 			hook.intercept({
 				name: "ProgressPlugin",
@@ -516,6 +567,9 @@ class ProgressPlugin {
 				error() {
 					handler(progress, category, name);
 				},
+				/**
+				 * @param {Tap} tap tap
+				 */
 				tap(tap) {
 					progressReporters.set(compiler, (p, ...args) => {
 						handler(progress, category, name, tap.name, ...args);
@@ -610,4 +664,6 @@ ProgressPlugin.defaultOptions = {
 	entries: true
 };
 
+ProgressPlugin.createDefaultHandler = createDefaultHandler;
+
 module.exports = ProgressPlugin;

package/lib/ProvidePlugin.js

@@ -14,7 +14,11 @@ const ConstDependency = require("./dependencies/ConstDependency");
 const ProvidedDependency = require("./dependencies/ProvidedDependency");
 const { approve } = require("./javascript/JavascriptParserHelpers");
 
+/** @typedef {import("../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
 const PLUGIN_NAME = "ProvidePlugin";
 
@@ -48,6 +52,11 @@ class ProvidePlugin {
 					ProvidedDependency,
 					new ProvidedDependency.Template()
 				);
+				/**
+				 * @param {JavascriptParser} parser the parser
+				 * @param {JavascriptParserOptions} parserOptions options
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					Object.keys(definitions).forEach(name => {
 						const request = [].concat(definitions[name]);
@@ -67,9 +76,9 @@ class ProvidePlugin {
 								request[0],
 								nameIdentifier,
 								request.slice(1),
-								expr.range
+								/** @type {Range} */ (expr.range)
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 							parser.state.module.addDependency(dep);
 							return true;
 						});
@@ -82,9 +91,9 @@ class ProvidePlugin {
 								request[0],
 								nameIdentifier,
 								request.slice(1),
-								expr.callee.range
+								/** @type {Range} */ (expr.callee.range)
 							);
-							dep.loc = expr.callee.loc;
+							dep.loc = /** @type {DependencyLocation} */ (expr.callee.loc);
 							parser.state.module.addDependency(dep);
 							parser.walkExpressions(expr.arguments);
 							return true;

package/lib/RawModule.js

@@ -72,7 +72,9 @@ class RawModule extends Module {
 	 * @returns {string} a user readable identifier of the module
 	 */
 	readableIdentifier(requestShortener) {
-		return requestShortener.shorten(this.readableIdentifierStr);
+		return /** @type {string} */ (
+			requestShortener.shorten(this.readableIdentifierStr)
+		);
 	}
 
 	/**

package/lib/RequireJsStuffPlugin.js

@@ -15,7 +15,9 @@ const {
 	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
 
+/** @typedef {import("../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 
 const PLUGIN_NAME = "RequireJsStuffPlugin";
 
@@ -33,6 +35,11 @@ module.exports = class RequireJsStuffPlugin {
 					ConstDependency,
 					new ConstDependency.Template()
 				);
+				/**
+				 * @param {JavascriptParser} parser the parser
+				 * @param {JavascriptParserOptions} parserOptions options
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (
 						parserOptions.requireJs === undefined ||

package/lib/RuntimeGlobals.js

@@ -188,6 +188,11 @@ exports.createScriptUrl = "__webpack_require__.tu";
  */
 exports.getTrustedTypesPolicy = "__webpack_require__.tt";
 
+/**
+ * a flag when a chunk has a fetch priority
+ */
+exports.hasFetchPriority = "has fetch priority";
+
 /**
  * the chunk name of the chunk with the runtime
  */

package/lib/RuntimeModule.js

@@ -166,7 +166,7 @@ class RuntimeModule extends Module {
 	/* istanbul ignore next */
 	/**
 	 * @abstract
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
 		const AbstractMethodError = require("./AbstractMethodError");
@@ -174,11 +174,11 @@ class RuntimeModule extends Module {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	getGeneratedCode() {
 		if (this._cachedGeneratedCode) {
-			return this._cachedGeneratedCode;
+			return /** @type {string | null} */ (this._cachedGeneratedCode);
 		}
 		return (this._cachedGeneratedCode = this.generate());
 	}

package/lib/RuntimePlugin.js

@@ -128,7 +128,8 @@ class RuntimePlugin {
 					});
 			}
 			for (const req of Object.keys(TREE_DEPENDENCIES)) {
-				const deps = TREE_DEPENDENCIES[req];
+				const deps =
+					TREE_DEPENDENCIES[/** @type {keyof TREE_DEPENDENCIES} */ (req)];
 				compilation.hooks.runtimeRequirementInTree
 					.for(req)
 					.tap("RuntimePlugin", (chunk, set) => {
@@ -136,7 +137,8 @@ class RuntimePlugin {
 					});
 			}
 			for (const req of Object.keys(MODULE_DEPENDENCIES)) {
-				const deps = MODULE_DEPENDENCIES[req];
+				const deps =
+					MODULE_DEPENDENCIES[/** @type {keyof MODULE_DEPENDENCIES} */ (req)];
 				compilation.hooks.runtimeRequirementInModule
 					.for(req)
 					.tap("RuntimePlugin", (chunk, set) => {
@@ -377,9 +379,10 @@ class RuntimePlugin {
 					if (withCreateScriptUrl) {
 						set.add(RuntimeGlobals.createScriptUrl);
 					}
+					const withFetchPriority = set.has(RuntimeGlobals.hasFetchPriority);
 					compilation.addRuntimeModule(
 						chunk,
-						new LoadScriptRuntimeModule(withCreateScriptUrl)
+						new LoadScriptRuntimeModule(withCreateScriptUrl, withFetchPriority)
 					);
 					return true;
 				});

package/lib/RuntimeTemplate.js

@@ -396,7 +396,7 @@ class RuntimeTemplate {
 
 	/**
 	 * @param {Object} options options object
-	 * @param {Module} options.module the module
+	 * @param {Module | null} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {string} options.request the request that should be printed as comment
 	 * @param {boolean=} options.weak if the dependency is weak (will create a nice error message)
@@ -439,7 +439,7 @@ class RuntimeTemplate {
 
 	/**
 	 * @param {Object} options options object
-	 * @param {Module} options.module the module
+	 * @param {Module | null} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {string} options.request the request that should be printed as comment
 	 * @param {boolean=} options.weak if the dependency is weak (will create a nice error message)
@@ -939,11 +939,29 @@ class RuntimeTemplate {
 		if (chunks.length === 1) {
 			const chunkId = JSON.stringify(chunks[0].id);
 			runtimeRequirements.add(RuntimeGlobals.ensureChunk);
-			return `${RuntimeGlobals.ensureChunk}(${comment}${chunkId})`;
+
+			const fetchPriority = chunkGroup.options.fetchPriority;
+
+			if (fetchPriority) {
+				runtimeRequirements.add(RuntimeGlobals.hasFetchPriority);
+			}
+
+			return `${RuntimeGlobals.ensureChunk}(${comment}${chunkId}${
+				fetchPriority ? `, ${JSON.stringify(fetchPriority)}` : ""
+			})`;
 		} else if (chunks.length > 0) {
 			runtimeRequirements.add(RuntimeGlobals.ensureChunk);
+
+			const fetchPriority = chunkGroup.options.fetchPriority;
+
+			if (fetchPriority) {
+				runtimeRequirements.add(RuntimeGlobals.hasFetchPriority);
+			}
+
 			const requireChunkId = chunk =>
-				`${RuntimeGlobals.ensureChunk}(${JSON.stringify(chunk.id)})`;
+				`${RuntimeGlobals.ensureChunk}(${JSON.stringify(chunk.id)}${
+					fetchPriority ? `, ${JSON.stringify(fetchPriority)}` : ""
+				})`;
 			return `Promise.all(${comment.trim()}[${chunks
 				.map(requireChunkId)
 				.join(", ")}])`;

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -7,9 +7,13 @@
 
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 
+/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("./Compilation")} Compilation */
 
 class SourceMapDevToolModuleOptionsPlugin {
+	/**
+	 * @param {SourceMapDevToolPluginOptions} options options
+	 */
 	constructor(options) {
 		this.options = options;
 	}

package/lib/SourceMapDevToolPlugin.js

@@ -22,6 +22,7 @@ const { makePathsAbsolute } = require("./util/identifier");
 /** @typedef {import("./Cache").Etag} Etag */
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("./Chunk")} Chunk */
+/** @typedef {import("./Compilation").Asset} Asset */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compilation").PathData} PathData */
 /** @typedef {import("./Compiler")} Compiler */
@@ -227,7 +228,9 @@ class SourceMapDevToolPlugin {
 					asyncLib.each(
 						files,
 						(file, callback) => {
-							const asset = compilation.getAsset(file);
+							const asset =
+								/** @type {Readonly<Asset>} */
+								(compilation.getAsset(file));
 							if (asset.info.related && asset.info.related.sourceMap) {
 								fileIndex++;
 								return callback();
@@ -363,7 +366,9 @@ class SourceMapDevToolPlugin {
 							// find modules with conflicting source names
 							for (let idx = 0; idx < allModules.length; idx++) {
 								const module = allModules[idx];
-								let sourceName = moduleToSourceNameMapping.get(module);
+								let sourceName =
+									/** @type {string} */
+									(moduleToSourceNameMapping.get(module));
 								let hasName = conflictDetectionSet.has(sourceName);
 								if (!hasName) {
 									conflictDetectionSet.add(sourceName);

package/lib/UseStrictPlugin.js

@@ -13,7 +13,10 @@ const {
 const ConstDependency = require("./dependencies/ConstDependency");
 
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("./Module").BuildInfo} BuildInfo */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
 const PLUGIN_NAME = "UseStrictPlugin";
 
@@ -42,10 +45,14 @@ class UseStrictPlugin {
 							// Remove "use strict" expression. It will be added later by the renderer again.
 							// This is necessary in order to not break the strict mode when webpack prepends code.
 							// @see https://github.com/webpack/webpack/issues/1970
-							const dep = new ConstDependency("", firstNode.range);
-							dep.loc = firstNode.loc;
+							const dep = new ConstDependency(
+								"",
+								/** @type {Range} */ (firstNode.range)
+							);
+							dep.loc = /** @type {DependencyLocation} */ (firstNode.loc);
 							parser.state.module.addPresentationalDependency(dep);
-							parser.state.module.buildInfo.strict = true;
+							/** @type {BuildInfo} */
+							(parser.state.module.buildInfo).strict = true;
 						}
 					});
 				};