webpack 5.92.1 → 5.94.0

package/lib/config/target.js

@@ -65,8 +65,6 @@ const getDefaultTarget = context => {
  * @property {boolean | null} asyncFunction async functions and await are available
  */
 
-///** @typedef {PlatformTargetProperties | ApiTargetProperties | EcmaTargetProperties | PlatformTargetProperties & ApiTargetProperties | PlatformTargetProperties & EcmaTargetProperties | ApiTargetProperties & EcmaTargetProperties} TargetProperties */
-
 /**
  * @template T
  * @typedef {{ [P in keyof T]?: never }} Never<T>
@@ -90,12 +88,11 @@ const versionDependent = (major, minor) => {
 		return () => /** @type {undefined} */ (undefined);
 	}
 	/** @type {number} */
-	const nMajor = +major;
+	const nMajor = Number(major);
 	/** @type {number} */
-	const nMinor = minor ? +minor : 0;
-	return (vMajor, vMinor = 0) => {
-		return nMajor > vMajor || (nMajor === vMajor && nMinor >= vMinor);
-	};
+	const nMinor = minor ? Number(minor) : 0;
+	return (vMajor, vMinor = 0) =>
+		nMajor > vMajor || (nMajor === vMajor && nMinor >= vMinor);
 };
 
 /** @type {[string, string, RegExp, (...args: string[]) => Partial<TargetProperties>][]} */
@@ -124,47 +121,43 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 		"web",
 		"Web browser.",
 		/^web$/,
-		() => {
-			return {
-				web: true,
-				browser: true,
-				webworker: null,
-				node: false,
-				electron: false,
-				nwjs: false,
+		() => ({
+			web: true,
+			browser: true,
+			webworker: null,
+			node: false,
+			electron: false,
+			nwjs: false,
 
-				document: true,
-				importScriptsInWorker: true,
-				fetchWasm: true,
-				nodeBuiltins: false,
-				importScripts: false,
-				require: false,
-				global: false
-			};
-		}
+			document: true,
+			importScriptsInWorker: true,
+			fetchWasm: true,
+			nodeBuiltins: false,
+			importScripts: false,
+			require: false,
+			global: false
+		})
 	],
 	[
 		"webworker",
 		"Web Worker, SharedWorker or Service Worker.",
 		/^webworker$/,
-		() => {
-			return {
-				web: true,
-				browser: true,
-				webworker: true,
-				node: false,
-				electron: false,
-				nwjs: false,
+		() => ({
+			web: true,
+			browser: true,
+			webworker: true,
+			node: false,
+			electron: false,
+			nwjs: false,
 
-				importScripts: true,
-				importScriptsInWorker: true,
-				fetchWasm: true,
-				nodeBuiltins: false,
-				require: false,
-				document: false,
-				global: false
-			};
-		}
+			importScripts: true,
+			importScriptsInWorker: true,
+			fetchWasm: true,
+			nodeBuiltins: false,
+			require: false,
+			document: false,
+			global: false
+		})
 	],
 	[
 		"[async-]node[X[.Y]]",
@@ -184,7 +177,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				require: !asyncFlag,
 				nodeBuiltins: true,
 				// v16.0.0, v14.18.0
-				nodePrefixForCoreModules: +major < 15 ? v(14, 18) : v(16),
+				nodePrefixForCoreModules: Number(major) < 15 ? v(14, 18) : v(16),
 				global: true,
 				document: false,
 				fetchWasm: false,
@@ -295,7 +288,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 		"EcmaScript in this version. Examples: es2020, es5.",
 		/^es(\d+)$/,
 		version => {
-			let v = +version;
+			let v = Number(version);
 			if (v < 1000) v = v + 2009;
 			return {
 				const: v >= 2015,
@@ -366,7 +359,7 @@ const mergeTargetProperties = targetProperties => {
 		}
 		if (hasTrue || hasFalse)
 			/** @type {TargetProperties} */
-			(result)[key] = hasFalse && hasTrue ? null : hasTrue ? true : false;
+			(result)[key] = hasFalse && hasTrue ? null : Boolean(hasTrue);
 	}
 	return /** @type {TargetProperties} */ (result);
 };
@@ -376,12 +369,9 @@ const mergeTargetProperties = targetProperties => {
  * @param {string} context the context directory
  * @returns {TargetProperties} target properties
  */
-const getTargetsProperties = (targets, context) => {
-	return mergeTargetProperties(
-		targets.map(t => getTargetProperties(t, context))
-	);
-};
+const getTargetsProperties = (targets, context) =>
+	mergeTargetProperties(targets.map(t => getTargetProperties(t, context)));
 
-exports.getDefaultTarget = getDefaultTarget;
-exports.getTargetProperties = getTargetProperties;
-exports.getTargetsProperties = getTargetsProperties;
+module.exports.getDefaultTarget = getDefaultTarget;
+module.exports.getTargetProperties = getTargetProperties;
+module.exports.getTargetsProperties = getTargetsProperties;

package/lib/container/ContainerEntryModule.js

@@ -77,7 +77,7 @@ class ContainerEntryModule extends Module {
 	 * @returns {string} a user readable identifier of the module
 	 */
 	readableIdentifier(requestShortener) {
-		return `container entry`;
+		return "container entry";
 	}
 
 	/**
@@ -205,7 +205,7 @@ class ContainerEntryModule extends Module {
 		}
 
 		const source = Template.asString([
-			`var moduleMap = {`,
+			"var moduleMap = {",
 			Template.indent(getters.join(",\n")),
 			"};",
 			`var get = ${runtimeTemplate.basicFunction("module, getScope", [

package/lib/container/ContainerPlugin.js

@@ -76,7 +76,7 @@ class ContainerPlugin {
 			const dep = new ContainerEntryDependency(name, exposes, shareScope);
 			dep.loc = { name };
 			compilation.addEntry(
-				compilation.options.context,
+				/** @type {string} */ (compilation.options.context),
 				dep,
 				{
 					name,

package/lib/container/RemoteRuntimeModule.js

@@ -12,6 +12,7 @@ const Template = require("../Template");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Chunk").ChunkId} ChunkId */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("./RemoteModule")} RemoteModule */
 
@@ -29,7 +30,7 @@ class RemoteRuntimeModule extends RuntimeModule {
 		const { runtimeTemplate, moduleGraph } = compilation;
 		/** @type {Record<ChunkId, (string | number)[]>} */
 		const chunkToRemotesMapping = {};
-		/** @type {Record<string | number, [string, string, string | number | null]>} */
+		/** @type {Record<ModuleId, [string, string, string | number | null]>} */
 		const idToExternalAndNameMapping = {};
 		for (const chunk of /** @type {Chunk} */ (this.chunk).getAllAsyncChunks()) {
 			const modules = chunkGraph.getChunkModulesIterableBySourceType(
@@ -37,19 +38,21 @@ class RemoteRuntimeModule extends RuntimeModule {
 				"remote"
 			);
 			if (!modules) continue;
-			/** @type {(string | number)[]} */
+			/** @type {ModuleId[]} */
 			const remotes = (chunkToRemotesMapping[
-				/** @type {ChunkId} */ (chunk.id)
+				/** @type {ChunkId} */
+				(chunk.id)
 			] = []);
 			for (const m of modules) {
 				const module = /** @type {RemoteModule} */ (m);
 				const name = module.internalRequest;
-				const id = chunkGraph.getModuleId(module);
+				const id = /** @type {ModuleId} */ (chunkGraph.getModuleId(module));
 				const shareScope = module.shareScope;
 				const dep = module.dependencies[0];
 				const externalModule = moduleGraph.getModule(dep);
 				const externalModuleId =
-					externalModule && chunkGraph.getModuleId(externalModule);
+					/** @type {ModuleId} */
+					(externalModule && chunkGraph.getModuleId(externalModule));
 				remotes.push(id);
 				idToExternalAndNameMapping[id] = [shareScope, name, externalModuleId];
 			}
@@ -76,7 +79,7 @@ class RemoteRuntimeModule extends RuntimeModule {
 						"var data = idToExternalAndNameMapping[id];",
 						"if(getScope.indexOf(data) >= 0) return;",
 						"getScope.push(data);",
-						`if(data.p) return promises.push(data.p);`,
+						"if(data.p) return promises.push(data.p);",
 						`var onError = ${runtimeTemplate.basicFunction("error", [
 							'if(!error) error = new Error("Container missing");',
 							'if(typeof error.message === "string")',
@@ -100,7 +103,7 @@ class RemoteRuntimeModule extends RuntimeModule {
 											"next(result, d)",
 											"result"
 										)}, onError);`,
-										`if(first) promises.push(data.p = p); else return p;`
+										"if(first) promises.push(data.p = p); else return p;"
 									]),
 									"} else {",
 									Template.indent(["return next(promise, d, first);"]),
@@ -116,7 +119,7 @@ class RemoteRuntimeModule extends RuntimeModule {
 							"external, _, first"
 						)};`,
 						`var onInitialized = ${runtimeTemplate.returningFunction(
-							`handleFunction(external.get, data[1], getScope, 0, onFactory, first)`,
+							"handleFunction(external.get, data[1], getScope, 0, onFactory, first)",
 							"_, external, first"
 						)};`,
 						`var onFactory = ${runtimeTemplate.basicFunction("factory", [

package/lib/container/options.js

@@ -5,7 +5,15 @@
 
 "use strict";
 
-/** @template T @typedef {(string | Record<string, string | string[] | T>)[] | Record<string, string | string[] | T>} ContainerOptionsFormat */
+/**
+ * @template T
+ * @typedef {Record<string, string | string[] | T>} Item
+ */
+
+/**
+ * @template T
+ * @typedef {(string | Item<T>)[] | Item<T>} ContainerOptionsFormat
+ */
 
 /**
  * @template T
@@ -17,6 +25,9 @@
  * @returns {void}
  */
 const process = (options, normalizeSimple, normalizeOptions, fn) => {
+	/**
+	 * @param {(string | Item<T>)[]} items items
+	 */
 	const array = items => {
 		for (const item of items) {
 			if (typeof item === "string") {
@@ -28,6 +39,9 @@ const process = (options, normalizeSimple, normalizeOptions, fn) => {
 			}
 		}
 	};
+	/**
+	 * @param {Item<T>} obj an object
+	 */
 	const object = obj => {
 		for (const [key, value] of Object.entries(obj)) {
 			if (typeof value === "string" || Array.isArray(value)) {
@@ -38,7 +52,7 @@ const process = (options, normalizeSimple, normalizeOptions, fn) => {
 		}
 	};
 	if (!options) {
-		return;
+		// Do nothing
 	} else if (Array.isArray(options)) {
 		array(options);
 	} else if (typeof options === "object") {
@@ -87,5 +101,5 @@ const scope = (scope, options) => {
 	return obj;
 };
 
-exports.parseOptions = parseOptions;
-exports.scope = scope;
+module.exports.parseOptions = parseOptions;
+module.exports.scope = scope;

package/lib/css/CssExportsGenerator.js

@@ -10,7 +10,6 @@ const { UsageState } = require("../ExportsInfo");
 const Generator = require("../Generator");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
-const { cssExportConvention } = require("../util/conventions");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
@@ -94,7 +93,7 @@ class CssExportsGenerator extends Generator {
 			chunkGraph: generateContext.chunkGraph,
 			module,
 			runtime: generateContext.runtime,
-			runtimeRequirements: runtimeRequirements,
+			runtimeRequirements,
 			concatenationScope: generateContext.concatenationScope,
 			codeGenerationResults: generateContext.codeGenerationResults,
 			initFragments,
@@ -123,58 +122,56 @@ class CssExportsGenerator extends Generator {
 			const template = generateContext.dependencyTemplates.get(constructor);
 			if (!template) {
 				throw new Error(
-					"No template for dependency: " + dependency.constructor.name
+					`No template for dependency: ${dependency.constructor.name}`
 				);
 			}
 
 			template.apply(dependency, source, templateContext);
 		};
-		module.dependencies.forEach(handleDependency);
+
+		for (const dependency of module.dependencies) {
+			handleDependency(dependency);
+		}
 
 		if (generateContext.concatenationScope) {
 			const source = new ConcatSource();
 			const usedIdentifiers = new Set();
 			for (const [name, v] of cssExportsData.exports) {
-				for (let k of cssExportConvention(name, this.convention)) {
-					let identifier = Template.toIdentifier(k);
-					let i = 0;
-					while (usedIdentifiers.has(identifier)) {
-						identifier = Template.toIdentifier(k + i);
-					}
-					usedIdentifiers.add(identifier);
-					generateContext.concatenationScope.registerExport(k, identifier);
-					source.add(
-						`${
-							generateContext.runtimeTemplate.supportsConst() ? "const" : "var"
-						} ${identifier} = ${JSON.stringify(v)};\n`
-					);
+				let identifier = Template.toIdentifier(name);
+				const i = 0;
+				while (usedIdentifiers.has(identifier)) {
+					identifier = Template.toIdentifier(name + i);
 				}
-			}
-			return source;
-		} else {
-			const needNsObj =
-				this.esModule &&
-				generateContext.moduleGraph
-					.getExportsInfo(module)
-					.otherExportsInfo.getUsed(generateContext.runtime) !==
-					UsageState.Unused;
-			if (needNsObj) {
-				generateContext.runtimeRequirements.add(
-					RuntimeGlobals.makeNamespaceObject
+				usedIdentifiers.add(identifier);
+				generateContext.concatenationScope.registerExport(name, identifier);
+				source.add(
+					`${
+						generateContext.runtimeTemplate.supportsConst() ? "const" : "var"
+					} ${identifier} = ${JSON.stringify(v)};\n`
 				);
 			}
-			const newExports = [];
-			for (let [k, v] of cssExportsData.exports) {
-				for (let name of cssExportConvention(k, this.convention)) {
-					newExports.push(`\t${JSON.stringify(name)}: ${JSON.stringify(v)}`);
-				}
-			}
-			return new RawSource(
-				`${needNsObj ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
-					module.moduleArgument
-				}.exports = {\n${newExports.join(",\n")}\n}${needNsObj ? ")" : ""};`
+			return source;
+		}
+		const needNsObj =
+			this.esModule &&
+			generateContext.moduleGraph
+				.getExportsInfo(module)
+				.otherExportsInfo.getUsed(generateContext.runtime) !==
+				UsageState.Unused;
+		if (needNsObj) {
+			generateContext.runtimeRequirements.add(
+				RuntimeGlobals.makeNamespaceObject
 			);
 		}
+		const exports = [];
+		for (const [name, v] of cssExportsData.exports) {
+			exports.push(`\t${JSON.stringify(name)}: ${JSON.stringify(v)}`);
+		}
+		return new RawSource(
+			`${needNsObj ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
+				module.moduleArgument
+			}.exports = {\n${exports.join(",\n")}\n}${needNsObj ? ")" : ""};`
+		);
 	}
 
 	/**
@@ -198,7 +195,9 @@ class CssExportsGenerator extends Generator {
 	 * @param {Hash} hash hash that will be modified
 	 * @param {UpdateHashContext} updateHashContext context for updating hash
 	 */
-	updateHash(hash, { module }) {}
+	updateHash(hash, { module }) {
+		hash.update(this.esModule.toString());
+	}
 }
 
 module.exports = CssExportsGenerator;

package/lib/css/CssGenerator.js

@@ -9,7 +9,6 @@ const { ReplaceSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
-const { cssExportConvention } = require("../util/conventions");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
@@ -96,25 +95,21 @@ class CssGenerator extends Generator {
 			const template = generateContext.dependencyTemplates.get(constructor);
 			if (!template) {
 				throw new Error(
-					"No template for dependency: " + dependency.constructor.name
+					`No template for dependency: ${dependency.constructor.name}`
 				);
 			}
 
 			template.apply(dependency, source, templateContext);
 		};
-		module.dependencies.forEach(handleDependency);
-		if (module.presentationalDependencies !== undefined)
-			module.presentationalDependencies.forEach(handleDependency);
-
-		if (cssExportsData.exports.size > 0) {
-			const newExports = new Map();
-			for (let [name, v] of cssExportsData.exports) {
-				for (let newName of cssExportConvention(name, this.convention)) {
-					newExports.set(newName, v);
-				}
+		for (const dependency of module.dependencies) {
+			handleDependency(dependency);
+		}
+		if (module.presentationalDependencies !== undefined) {
+			for (const dependency of module.presentationalDependencies) {
+				handleDependency(dependency);
 			}
-			cssExportsData.exports = newExports;
 		}
+
 		const data = generateContext.getData();
 		data.set("css-exports", cssExportsData);
 
@@ -148,7 +143,9 @@ class CssGenerator extends Generator {
 	 * @param {Hash} hash hash that will be modified
 	 * @param {UpdateHashContext} updateHashContext context for updating hash
 	 */
-	updateHash(hash, { module }) {}
+	updateHash(hash, { module }) {
+		hash.update(this.esModule.toString());
+	}
 }
 
 module.exports = CssGenerator;

package/lib/css/CssLoadingRuntimeModule.js

@@ -86,7 +86,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			 * @returns {boolean} true, if the chunk has css
 			 */
 			(chunk, chunkGraph) =>
-				!!chunkGraph.getChunkModulesIterableBySourceType(chunk, "css")
+				Boolean(chunkGraph.getChunkModulesIterableBySourceType(chunk, "css"))
 		);
 		const hasCssMatcher = compileBooleanMatcher(conditionMap);
 
@@ -210,7 +210,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 						Template.indent([
 							"var style = cssRules[j--].style;",
 							"if(!style) continue;",
-							`data = style.getPropertyValue(name);`
+							"data = style.getPropertyValue(name);"
 						]),
 						"}"
 					]),
@@ -224,7 +224,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 					withCompression
 						? Template.asString([
 								// LZW decode
-								`var map = {}, char = data[0], oldPhrase = char, decoded = char, code = 256, maxCode = ${"\uffff".charCodeAt(
+								`var map = {}, char = data[0], oldPhrase = char, decoded = char, code = 256, maxCode = ${"\uFFFF".charCodeAt(
 									0
 								)}, phrase;`,
 								"for (i = 1; i < data.length; i++) {",
@@ -255,12 +255,12 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 							","
 						)}) { token = token.replace(/^_/, ""); target[token] = (${runtimeTemplate.basicFunction(
 							"exports, module",
-							`module.exports = exports;`
+							"module.exports = exports;"
 						)}).bind(null, exports); ${
 							withHmr ? "moduleIds.push(token); " : ""
 						}token = ""; token2 = ""; exports = {};  }`,
 						`else if(cc == ${cc("\\")}) { token += data[++i] }`,
-						`else { token += data[i]; }`
+						"else { token += data[i]; }"
 					]),
 					"}",
 					`${
@@ -271,9 +271,9 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			)}`,
 			'var loadingAttribute = "data-webpack-loading";',
 			`var loadStylesheet = ${runtimeTemplate.basicFunction(
-				"chunkId, url, done" +
-					(withHmr ? ", hmr" : "") +
-					(withFetchPriority ? ", fetchPriority" : ""),
+				`chunkId, url, done${withHmr ? ", hmr" : ""}${
+					withFetchPriority ? ", fetchPriority" : ""
+				}`,
 				[
 					'var link, needAttach, key = "chunk-" + chunkId;',
 					withHmr ? "if(!hmr) {" : "",
@@ -360,7 +360,7 @@ class CssLoadingRuntimeModule 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);",
@@ -516,7 +516,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 								"}",
 								"while(newTags.length) {",
 								Template.indent([
-									`var info = newTags.pop();`,
+									"var info = newTags.pop();",
 									`var chunkModuleIds = loadCssChunkData(${RuntimeGlobals.moduleFactories}, info[1], info[0]);`,
 									`chunkModuleIds.forEach(${runtimeTemplate.expressionFunction(
 										"moduleIds.push(id)",