webpack 5.99.9 → 5.100.0

package/lib/json/JsonModulesPlugin.js

@@ -16,7 +16,7 @@ const JsonParser = require("./JsonParser");
 /** @typedef {import("../util/fs").JsonValue} JsonValue */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/json/JsonModulesPluginParser.check.js"),
+	require("../../schemas/plugins/json/JsonModulesPluginParser.check"),
 	() => require("../../schemas/plugins/json/JsonModulesPluginParser.json"),
 	{
 		name: "Json Modules Plugin",
@@ -25,7 +25,7 @@ const validate = createSchemaValidation(
 );
 
 const validateGenerator = createSchemaValidation(
-	require("../../schemas/plugins/json/JsonModulesPluginGenerator.check.js"),
+	require("../../schemas/plugins/json/JsonModulesPluginGenerator.check"),
 	() => require("../../schemas/plugins/json/JsonModulesPluginGenerator.json"),
 	{
 		name: "Json Modules Plugin",

package/lib/json/JsonParser.js

@@ -35,7 +35,7 @@ class JsonParser extends Parser {
 	 */
 	parse(source, state) {
 		if (Buffer.isBuffer(source)) {
-			source = source.toString("utf-8");
+			source = source.toString("utf8");
 		}
 
 		/** @type {NonNullable<JsonModulesPluginParserOptions["parse"]>} */

package/lib/library/AbstractLibraryPlugin.js

@@ -96,8 +96,9 @@ class AbstractLibraryPlugin {
 			 * @returns {T | false} options for the chunk
 			 */
 			const getOptionsForChunk = chunk => {
-				if (compilation.chunkGraph.getNumberOfEntryModules(chunk) === 0)
+				if (compilation.chunkGraph.getNumberOfEntryModules(chunk) === 0) {
 					return false;
+				}
 				const options = chunk.getEntryOptions();
 				const library = options && options.library;
 				return this._parseOptionsCached(
@@ -223,6 +224,7 @@ class AbstractLibraryPlugin {
 	 */
 	parseOptions(library) {
 		const AbstractMethodError = require("../AbstractMethodError");
+
 		throw new AbstractMethodError();
 	}
 
@@ -260,8 +262,9 @@ class AbstractLibraryPlugin {
 	 * @returns {void}
 	 */
 	runtimeRequirements(chunk, set, libraryContext) {
-		if (this.render !== AbstractLibraryPlugin.prototype.render)
+		if (this.render !== AbstractLibraryPlugin.prototype.render) {
 			set.add(RuntimeGlobals.returnExportsFromRuntime);
+		}
 	}
 
 	/**
@@ -302,4 +305,5 @@ class AbstractLibraryPlugin {
 }
 
 AbstractLibraryPlugin.COMMON_LIBRARY_NAME_MESSAGE = COMMON_LIBRARY_NAME_MESSAGE;
+
 module.exports = AbstractLibraryPlugin;

package/lib/library/AssignLibraryPlugin.js

@@ -82,8 +82,9 @@ const accessWithInit = (accessor, existingLength, initLast = false) => {
 	}
 
 	// print the last property as property access if not yet printed
-	if (i < accessor.length)
+	if (i < accessor.length) {
 		current = `${current}${propertyAccess([accessor[accessor.length - 1]])}`;
+	}
 
 	return current;
 };
@@ -190,7 +191,12 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	 */
 	_getResolvedFullName(options, chunk, compilation) {
 		const prefix = this._getPrefix(compilation);
-		const fullName = options.name ? prefix.concat(options.name) : prefix;
+		const fullName = options.name
+			? [
+					...prefix,
+					...(Array.isArray(options.name) ? options.name : [options.name])
+				]
+			: prefix;
 		return fullName.map(n =>
 			compilation.getPath(n, {
 				chunk
@@ -241,16 +247,18 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 		const topLevelDeclarations =
 			(data && data.get("topLevelDeclarations")) ||
 			(module.buildInfo && module.buildInfo.topLevelDeclarations);
-		if (!topLevelDeclarations)
+		if (!topLevelDeclarations) {
 			return "it doesn't tell about top level declarations.";
+		}
 		const fullNameResolved = this._getResolvedFullName(
 			options,
 			chunk,
 			compilation
 		);
 		const base = fullNameResolved[0];
-		if (topLevelDeclarations.has(base))
+		if (topLevelDeclarations.has(base)) {
 			return `it declares '${base}' on top-level, which conflicts with the current library output.`;
+		}
 	}
 
 	/**
@@ -325,6 +333,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 				result.add(
 					`var __webpack_exports_export__ = ${RuntimeGlobals.exports}${exportAccess};\n`
 				);
+
 				exports = "__webpack_exports_export__";
 			}
 			result.add(`for(var __webpack_i__ in ${exports}) {\n`);
@@ -335,9 +344,14 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 				);
 			}
 			result.add(
-				`  ${hasProvided ? "  " : ""}${webpackExportTarget}[__webpack_i__] = ${exports}[__webpack_i__];\n`
+				`  ${
+					hasProvided ? "  " : ""
+				}${webpackExportTarget}[__webpack_i__] = ${exports}[__webpack_i__];\n`
 			);
-			result.add(hasProvided ? "  }\n}\n" : "\n");
+			if (hasProvided) {
+				result.add("  }\n");
+			}
+			result.add("}\n");
 			result.add(
 				`Object.defineProperty(${exportTarget}, "__esModule", { value: true });\n`
 			);
@@ -355,6 +369,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 				result.add(
 					`var __webpack_exports_export__ = ${RuntimeGlobals.exports}${exportAccess};\n`
 				);
+
 				exports = "__webpack_exports_export__";
 			}
 			result.add(

package/lib/library/EnableLibraryPlugin.js

@@ -63,9 +63,7 @@ class EnableLibraryPlugin {
 					"EnableLibraryPlugin need to be used to enable this type of library. " +
 					'This usually happens through the "output.enabledLibraryTypes" option. ' +
 					'If you are using a function as entry which sets "library", you need to add all potential library types to "output.enabledLibraryTypes". ' +
-					`These types are enabled: ${Array.from(
-						getEnabledTypes(compiler)
-					).join(", ")}`
+					`These types are enabled: ${[...getEnabledTypes(compiler)].join(", ")}`
 			);
 		}
 	}
@@ -90,6 +88,7 @@ class EnableLibraryPlugin {
 		if (typeof type === "string") {
 			const enableExportProperty = () => {
 				const ExportPropertyTemplatePlugin = require("./ExportPropertyLibraryPlugin");
+
 				new ExportPropertyTemplatePlugin({
 					type,
 					nsObjectUsed: !["module", "modern-module"].includes(type),
@@ -101,6 +100,7 @@ class EnableLibraryPlugin {
 				case "var": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: [],
@@ -112,6 +112,7 @@ class EnableLibraryPlugin {
 				case "assign-properties": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: [],
@@ -124,6 +125,7 @@ class EnableLibraryPlugin {
 				case "assign": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: [],
@@ -135,6 +137,7 @@ class EnableLibraryPlugin {
 				case "this": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: ["this"],
@@ -146,6 +149,7 @@ class EnableLibraryPlugin {
 				case "window": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: ["window"],
@@ -157,6 +161,7 @@ class EnableLibraryPlugin {
 				case "self": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: ["self"],
@@ -168,6 +173,7 @@ class EnableLibraryPlugin {
 				case "global": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: "global",
@@ -179,6 +185,7 @@ class EnableLibraryPlugin {
 				case "commonjs": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: ["exports"],
@@ -190,6 +197,7 @@ class EnableLibraryPlugin {
 				case "commonjs-static": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: ["exports"],
@@ -202,6 +210,7 @@ class EnableLibraryPlugin {
 				case "commonjs-module": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+
 					new AssignLibraryPlugin({
 						type,
 						prefix: ["module", "exports"],
@@ -213,7 +222,9 @@ class EnableLibraryPlugin {
 				case "amd":
 				case "amd-require": {
 					enableExportProperty();
+
 					const AmdLibraryPlugin = require("./AmdLibraryPlugin");
+
 					new AmdLibraryPlugin({
 						type,
 						requireAsWrapper: type === "amd-require"
@@ -234,6 +245,7 @@ class EnableLibraryPlugin {
 									"WarnFalseIifeUmdPlugin",
 									compilation => {
 										const FalseIIFEUmdWarning = require("../FalseIIFEUmdWarning");
+
 										compilation.warnings.push(new FalseIIFEUmdWarning());
 									}
 								);
@@ -243,7 +255,9 @@ class EnableLibraryPlugin {
 						new WarnFalseIifeUmdPlugin().apply(compiler);
 					}
 					enableExportProperty();
+
 					const UmdLibraryPlugin = require("./UmdLibraryPlugin");
+
 					new UmdLibraryPlugin({
 						type,
 						optionalAmdExternalAsGlobal: type === "umd2"
@@ -252,7 +266,9 @@ class EnableLibraryPlugin {
 				}
 				case "system": {
 					enableExportProperty();
+
 					const SystemLibraryPlugin = require("./SystemLibraryPlugin");
+
 					new SystemLibraryPlugin({
 						type
 					}).apply(compiler);
@@ -260,7 +276,9 @@ class EnableLibraryPlugin {
 				}
 				case "jsonp": {
 					enableExportProperty();
+
 					const JsonpLibraryPlugin = require("./JsonpLibraryPlugin");
+
 					new JsonpLibraryPlugin({
 						type
 					}).apply(compiler);
@@ -269,7 +287,9 @@ class EnableLibraryPlugin {
 				case "module":
 				case "modern-module": {
 					enableExportProperty();
+
 					const ModuleLibraryPlugin = require("./ModuleLibraryPlugin");
+
 					new ModuleLibraryPlugin({
 						type
 					}).apply(compiler);

package/lib/library/UmdLibraryPlugin.js

@@ -47,8 +47,9 @@ const accessorAccess = (base, accessor, joinWith = ", ") => {
 				? base + accessorToObjectAccess(accessors.slice(0, idx + 1))
 				: accessors[0] + accessorToObjectAccess(accessors.slice(1, idx + 1));
 			if (idx === accessors.length - 1) return a;
-			if (idx === 0 && base === undefined)
+			if (idx === 0 && base === undefined) {
 				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
+			}
 			return `${a} = ${a} || {}`;
 		})
 		.join(joinWith);
@@ -147,7 +148,7 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 					requiredExternals.push(m);
 				}
 			}
-			externals = requiredExternals.concat(optionalExternals);
+			externals = [...requiredExternals, ...optionalExternals];
 		} else {
 			requiredExternals = externals;
 		}
@@ -188,11 +189,15 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 				modules
 					.map(m => {
 						let request = m.request;
-						if (typeof request === "object")
+						if (typeof request === "object") {
 							request =
 								/** @type {RequestRecord} */
 								(request).root;
-						return `root${accessorToObjectAccess(/** @type {string[]} */ ([]).concat(request))}`;
+						}
+						return `root${accessorToObjectAccess(
+							/** @type {string[]} */
+							([...(Array.isArray(request) ? request : [request])])
+						)}`;
 					})
 					.join(", ")
 			);
@@ -252,7 +257,10 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 			JSON.stringify(
 				replaceKeys(
 					/** @type {string} */
-					(/** @type {string[]} */ ([]).concat(library).pop())
+					(
+						/** @type {string[]} */
+						([...(Array.isArray(library) ? library : [library])]).pop()
+					)
 				)
 			);
 
@@ -281,8 +289,9 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		 */
 		const getAuxiliaryComment = type => {
 			if (auxiliaryComment) {
-				if (typeof auxiliaryComment === "string")
+				if (typeof auxiliaryComment === "string") {
 					return `\t//${auxiliaryComment}\n`;
+				}
 				if (auxiliaryComment[type]) return `\t//${auxiliaryComment[type]}\n`;
 			}
 			return "";

package/lib/logging/createConsoleLogger.js

@@ -85,9 +85,9 @@ module.exports = ({ level = "info", debug = false, console }) => {
 		(
 			typeof debug === "boolean"
 				? [() => debug]
-				: /** @type {FilterItemTypes[]} */ ([])
-						.concat(debug)
-						.map(filterToFunction)
+				: /** @type {FilterItemTypes[]} */ ([
+						...(Array.isArray(debug) ? debug : [debug])
+					]).map(filterToFunction)
 		);
 	const loglevel = LogLevel[`${level}`] || 0;
 

package/lib/logging/runtime.js

@@ -17,6 +17,15 @@ const currentDefaultLoggerOptions = {
 };
 let currentDefaultLogger = createConsoleLogger(currentDefaultLoggerOptions);
 
+/**
+ * @param {createConsoleLogger.LoggerOptions} options new options, merge with old options
+ * @returns {void}
+ */
+module.exports.configureDefaultLogger = options => {
+	Object.assign(currentDefaultLoggerOptions, options);
+	currentDefaultLogger = createConsoleLogger(currentDefaultLoggerOptions);
+};
+
 /**
  * @param {string} name name of the logger
  * @returns {Logger} a logger
@@ -31,15 +40,6 @@ module.exports.getLogger = name =>
 		childName => module.exports.getLogger(`${name}/${childName}`)
 	);
 
-/**
- * @param {createConsoleLogger.LoggerOptions} options new options, merge with old options
- * @returns {void}
- */
-module.exports.configureDefaultLogger = options => {
-	Object.assign(currentDefaultLoggerOptions, options);
-	currentDefaultLogger = createConsoleLogger(currentDefaultLoggerOptions);
-};
-
 module.exports.hooks = {
 	log: new SyncBailHook(["origin", "type", "args"])
 };

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -7,6 +7,9 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
+const {
+	generateJavascriptHMR
+} = require("../hmr/JavascriptHotModuleReplacementHelper");
 const {
 	chunkHasJs,
 	getChunkFilenameTemplate
@@ -242,28 +245,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						"",
-						Template.getFunctionContent(
-							require("../hmr/JavascriptHotModuleReplacement.runtime.js")
-						)
-							.replace(/\$key\$/g, "readFileVm")
-							.replace(/\$installedChunks\$/g, "installedChunks")
-							.replace(/\$loadUpdateChunk\$/g, "loadUpdateChunk")
-							.replace(/\$moduleCache\$/g, RuntimeGlobals.moduleCache)
-							.replace(/\$moduleFactories\$/g, RuntimeGlobals.moduleFactories)
-							.replace(
-								/\$ensureChunkHandlers\$/g,
-								RuntimeGlobals.ensureChunkHandlers
-							)
-							.replace(/\$hasOwnProperty\$/g, RuntimeGlobals.hasOwnProperty)
-							.replace(/\$hmrModuleData\$/g, RuntimeGlobals.hmrModuleData)
-							.replace(
-								/\$hmrDownloadUpdateHandlers\$/g,
-								RuntimeGlobals.hmrDownloadUpdateHandlers
-							)
-							.replace(
-								/\$hmrInvalidateModuleHandlers\$/g,
-								RuntimeGlobals.hmrInvalidateModuleHandlers
-							)
+						generateJavascriptHMR("readFileVm")
 					])
 				: "// no HMR",
 			"",

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -7,6 +7,9 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
+const {
+	generateJavascriptHMR
+} = require("../hmr/JavascriptHotModuleReplacementHelper");
 const {
 	chunkHasJs,
 	getChunkFilenameTemplate
@@ -199,28 +202,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						"",
-						Template.getFunctionContent(
-							require("../hmr/JavascriptHotModuleReplacement.runtime.js")
-						)
-							.replace(/\$key\$/g, "require")
-							.replace(/\$installedChunks\$/g, "installedChunks")
-							.replace(/\$loadUpdateChunk\$/g, "loadUpdateChunk")
-							.replace(/\$moduleCache\$/g, RuntimeGlobals.moduleCache)
-							.replace(/\$moduleFactories\$/g, RuntimeGlobals.moduleFactories)
-							.replace(
-								/\$ensureChunkHandlers\$/g,
-								RuntimeGlobals.ensureChunkHandlers
-							)
-							.replace(/\$hasOwnProperty\$/g, RuntimeGlobals.hasOwnProperty)
-							.replace(/\$hmrModuleData\$/g, RuntimeGlobals.hmrModuleData)
-							.replace(
-								/\$hmrDownloadUpdateHandlers\$/g,
-								RuntimeGlobals.hmrDownloadUpdateHandlers
-							)
-							.replace(
-								/\$hmrInvalidateModuleHandlers\$/g,
-								RuntimeGlobals.hmrInvalidateModuleHandlers
-							)
+						generateJavascriptHMR("require")
 					])
 				: "// no HMR",
 			"",

package/lib/node/nodeConsole.js

@@ -124,9 +124,11 @@ module.exports = ({ colors, appendOnly, stream }) => {
 			currentCollapsed++;
 		},
 		groupEnd: () => {
-			if (currentCollapsed > 0) currentCollapsed--;
-			else if (currentIndent.length >= 2)
+			if (currentCollapsed > 0) {
+				currentCollapsed--;
+			} else if (currentIndent.length >= 2) {
 				currentIndent = currentIndent.slice(0, -2);
+			}
 		},
 		profile: console.profile && (name => console.profile(name)),
 		profileEnd: console.profileEnd && (name => console.profileEnd(name)),

package/lib/optimize/AggressiveMergingPlugin.js

@@ -15,6 +15,8 @@ const { STAGE_ADVANCED } = require("../OptimizationStages");
  * @property {number=} minSizeReduce minimal size reduction to trigger merging
  */
 
+const PLUGIN_NAME = "AggressiveMergingPlugin";
+
 class AggressiveMergingPlugin {
 	/**
 	 * @param {AggressiveMergingPluginOptions=} options options object
@@ -40,58 +42,55 @@ class AggressiveMergingPlugin {
 		const options = this.options;
 		const minSizeReduce = options.minSizeReduce || 1.5;
 
-		compiler.hooks.thisCompilation.tap(
-			"AggressiveMergingPlugin",
-			compilation => {
-				compilation.hooks.optimizeChunks.tap(
-					{
-						name: "AggressiveMergingPlugin",
-						stage: STAGE_ADVANCED
-					},
-					chunks => {
-						const chunkGraph = compilation.chunkGraph;
-						/** @type {{a: Chunk, b: Chunk, improvement: number}[]} */
-						const combinations = [];
-						for (const a of chunks) {
-							if (a.canBeInitial()) continue;
-							for (const b of chunks) {
-								if (b.canBeInitial()) continue;
-								if (b === a) break;
-								if (!chunkGraph.canChunksBeIntegrated(a, b)) {
-									continue;
-								}
-								const aSize = chunkGraph.getChunkSize(b, {
-									chunkOverhead: 0
-								});
-								const bSize = chunkGraph.getChunkSize(a, {
-									chunkOverhead: 0
-								});
-								const abSize = chunkGraph.getIntegratedChunksSize(b, a, {
-									chunkOverhead: 0
-								});
-								const improvement = (aSize + bSize) / abSize;
-								combinations.push({
-									a,
-									b,
-									improvement
-								});
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+			compilation.hooks.optimizeChunks.tap(
+				{
+					name: PLUGIN_NAME,
+					stage: STAGE_ADVANCED
+				},
+				chunks => {
+					const chunkGraph = compilation.chunkGraph;
+					/** @type {{a: Chunk, b: Chunk, improvement: number}[]} */
+					const combinations = [];
+					for (const a of chunks) {
+						if (a.canBeInitial()) continue;
+						for (const b of chunks) {
+							if (b.canBeInitial()) continue;
+							if (b === a) break;
+							if (!chunkGraph.canChunksBeIntegrated(a, b)) {
+								continue;
 							}
+							const aSize = chunkGraph.getChunkSize(b, {
+								chunkOverhead: 0
+							});
+							const bSize = chunkGraph.getChunkSize(a, {
+								chunkOverhead: 0
+							});
+							const abSize = chunkGraph.getIntegratedChunksSize(b, a, {
+								chunkOverhead: 0
+							});
+							const improvement = (aSize + bSize) / abSize;
+							combinations.push({
+								a,
+								b,
+								improvement
+							});
 						}
+					}
 
-						combinations.sort((a, b) => b.improvement - a.improvement);
+					combinations.sort((a, b) => b.improvement - a.improvement);
 
-						const pair = combinations[0];
+					const pair = combinations[0];
 
-						if (!pair) return;
-						if (pair.improvement < minSizeReduce) return;
+					if (!pair) return;
+					if (pair.improvement < minSizeReduce) return;
 
-						chunkGraph.integrateChunks(pair.b, pair.a);
-						compilation.chunks.delete(pair.a);
-						return true;
-					}
-				);
-			}
-		);
+					chunkGraph.integrateChunks(pair.b, pair.a);
+					compilation.chunks.delete(pair.a);
+					return true;
+				}
+			);
+		});
 	}
 }