webpack 5.102.1 → 5.104.0

package/lib/asset/AssetBytesGenerator.js

@@ -9,16 +9,20 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
+	CSS_TYPE,
+	CSS_URL_TYPE,
 	CSS_URL_TYPES,
-	JS_AND_CSS_URL_TYPES,
-	JS_TYPES,
+	JAVASCRIPT_AND_CSS_URL_TYPES,
+	JAVASCRIPT_TYPE,
+	JAVASCRIPT_TYPES,
 	NO_TYPES
-} = require("../ModuleSourceTypesConstants");
+} = require("../ModuleSourceTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
@@ -46,7 +50,7 @@ class AssetSourceGenerator extends Generator {
 		const data = getData ? getData() : undefined;
 
 		switch (type) {
-			case "javascript": {
+			case JAVASCRIPT_TYPE: {
 				if (!originalSource) {
 					return new RawSource("");
 				}
@@ -66,13 +70,13 @@ class AssetSourceGenerator extends Generator {
 					} = ${RuntimeGlobals.toBinary}(${JSON.stringify(encodedSource)});`;
 				} else {
 					runtimeRequirements.add(RuntimeGlobals.module);
-					sourceContent = `${RuntimeGlobals.module}.exports = ${RuntimeGlobals.toBinary}(${JSON.stringify(
+					sourceContent = `${module.moduleArgument}.exports = ${RuntimeGlobals.toBinary}(${JSON.stringify(
 						encodedSource
 					)});`;
 				}
 				return new RawSource(sourceContent);
 			}
-			case "css-url": {
+			case CSS_URL_TYPE: {
 				if (!originalSource) {
 					return null;
 				}
@@ -99,7 +103,7 @@ class AssetSourceGenerator extends Generator {
 	 */
 	generateError(error, module, generateContext) {
 		switch (generateContext.type) {
-			case "javascript": {
+			case JAVASCRIPT_TYPE: {
 				return new RawSource(
 					`throw new Error(${JSON.stringify(error.message)});`
 				);
@@ -136,12 +140,12 @@ class AssetSourceGenerator extends Generator {
 		}
 
 		if (sourceTypes.size > 0) {
-			if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
-				return JS_AND_CSS_URL_TYPES;
-			} else if (sourceTypes.has("css")) {
+			if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
+				return JAVASCRIPT_AND_CSS_URL_TYPES;
+			} else if (sourceTypes.has(CSS_TYPE)) {
 				return CSS_URL_TYPES;
 			}
-			return JS_TYPES;
+			return JAVASCRIPT_TYPES;
 		}
 
 		return NO_TYPES;
@@ -149,7 +153,7 @@ class AssetSourceGenerator extends Generator {
 
 	/**
 	 * @param {NormalModule} module the module
-	 * @param {string=} type source type
+	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {

package/lib/asset/AssetGenerator.js

@@ -11,14 +11,17 @@ const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
 	ASSET_AND_CSS_URL_TYPES,
-	ASSET_AND_JS_AND_CSS_URL_TYPES,
-	ASSET_AND_JS_TYPES,
+	ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES,
+	ASSET_AND_JAVASCRIPT_TYPES,
 	ASSET_TYPES,
+	CSS_TYPE,
+	CSS_URL_TYPE,
 	CSS_URL_TYPES,
-	JS_AND_CSS_URL_TYPES,
-	JS_TYPES,
+	JAVASCRIPT_AND_CSS_URL_TYPES,
+	JAVASCRIPT_TYPE,
+	JAVASCRIPT_TYPES,
 	NO_TYPES
-} = require("../ModuleSourceTypesConstants");
+} = require("../ModuleSourceTypeConstants");
 const { ASSET_MODULE_TYPE } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const CssUrlDependency = require("../dependencies/CssUrlDependency");
@@ -43,6 +46,7 @@ const getMimeTypes = memoize(() => require("mime-types"));
 /** @typedef {import("../Module").NameForCondition} NameForCondition */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
@@ -331,7 +335,7 @@ class AssetGenerator extends Generator {
 
 		let assetPath;
 
-		if (generatorOptions.publicPath !== undefined && type === "javascript") {
+		if (generatorOptions.publicPath !== undefined && type === JAVASCRIPT_TYPE) {
 			const { path, info } = runtimeTemplate.compilation.getAssetPathWithInfo(
 				generatorOptions.publicPath,
 				{
@@ -346,7 +350,7 @@ class AssetGenerator extends Generator {
 			assetPath = JSON.stringify(path + filename);
 		} else if (
 			generatorOptions.publicPath !== undefined &&
-			type === "css-url"
+			type === CSS_URL_TYPE
 		) {
 			const { path, info } = runtimeTemplate.compilation.getAssetPathWithInfo(
 				generatorOptions.publicPath,
@@ -360,14 +364,14 @@ class AssetGenerator extends Generator {
 			);
 			assetInfo = mergeAssetInfo(assetInfo, info);
 			assetPath = path + filename;
-		} else if (type === "javascript") {
+		} else if (type === JAVASCRIPT_TYPE) {
 			// add __webpack_require__.p
 			runtimeRequirements.add(RuntimeGlobals.publicPath);
 			assetPath = runtimeTemplate.concatenation(
 				{ expr: RuntimeGlobals.publicPath },
 				filename
 			);
-		} else if (type === "css-url") {
+		} else if (type === CSS_URL_TYPE) {
 			const compilation = runtimeTemplate.compilation;
 			const path =
 				compilation.outputOptions.publicPath === "auto"
@@ -380,7 +384,6 @@ class AssetGenerator extends Generator {
 		}
 
 		return {
-			// eslint-disable-next-line object-shorthand
 			assetPath: /** @type {string} */ (assetPath),
 			assetInfo: { sourceFilename, ...assetInfo }
 		};
@@ -519,7 +522,7 @@ class AssetGenerator extends Generator {
 
 		let content;
 
-		const needContent = type === "javascript" || type === "css-url";
+		const needContent = type === JAVASCRIPT_TYPE || type === CSS_URL_TYPE;
 
 		const data = getData ? getData() : undefined;
 
@@ -530,7 +533,9 @@ class AssetGenerator extends Generator {
 		) {
 			const encodedSource = this.generateDataUri(module);
 			content =
-				type === "javascript" ? JSON.stringify(encodedSource) : encodedSource;
+				type === JAVASCRIPT_TYPE
+					? JSON.stringify(encodedSource)
+					: encodedSource;
 
 			if (data) {
 				data.set("url", { [type]: content, ...data.get("url") });
@@ -571,7 +576,7 @@ class AssetGenerator extends Generator {
 					contentHash
 				);
 
-			if (data && (type === "javascript" || type === "css-url")) {
+			if (data && (type === JAVASCRIPT_TYPE || type === CSS_URL_TYPE)) {
 				data.set("url", { [type]: assetPath, ...data.get("url") });
 			}
 
@@ -599,7 +604,7 @@ class AssetGenerator extends Generator {
 			content = assetPath;
 		}
 
-		if (type === "javascript") {
+		if (type === JAVASCRIPT_TYPE) {
 			if (concatenationScope) {
 				concatenationScope.registerNamespaceExport(
 					ConcatenationScope.NAMESPACE_OBJECT_EXPORT
@@ -614,8 +619,8 @@ class AssetGenerator extends Generator {
 
 			runtimeRequirements.add(RuntimeGlobals.module);
 
-			return new RawSource(`${RuntimeGlobals.module}.exports = ${content};`);
-		} else if (type === "css-url") {
+			return new RawSource(`${module.moduleArgument}.exports = ${content};`);
+		} else if (type === CSS_URL_TYPE) {
 			return null;
 		}
 
@@ -633,7 +638,7 @@ class AssetGenerator extends Generator {
 			case "asset": {
 				return new RawSource(error.message);
 			}
-			case "javascript": {
+			case JAVASCRIPT_TYPE: {
 				return new RawSource(
 					`throw new Error(${JSON.stringify(error.message)});`
 				);
@@ -662,24 +667,24 @@ class AssetGenerator extends Generator {
 
 		if ((module.buildInfo && module.buildInfo.dataUrl) || this.emit === false) {
 			if (sourceTypes.size > 0) {
-				if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
-					return JS_AND_CSS_URL_TYPES;
-				} else if (sourceTypes.has("css")) {
+				if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
+					return JAVASCRIPT_AND_CSS_URL_TYPES;
+				} else if (sourceTypes.has(CSS_TYPE)) {
 					return CSS_URL_TYPES;
 				}
-				return JS_TYPES;
+				return JAVASCRIPT_TYPES;
 			}
 
 			return NO_TYPES;
 		}
 
 		if (sourceTypes.size > 0) {
-			if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
-				return ASSET_AND_JS_AND_CSS_URL_TYPES;
-			} else if (sourceTypes.has("css")) {
+			if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
+				return ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES;
+			} else if (sourceTypes.has(CSS_TYPE)) {
 				return ASSET_AND_CSS_URL_TYPES;
 			}
-			return ASSET_AND_JS_TYPES;
+			return ASSET_AND_JAVASCRIPT_TYPES;
 		}
 
 		return ASSET_TYPES;
@@ -687,7 +692,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * @param {NormalModule} module the module
-	 * @param {string=} type source type
+	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {

package/lib/asset/AssetSourceGenerator.js

@@ -9,16 +9,20 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
+	CSS_TYPE,
+	CSS_URL_TYPE,
 	CSS_URL_TYPES,
-	JS_AND_CSS_URL_TYPES,
-	JS_TYPES,
+	JAVASCRIPT_AND_CSS_URL_TYPES,
+	JAVASCRIPT_TYPE,
+	JAVASCRIPT_TYPES,
 	NO_TYPES
-} = require("../ModuleSourceTypesConstants");
+} = require("../ModuleSourceTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
@@ -46,7 +50,7 @@ class AssetSourceGenerator extends Generator {
 		const data = getData ? getData() : undefined;
 
 		switch (type) {
-			case "javascript": {
+			case JAVASCRIPT_TYPE: {
 				if (!originalSource) {
 					return new RawSource("");
 				}
@@ -65,13 +69,13 @@ class AssetSourceGenerator extends Generator {
 					} = ${JSON.stringify(encodedSource)};`;
 				} else {
 					runtimeRequirements.add(RuntimeGlobals.module);
-					sourceContent = `${RuntimeGlobals.module}.exports = ${JSON.stringify(
+					sourceContent = `${module.moduleArgument}.exports = ${JSON.stringify(
 						encodedSource
 					)};`;
 				}
 				return new RawSource(sourceContent);
 			}
-			case "css-url": {
+			case CSS_URL_TYPE: {
 				if (!originalSource) {
 					return null;
 				}
@@ -98,7 +102,7 @@ class AssetSourceGenerator extends Generator {
 	 */
 	generateError(error, module, generateContext) {
 		switch (generateContext.type) {
-			case "javascript": {
+			case JAVASCRIPT_TYPE: {
 				return new RawSource(
 					`throw new Error(${JSON.stringify(error.message)});`
 				);
@@ -135,12 +139,12 @@ class AssetSourceGenerator extends Generator {
 		}
 
 		if (sourceTypes.size > 0) {
-			if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
-				return JS_AND_CSS_URL_TYPES;
-			} else if (sourceTypes.has("css")) {
+			if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
+				return JAVASCRIPT_AND_CSS_URL_TYPES;
+			} else if (sourceTypes.has(CSS_TYPE)) {
 				return CSS_URL_TYPES;
 			}
-			return JS_TYPES;
+			return JAVASCRIPT_TYPES;
 		}
 
 		return NO_TYPES;
@@ -148,7 +152,7 @@ class AssetSourceGenerator extends Generator {
 
 	/**
 	 * @param {NormalModule} module the module
-	 * @param {string=} type source type
+	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {

package/lib/asset/RawDataUrlModule.js

@@ -7,7 +7,10 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("../Module");
-const { JS_TYPES } = require("../ModuleSourceTypesConstants");
+const {
+	JAVASCRIPT_TYPE,
+	JAVASCRIPT_TYPES
+} = require("../ModuleSourceTypeConstants");
 const { ASSET_MODULE_TYPE_RAW_DATA_URL } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
@@ -47,7 +50,7 @@ class RawDataUrlModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return JS_TYPES;
+		return JAVASCRIPT_TYPES;
 	}
 
 	/**
@@ -113,7 +116,7 @@ class RawDataUrlModule extends Module {
 		}
 		const sources = new Map();
 		sources.set(
-			"javascript",
+			JAVASCRIPT_TYPE,
 			new RawSource(`module.exports = ${JSON.stringify(this.url)};`)
 		);
 		const data = new Map();

package/lib/buildChunkGraph.js

@@ -352,10 +352,12 @@ const visitModules = (
 	/** @type {Map<ChunkGroupInfo, Set<DependenciesBlock>>} */
 	const blocksByChunkGroups = new Map();
 
-	/** @type {Map<string, ChunkGroupInfo>} */
+	/** @typedef {Map<string, ChunkGroupInfo>} NamedChunkGroup */
+
+	/** @type {NamedChunkGroup} */
 	const namedChunkGroups = new Map();
 
-	/** @type {Map<string, ChunkGroupInfo>} */
+	/** @type {NamedChunkGroup} */
 	const namedAsyncEntrypoints = new Map();
 
 	/** @type {Set<ChunkGroupInfo>} */

package/lib/cache/PackFileCacheStrategy.js

@@ -18,6 +18,7 @@ const {
 } = require("../util/serialization");
 
 /** @typedef {import("../../declarations/WebpackOptions").SnapshotOptions} SnapshotOptions */
+/** @typedef {import("../Compilation").FileSystemDependencies} FileSystemDependencies */
 /** @typedef {import("../Cache").Data} Data */
 /** @typedef {import("../Cache").Etag} Etag */
 /** @typedef {import("../Compiler")} Compiler */
@@ -51,7 +52,7 @@ class PackContainer {
 		resolveResults,
 		resolveBuildDependenciesSnapshot
 	) {
-		/** @type {Pack | (() => Pack) } */
+		/** @type {Pack | (() => Pack)} */
 		this.data = data;
 		/** @type {string} */
 		this.version = version;
@@ -395,7 +396,7 @@ class Pack {
 			return;
 		}
 
-		/** @type {PackContent[] } */
+		/** @type {PackContent[]} */
 		const mergedContent = [];
 
 		// 3. Remove old content entries
@@ -1109,7 +1110,7 @@ class PackFileCacheStrategy {
 		compression,
 		readonly
 	}) {
-		/** @type {import("../serialization/Serializer")<PackContainer, null, {}>} */
+		/** @type {import("../serialization/Serializer")<PackContainer, null, EXPECTED_OBJECT>} */
 		this.fileSerializer = createFileSerializer(
 			fs,
 			/** @type {string | Hash} */
@@ -1140,7 +1141,7 @@ class PackFileCacheStrategy {
 		this.snapshot = snapshot;
 		/** @type {BuildDependencies} */
 		this.buildDependencies = new Set();
-		/** @type {LazySet<string>} */
+		/** @type {FileSystemDependencies} */
 		this.newBuildDependencies = new LazySet();
 		/** @type {Snapshot | undefined} */
 		this.resolveBuildDependenciesSnapshot = undefined;
@@ -1364,7 +1365,7 @@ class PackFileCacheStrategy {
 	}
 
 	/**
-	 * @param {LazySet<string> | Iterable<string>} dependencies dependencies to store
+	 * @param {FileSystemDependencies | Iterable<string>} dependencies dependencies to store
 	 */
 	storeBuildDependencies(dependencies) {
 		if (this.readonly) return;

package/lib/cli.js

@@ -795,49 +795,8 @@ const init = (open, close, replace) =>
 	filterEmpty(`\u001B[${open}m`, `\u001B[${close}m`, replace);
 
 /**
- * @typedef {{
- * reset: PrintFunction
- * bold: PrintFunction
- * dim: PrintFunction
- * italic: PrintFunction
- * underline: PrintFunction
- * inverse: PrintFunction
- * hidden: PrintFunction
- * strikethrough: PrintFunction
- * black: PrintFunction
- * red: PrintFunction
- * green: PrintFunction
- * yellow: PrintFunction
- * blue: PrintFunction
- * magenta: PrintFunction
- * cyan: PrintFunction
- * white: PrintFunction
- * gray: PrintFunction
- * bgBlack: PrintFunction
- * bgRed: PrintFunction
- * bgGreen: PrintFunction
- * bgYellow: PrintFunction
- * bgBlue: PrintFunction
- * bgMagenta: PrintFunction
- * bgCyan: PrintFunction
- * bgWhite: PrintFunction
- * blackBright: PrintFunction
- * redBright: PrintFunction
- * greenBright: PrintFunction
- * yellowBright: PrintFunction
- * blueBright: PrintFunction
- * magentaBright: PrintFunction
- * cyanBright: PrintFunction
- * whiteBright: PrintFunction
- * bgBlackBright: PrintFunction
- * bgRedBright: PrintFunction
- * bgGreenBright: PrintFunction
- * bgYellowBright: PrintFunction
- * bgBlueBright: PrintFunction
- * bgMagentaBright: PrintFunction
- * bgCyanBright: PrintFunction
- * bgWhiteBright: PrintFunction
- }} Colors */
+ * @typedef {{ reset: PrintFunction, bold: PrintFunction, dim: PrintFunction, italic: PrintFunction, underline: PrintFunction, inverse: PrintFunction, hidden: PrintFunction, strikethrough: PrintFunction, black: PrintFunction, red: PrintFunction, green: PrintFunction, yellow: PrintFunction, blue: PrintFunction, magenta: PrintFunction, cyan: PrintFunction, white: PrintFunction, gray: PrintFunction, bgBlack: PrintFunction, bgRed: PrintFunction, bgGreen: PrintFunction, bgYellow: PrintFunction, bgBlue: PrintFunction, bgMagenta: PrintFunction, bgCyan: PrintFunction, bgWhite: PrintFunction, blackBright: PrintFunction, redBright: PrintFunction, greenBright: PrintFunction, yellowBright: PrintFunction, blueBright: PrintFunction, magentaBright: PrintFunction, cyanBright: PrintFunction, whiteBright: PrintFunction, bgBlackBright: PrintFunction, bgRedBright: PrintFunction, bgGreenBright: PrintFunction, bgYellowBright: PrintFunction, bgBlueBright: PrintFunction, bgMagentaBright: PrintFunction, bgCyanBright: PrintFunction, bgWhiteBright: PrintFunction }} Colors
+ */
 
 /**
  * @typedef {object} ColorsOptions

package/lib/config/browserslistTargetHandler.js

@@ -118,6 +118,25 @@ const resolve = (browsers) => {
 			kaios: [2, 5],
 			node: [6, 0]
 		}),
+		methodShorthand: rawChecker({
+			chrome: 47,
+			and_chr: 47,
+			edge: 12,
+			firefox: 34,
+			and_ff: 34,
+			// ie: Not supported,
+			opera: 34,
+			op_mob: 34,
+			safari: 9,
+			ios_saf: 9,
+			samsung: 5,
+			android: 47,
+			// baidu: Not tracked,
+			and_qq: [14, 9],
+			and_uc: [15, 5],
+			kaios: [2, 5],
+			node: [4, 9]
+		}),
 		arrowFunction: rawChecker({
 			chrome: 45,
 			and_chr: 45,
@@ -354,6 +373,11 @@ const resolve = (browsers) => {
 			rawChecker({
 				node: [14, 18]
 			}),
+		importMetaDirnameAndFilename:
+			nodeProperty &&
+			rawChecker({
+				node: [22, 16]
+			}),
 		require: nodeProperty
 	};
 };