webpack 5.85.1 → 5.87.0

package/lib/css/CssModulesPlugin.js

@@ -11,7 +11,8 @@ const HotUpdateChunk = require("../HotUpdateChunk");
 const {
 	CSS_MODULE_TYPE,
 	CSS_MODULE_TYPE_GLOBAL,
-	CSS_MODULE_TYPE_MODULE
+	CSS_MODULE_TYPE_MODULE,
+	CSS_MODULE_TYPE_AUTO
 } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const SelfModuleFactory = require("../SelfModuleFactory");
@@ -46,6 +47,10 @@ const getCssLoadingRuntimeModule = memoize(() =>
 	require("./CssLoadingRuntimeModule")
 );
 
+/**
+ * @param {string} name name
+ * @returns {{oneOf: [{$ref: string}], definitions: *}} schema
+ */
 const getSchema = name => {
 	const { definitions } = require("../../schemas/WebpackOptions.json");
 	return {
@@ -145,7 +150,8 @@ class CssModulesPlugin {
 				for (const type of [
 					CSS_MODULE_TYPE,
 					CSS_MODULE_TYPE_GLOBAL,
-					CSS_MODULE_TYPE_MODULE
+					CSS_MODULE_TYPE_MODULE,
+					CSS_MODULE_TYPE_AUTO
 				]) {
 					normalModuleFactory.hooks.createParser
 						.for(type)
@@ -154,6 +160,7 @@ class CssModulesPlugin {
 
 							switch (type) {
 								case CSS_MODULE_TYPE:
+								case CSS_MODULE_TYPE_AUTO:
 									return new CssParser();
 								case CSS_MODULE_TYPE_GLOBAL:
 									return new CssParser({
@@ -302,6 +309,10 @@ class CssModulesPlugin {
 					return result;
 				});
 				const globalChunkLoading = compilation.outputOptions.chunkLoading;
+				/**
+				 * @param {Chunk} chunk the chunk
+				 * @returns {boolean} true, when enabled
+				 */
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
@@ -311,6 +322,10 @@ class CssModulesPlugin {
 					return chunkLoading === "jsonp";
 				};
 				const onceForChunkSet = new WeakSet();
+				/**
+				 * @param {Chunk} chunk chunk to check
+				 * @param {Set<string>} set runtime requirements
+				 */
 				const handler = (chunk, set) => {
 					if (onceForChunkSet.has(chunk)) return;
 					onceForChunkSet.add(chunk);
@@ -361,7 +376,10 @@ class CssModulesPlugin {
 					};
 				})
 				.filter(item => item.index !== undefined)
-				.sort((a, b) => b.index - a.index)
+				.sort(
+					(a, b) =>
+						/** @type {number} */ (b.index) - /** @type {number} */ (a.index)
+				)
 				.map(item => item.module);
 
 			return { list: sortedModules, set: new Set(sortedModules) };
@@ -455,19 +473,25 @@ class CssModulesPlugin {
 		return [
 			...this.getModulesInOrder(
 				chunk,
-				chunkGraph.getOrderedChunkModulesIterableBySourceType(
-					chunk,
-					"css-import",
-					compareModulesByIdentifier
+				/** @type {Iterable<Module>} */
+				(
+					chunkGraph.getOrderedChunkModulesIterableBySourceType(
+						chunk,
+						"css-import",
+						compareModulesByIdentifier
+					)
 				),
 				compilation
 			),
 			...this.getModulesInOrder(
 				chunk,
-				chunkGraph.getOrderedChunkModulesIterableBySourceType(
-					chunk,
-					"css",
-					compareModulesByIdentifier
+				/** @type {Iterable<Module>} */
+				(
+					chunkGraph.getOrderedChunkModulesIterableBySourceType(
+						chunk,
+						"css",
+						compareModulesByIdentifier
+					)
 				),
 				compilation
 			)
@@ -498,8 +522,11 @@ class CssModulesPlugin {
 				const codeGenResult = codeGenerationResults.get(module, chunk.runtime);
 
 				let moduleSource =
-					codeGenResult.sources.get("css") ||
-					codeGenResult.sources.get("css-import");
+					/** @type {Source} */
+					(
+						codeGenResult.sources.get("css") ||
+							codeGenResult.sources.get("css-import")
+					);
 
 				let inheritance = [[module.cssLayer, module.supports, module.media]];
 
@@ -569,7 +596,8 @@ class CssModulesPlugin {
 					}${escapeCss(moduleId)}`
 				);
 			} catch (e) {
-				e.message += `\nduring rendering of css ${module.identifier()}`;
+				/** @type {Error} */
+				(e).message += `\nduring rendering of css ${module.identifier()}`;
 				throw e;
 			}
 		}

package/lib/css/CssParser.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const ModuleDependencyWarning = require("../ModuleDependencyWarning");
+const { CSS_MODULE_TYPE_AUTO } = require("../ModuleTypeConstants");
 const Parser = require("../Parser");
 const WebpackError = require("../WebpackError");
 const ConstDependency = require("../dependencies/ConstDependency");
@@ -15,6 +16,7 @@ const CssLocalIdentifierDependency = require("../dependencies/CssLocalIdentifier
 const CssSelfLocalIdentifierDependency = require("../dependencies/CssSelfLocalIdentifierDependency");
 const CssUrlDependency = require("../dependencies/CssUrlDependency");
 const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
+const { parseResource } = require("../util/identifier");
 const walkCssTokens = require("./walkCssTokens");
 
 /** @typedef {import("../Parser").ParserState} ParserState */
@@ -37,6 +39,7 @@ const IMAGE_SET_FUNCTION = /^(-\w+-)?image-set$/i;
 const OPTIONALLY_VENDOR_PREFIXED_KEYFRAMES_AT_RULE = /^@(-\w+-)?keyframes$/;
 const OPTIONALLY_VENDOR_PREFIXED_ANIMATION_PROPERTY =
 	/^(-\w+-)?animation(-name)?$/i;
+const IS_MODULES = /\.module(s)?\.\w+$/i;
 
 /**
  * @param {string} str url string
@@ -169,6 +172,15 @@ class CssParser extends Parser {
 		}
 
 		const module = state.module;
+		if (
+			module.type === CSS_MODULE_TYPE_AUTO &&
+			IS_MODULES.test(
+				parseResource(module.matchResource || module.resource).path
+			)
+		) {
+			this.defaultMode = "local";
+		}
+
 		const locConverter = new LocConverter(source);
 		/** @type {Set<string>}*/
 		const declaredCssVariables = new Set();

package/lib/dependencies/ConstDependency.js

@@ -23,8 +23,8 @@ const NullDependency = require("./NullDependency");
 class ConstDependency extends NullDependency {
 	/**
 	 * @param {string} expression the expression
-	 * @param {number|Range} range the source range
-	 * @param {string[]=} runtimeRequirements runtime requirements
+	 * @param {number | Range} range the source range
+	 * @param {(string[] | null)=} runtimeRequirements runtime requirements
 	 */
 	constructor(expression, range, runtimeRequirements) {
 		super();

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -219,6 +219,25 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 								}
 								break;
 							}
+							case "fetchPriority": {
+								const expr = parser.evaluateExpression(
+									/** @type {Expression} */ (prop.value)
+								);
+								if (
+									expr.isString() &&
+									["high", "low", "auto"].includes(expr.string)
+								) {
+									groupOptions.fetchPriority =
+										/** @type {RawChunkGroupOptions["fetchPriority"]} */ (
+											expr.string
+										);
+								} else {
+									errors.push(
+										createPropertyParseError(prop, '"high"|"low"|"auto"')
+									);
+								}
+								break;
+							}
 							case "recursive": {
 								const recursiveExpr = parser.evaluateExpression(
 									/** @type {Expression} */ (prop.value)

package/lib/dependencies/ImportParserPlugin.js

@@ -47,7 +47,11 @@ class ImportParserPlugin {
 			/** @type {RawChunkGroupOptions} */
 			const groupOptions = {};
 
-			const { dynamicImportPreload, dynamicImportPrefetch } = this.options;
+			const {
+				dynamicImportPreload,
+				dynamicImportPrefetch,
+				dynamicImportFetchPriority
+			} = this.options;
 			if (dynamicImportPreload !== undefined && dynamicImportPreload !== false)
 				groupOptions.preloadOrder =
 					dynamicImportPreload === true ? 0 : dynamicImportPreload;
@@ -57,6 +61,11 @@ class ImportParserPlugin {
 			)
 				groupOptions.prefetchOrder =
 					dynamicImportPrefetch === true ? 0 : dynamicImportPrefetch;
+			if (
+				dynamicImportFetchPriority !== undefined &&
+				dynamicImportFetchPriority !== false
+			)
+				groupOptions.fetchPriority = dynamicImportFetchPriority;
 
 			const { options: importOptions, errors: commentErrors } =
 				parser.parseCommentOptions(expr.range);
@@ -141,6 +150,21 @@ class ImportParserPlugin {
 						);
 					}
 				}
+				if (importOptions.webpackFetchPriority !== undefined) {
+					if (
+						typeof importOptions.webpackFetchPriority === "string" &&
+						["high", "low", "auto"].includes(importOptions.webpackFetchPriority)
+					) {
+						groupOptions.fetchPriority = importOptions.webpackFetchPriority;
+					} else {
+						parser.state.module.addWarning(
+							new UnsupportedFeatureWarning(
+								`\`webpackFetchPriority\` expected true or "low", "high" or "auto", but received: ${importOptions.webpackFetchPriority}.`,
+								expr.loc
+							)
+						);
+					}
+				}
 				if (importOptions.webpackInclude !== undefined) {
 					if (
 						!importOptions.webpackInclude ||

package/lib/dependencies/JsonExportsDependency.js

@@ -47,7 +47,7 @@ const getExportsFromData = data => {
 
 class JsonExportsDependency extends NullDependency {
 	/**
-	 * @param {JsonData=} data json data
+	 * @param {JsonData} data json data
 	 */
 	constructor(data) {
 		super();

package/lib/ids/SyncModuleIdsPlugin.js

@@ -63,6 +63,7 @@ class SyncModuleIdsPlugin {
 		if (this._write) {
 			compiler.hooks.emitRecords.tapAsync(plugin, callback => {
 				if (!data || !dataChanged) return callback();
+				/** @type {Object<string, string | number>} */
 				const json = {};
 				const sorted = Array.from(data).sort(([a], [b]) => (a < b ? -1 : 1));
 				for (const [key, value] of sorted) {

package/lib/javascript/BasicEvaluatedExpression.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-/** @typedef {import("estree").Node} EsTreeNode */
+/** @typedef {import("estree").Node} Node */
 /** @typedef {import("./JavascriptParser").Range} Range */
 /** @typedef {import("./JavascriptParser").VariableInfoInterface} VariableInfoInterface */
 
@@ -27,7 +27,7 @@ const TypeBigInt = 13;
 class BasicEvaluatedExpression {
 	constructor() {
 		this.type = TypeUnknown;
-		/** @type {[number, number]} */
+		/** @type {[number, number] | undefined} */
 		this.range = undefined;
 		/** @type {boolean} */
 		this.falsy = false;
@@ -57,23 +57,23 @@ class BasicEvaluatedExpression {
 		this.items = undefined;
 		/** @type {BasicEvaluatedExpression[] | undefined} */
 		this.options = undefined;
-		/** @type {BasicEvaluatedExpression | undefined} */
+		/** @type {BasicEvaluatedExpression | undefined | null} */
 		this.prefix = undefined;
-		/** @type {BasicEvaluatedExpression | undefined} */
+		/** @type {BasicEvaluatedExpression | undefined | null} */
 		this.postfix = undefined;
-		/** @type {BasicEvaluatedExpression[]} */
+		/** @type {BasicEvaluatedExpression[] | undefined} */
 		this.wrappedInnerExpressions = undefined;
 		/** @type {string | VariableInfoInterface | undefined} */
 		this.identifier = undefined;
-		/** @type {string | VariableInfoInterface} */
+		/** @type {string | VariableInfoInterface | undefined} */
 		this.rootInfo = undefined;
-		/** @type {() => string[]} */
+		/** @type {(() => string[]) | undefined} */
 		this.getMembers = undefined;
-		/** @type {() => boolean[]} */
+		/** @type {(() => boolean[]) | undefined} */
 		this.getMembersOptionals = undefined;
-		/** @type {() => Range[]} */
+		/** @type {(() => Range[]) | undefined} */
 		this.getMemberRanges = undefined;
-		/** @type {EsTreeNode} */
+		/** @type {Node | undefined} */
 		this.expression = undefined;
 	}
 
@@ -293,7 +293,9 @@ class BasicEvaluatedExpression {
 		if (this.isRegExp()) return `${this.regExp}`;
 		if (this.isArray()) {
 			let array = [];
-			for (const item of this.items) {
+			for (const item of /** @type {BasicEvaluatedExpression[]} */ (
+				this.items
+			)) {
 				const itemStr = item.asString();
 				if (itemStr === undefined) return undefined;
 				array.push(itemStr);
@@ -303,7 +305,9 @@ class BasicEvaluatedExpression {
 		if (this.isConstArray()) return `${this.array}`;
 		if (this.isTemplateString()) {
 			let str = "";
-			for (const part of this.parts) {
+			for (const part of /** @type {BasicEvaluatedExpression[]} */ (
+				this.parts
+			)) {
 				const partStr = part.asString();
 				if (partStr === undefined) return undefined;
 				str += partStr;
@@ -313,6 +317,10 @@ class BasicEvaluatedExpression {
 		return undefined;
 	}
 
+	/**
+	 * @param {string} string value
+	 * @returns {BasicEvaluatedExpression} basic evaluated expression
+	 */
 	setString(string) {
 		this.type = TypeString;
 		this.string = string;
@@ -410,8 +418,8 @@ class BasicEvaluatedExpression {
 	/**
 	 * Wraps an array of expressions with a prefix and postfix expression.
 	 *
-	 * @param {BasicEvaluatedExpression | null} prefix Expression to be added before the innerExpressions
-	 * @param {BasicEvaluatedExpression} postfix Expression to be added after the innerExpressions
+	 * @param {BasicEvaluatedExpression | null | undefined} prefix Expression to be added before the innerExpressions
+	 * @param {BasicEvaluatedExpression | null | undefined} postfix Expression to be added after the innerExpressions
 	 * @param {BasicEvaluatedExpression[]} innerExpressions Expressions to be wrapped
 	 * @returns {this} this
 	 */
@@ -551,7 +559,7 @@ class BasicEvaluatedExpression {
 	/**
 	 * Set the expression node for the expression.
 	 *
-	 * @param {EsTreeNode} expression expression
+	 * @param {Node | undefined} expression expression
 	 * @returns {this} this
 	 */
 	setExpression(expression) {

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -17,7 +17,9 @@ const {
 	updateHashForEntryStartup
 } = require("./StartupHelpers");
 
+/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Entrypoint")} Entrypoint */
 
 class CommonJsChunkFormatPlugin {
 	/**
@@ -66,7 +68,9 @@ class CommonJsChunkFormatPlugin {
 							chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
 						);
 						if (entries.length > 0) {
-							const runtimeChunk = entries[0][1].getRuntimeChunk();
+							const runtimeChunk =
+								/** @type {Entrypoint} */
+								(entries[0][1]).getRuntimeChunk();
 							const currentOutputName = compilation
 								.getPath(
 									getChunkFilenameTemplate(chunk, compilation.outputOptions),
@@ -83,7 +87,7 @@ class CommonJsChunkFormatPlugin {
 										compilation.outputOptions
 									),
 									{
-										chunk: runtimeChunk,
+										chunk: /** @type {Chunk} */ (runtimeChunk),
 										contentHashType: "javascript"
 									}
 								)

package/lib/javascript/JavascriptModulesPlugin.js

@@ -937,6 +937,7 @@ class JavascriptModulesPlugin {
 				"JavascriptModulesPlugin error: JavascriptModulesPlugin.getCompilationHooks().renderContent plugins should return something"
 			);
 		}
+
 		finalSource = InitFragment.addToSource(
 			finalSource,
 			chunkRenderContext.chunkInitFragments,