Merge pull request #12060 from webpack/deps/update

update dev deps and tooling, fix some optional types in typings

.eslintrc.js

@@ -96,7 +96,8 @@ module.exports = {
 				"jest/globals": true
 			},
 			globals: {
-				nsObj: false
+				nsObj: false,
+				jasmine: false
 			}
 		}
 	]

lib/Compilation.js

@@ -87,15 +87,11 @@ const { getRuntimeKey } = require("./util/runtime");
 /** @typedef {import("./Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("./DependencyTemplate")} DependencyTemplate */
 /** @typedef {import("./Entrypoint").EntryOptions} EntryOptions */
-/** @typedef {import("./Module")} Module */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./ModuleFactory")} ModuleFactory */
 /** @typedef {import("./RuntimeModule")} RuntimeModule */
 /** @typedef {import("./Template").RenderManifestEntry} RenderManifestEntry */
 /** @typedef {import("./Template").RenderManifestOptions} RenderManifestOptions */
-/** @typedef {import("./WebpackError")} WebpackError */
-/** @typedef {import("./stats/StatsFactory")} StatsFactory */
-/** @typedef {import("./stats/StatsPrinter")} StatsPrinter */
 /** @typedef {import("./util/Hash")} Hash */
 /** @template T @typedef {import("./util/deprecation").FakeHook<T>} FakeHook<T> */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */

lib/ConcurrentCompilationError.js

@@ -7,7 +7,9 @@
 
 const WebpackError = require("./WebpackError");
 
-module.exports = class ConcurrentCompilationError extends WebpackError {
+module.exports = class ConcurrentCompilationError extends (
+	WebpackError
+) {
 	constructor() {
 		super();
 

lib/ContextModuleFactory.js

@@ -26,7 +26,9 @@ const { join } = require("./util/fs");
 
 const EMPTY_RESOLVE_OPTIONS = {};
 
-module.exports = class ContextModuleFactory extends ModuleFactory {
+module.exports = class ContextModuleFactory extends (
+	ModuleFactory
+) {
 	/**
 	 * @param {ResolverFactory} resolverFactory resolverFactory
 	 */

lib/ExportsInfo.js

@@ -1085,7 +1085,7 @@ class ExportInfo {
 
 	/**
 	 * get used name
-	 * @param {string=} fallbackName fallback name for used exports with no name
+	 * @param {string | undefined} fallbackName fallback name for used exports with no name
 	 * @param {RuntimeSpec} runtime check usage for this runtime only
 	 * @returns {string | false} used name
 	 */

lib/FlagDependencyUsagePlugin.js

@@ -16,7 +16,6 @@ const { getEntryRuntime, mergeRuntimeOwned } = require("./util/runtime");
 /** @typedef {import("./ChunkGroup")} ChunkGroup */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
-/** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("./ExportsInfo")} ExportsInfo */
 /** @typedef {import("./Module")} Module */
@@ -207,7 +206,10 @@ class FlagDependencyUsagePlugin {
 									referencedExports === EXPORTS_OBJECT_REFERENCED
 								) {
 									map.set(module, referencedExports);
-								} else if (oldReferencedExports === NO_EXPORTS_REFERENCED) {
+								} else if (
+									oldReferencedExports !== undefined &&
+									referencedExports === NO_EXPORTS_REFERENCED
+								) {
 									continue;
 								} else {
 									let exportsMap;

lib/HarmonyLinkingError.js

@@ -6,7 +6,9 @@
 
 const WebpackError = require("./WebpackError");
 
-module.exports = class HarmonyLinkingError extends WebpackError {
+module.exports = class HarmonyLinkingError extends (
+	WebpackError
+) {
 	/** @param {string} message Error message */
 	constructor(message) {
 		super(message);

lib/ModuleDependencyWarning.js

@@ -10,7 +10,9 @@ const WebpackError = require("./WebpackError");
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Module")} Module */
 
-module.exports = class ModuleDependencyWarning extends WebpackError {
+module.exports = class ModuleDependencyWarning extends (
+	WebpackError
+) {
 	/**
 	 * @param {Module} module module tied to dependency
 	 * @param {Error} err error thrown

lib/NoModeWarning.js

@@ -7,7 +7,9 @@
 
 const WebpackError = require("./WebpackError");
 
-module.exports = class NoModeWarning extends WebpackError {
+module.exports = class NoModeWarning extends (
+	WebpackError
+) {
 	constructor(modules) {
 		super();
 

lib/NormalModule.js

@@ -42,7 +42,6 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
-/** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Generator")} Generator */

lib/RuntimeTemplate.js

@@ -17,7 +17,6 @@ const { forEachRuntime, subtractRuntime } = require("./util/runtime");
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./Dependency")} Dependency */
-/** @typedef {import("./InitFragment")} InitFragment */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./RequestShortener")} RequestShortener */
@@ -607,8 +606,6 @@ class RuntimeTemplate {
 	 * @param {string} options.importVar name of the import variable
 	 * @param {Module} options.originModule module in which the statement is emitted
 	 * @param {boolean=} options.weak true, if this is a weak dependency
-	 * @param {RuntimeSpec=} options.runtime runtime for which this code will be generated
-	 * @param {RuntimeSpec | boolean=} options.runtimeCondition only execute the statement in some runtimes
 	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {[string, string]} the import statement and the compat statement
 	 */

lib/Template.js

@@ -7,7 +7,6 @@
 
 const { ConcatSource, PrefixSource } = require("webpack-sources");
 
-/** @typedef {import("webpack-sources").ConcatSource} ConcatSource */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */
 /** @typedef {import("./Chunk")} Chunk */

lib/Watching.js

@@ -10,7 +10,6 @@ const Stats = require("./Stats");
 /** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Stats")} Stats */
 
 /**
  * @template T

lib/cache/ResolverCachePlugin.js

@@ -13,7 +13,6 @@ const makeSerializable = require("../util/makeSerializable");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../FileSystemInfo")} FileSystemInfo */
 /** @typedef {import("../FileSystemInfo").Snapshot} Snapshot */
-/** @template T @typedef {import("../util/LazySet")<T>} LazySet<T> */
 
 class CacheEntry {
 	constructor(result, snapshot) {

lib/container/ContainerEntryModuleFactory.js

@@ -12,7 +12,9 @@ const ContainerEntryModule = require("./ContainerEntryModule");
 /** @typedef {import("../ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
 /** @typedef {import("./ContainerEntryDependency")} ContainerEntryDependency */
 
-module.exports = class ContainerEntryModuleFactory extends ModuleFactory {
+module.exports = class ContainerEntryModuleFactory extends (
+	ModuleFactory
+) {
 	/**
 	 * @param {ModuleFactoryCreateData} data data object
 	 * @param {function(Error=, ModuleFactoryResult=): void} callback callback

lib/container/FallbackModuleFactory.js

@@ -12,7 +12,9 @@ const FallbackModule = require("./FallbackModule");
 /** @typedef {import("../ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
 /** @typedef {import("./FallbackDependency")} FallbackDependency */
 
-module.exports = class FallbackModuleFactory extends ModuleFactory {
+module.exports = class FallbackModuleFactory extends (
+	ModuleFactory
+) {
 	/**
 	 * @param {ModuleFactoryCreateData} data data object
 	 * @param {function(Error=, ModuleFactoryResult=): void} callback callback

lib/dependencies/AMDDefineDependency.js

@@ -147,7 +147,9 @@ makeSerializable(
 	"webpack/lib/dependencies/AMDDefineDependency"
 );
 
-AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends NullDependency.Template {
+AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/AMDRequireArrayDependency.js

@@ -53,7 +53,9 @@ makeSerializable(
 	"webpack/lib/dependencies/AMDRequireArrayDependency"
 );
 
-AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate extends DependencyTemplate {
+AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate extends (
+	DependencyTemplate
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/AMDRequireDependency.js

@@ -62,7 +62,9 @@ makeSerializable(
 	"webpack/lib/dependencies/AMDRequireDependency"
 );
 
-AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends NullDependency.Template {
+AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/CachedConstDependency.js

@@ -67,7 +67,9 @@ makeSerializable(
 	"webpack/lib/dependencies/CachedConstDependency"
 );
 
-CachedConstDependency.Template = class CachedConstDependencyTemplate extends DependencyTemplate {
+CachedConstDependency.Template = class CachedConstDependencyTemplate extends (
+	DependencyTemplate
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/CommonJsExportRequireDependency.js

@@ -16,7 +16,6 @@ const ModuleDependency = require("./ModuleDependency");
 const processExportInfo = require("./processExportInfo");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
@@ -294,7 +293,9 @@ makeSerializable(
 	"webpack/lib/dependencies/CommonJsExportRequireDependency"
 );
 
-CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependencyTemplate extends ModuleDependency.Template {
+CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependencyTemplate extends (
+	ModuleDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/CommonJsExportsDependency.js

@@ -77,7 +77,9 @@ makeSerializable(
 	"webpack/lib/dependencies/CommonJsExportsDependency"
 );
 
-CommonJsExportsDependency.Template = class CommonJsExportsDependencyTemplate extends NullDependency.Template {
+CommonJsExportsDependency.Template = class CommonJsExportsDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/CommonJsFullRequireDependency.js

@@ -76,7 +76,9 @@ class CommonJsFullRequireDependency extends ModuleDependency {
 	}
 }
 
-CommonJsFullRequireDependency.Template = class CommonJsFullRequireDependencyTemplate extends ModuleDependency.Template {
+CommonJsFullRequireDependency.Template = class CommonJsFullRequireDependencyTemplate extends (
+	ModuleDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/CommonJsSelfReferenceDependency.js

@@ -77,7 +77,9 @@ makeSerializable(
 	"webpack/lib/dependencies/CommonJsSelfReferenceDependency"
 );
 
-CommonJsSelfReferenceDependency.Template = class CommonJsSelfReferenceDependencyTemplate extends NullDependency.Template {
+CommonJsSelfReferenceDependency.Template = class CommonJsSelfReferenceDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/ConstDependency.js

@@ -72,7 +72,9 @@ class ConstDependency extends NullDependency {
 
 makeSerializable(ConstDependency, "webpack/lib/dependencies/ConstDependency");
 
-ConstDependency.Template = class ConstDependencyTemplate extends NullDependency.Template {
+ConstDependency.Template = class ConstDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/ExportsInfoDependency.js

@@ -127,7 +127,9 @@ makeSerializable(
 	"webpack/lib/dependencies/ExportsInfoDependency"
 );
 
-ExportsInfoDependency.Template = class ExportsInfoDependencyTemplate extends NullDependency.Template {
+ExportsInfoDependency.Template = class ExportsInfoDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyAcceptDependency.js

@@ -54,7 +54,9 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyAcceptDependency"
 );
 
-HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends NullDependency.Template {
+HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyAcceptImportDependency.js

@@ -28,6 +28,8 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyAcceptImportDependency"
 );
 
-HarmonyAcceptImportDependency.Template = class HarmonyAcceptImportDependencyTemplate extends HarmonyImportDependency.Template {};
+HarmonyAcceptImportDependency.Template = class HarmonyAcceptImportDependencyTemplate extends (
+	HarmonyImportDependency.Template
+) {};
 
 module.exports = HarmonyAcceptImportDependency;

lib/dependencies/HarmonyCompatibilityDependency.js

@@ -27,7 +27,9 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyCompatibilityDependency"
 );
 
-HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate extends NullDependency.Template {
+HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyExportExpressionDependency.js

@@ -77,7 +77,9 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyExportExpressionDependency"
 );
 
-HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTemplate extends NullDependency.Template {
+HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyExportHeaderDependency.js

@@ -43,7 +43,9 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyExportHeaderDependency"
 );
 
-HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate extends NullDependency.Template {
+HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -19,7 +19,6 @@ const processExportInfo = require("./processExportInfo");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
@@ -734,7 +733,9 @@ makeSerializable(
 
 module.exports = HarmonyExportImportedSpecifierDependency;
 
-HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedSpecifierDependencyTemplate extends HarmonyImportDependency.Template {
+HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedSpecifierDependencyTemplate extends (
+	HarmonyImportDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyExportSpecifierDependency.js

@@ -68,7 +68,9 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyExportSpecifierDependency"
 );
 
-HarmonyExportSpecifierDependency.Template = class HarmonyExportSpecifierDependencyTemplate extends NullDependency.Template {
+HarmonyExportSpecifierDependency.Template = class HarmonyExportSpecifierDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyImportDependency.js

@@ -17,7 +17,6 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
@@ -256,7 +255,9 @@ module.exports = HarmonyImportDependency;
 /** @type {WeakMap<Module, WeakMap<Module, RuntimeSpec | boolean>>} */
 const importEmittedMap = new WeakMap();
 
-HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends ModuleDependency.Template {
+HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends (
+	ModuleDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -56,7 +56,9 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyImportSideEffectDependency"
 );
 
-HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDependencyTemplate extends HarmonyImportDependency.Template {
+HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDependencyTemplate extends (
+	HarmonyImportDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -244,7 +244,9 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyImportSpecifierDependency"
 );
 
-HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependencyTemplate extends HarmonyImportDependency.Template {
+HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependencyTemplate extends (
+	HarmonyImportDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/ImportDependency.js

@@ -11,7 +11,6 @@ const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../AsyncDependenciesBlock")} AsyncDependenciesBlock */
-/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
@@ -67,7 +66,9 @@ class ImportDependency extends ModuleDependency {
 
 makeSerializable(ImportDependency, "webpack/lib/dependencies/ImportDependency");
 
-ImportDependency.Template = class ImportDependencyTemplate extends ModuleDependency.Template {
+ImportDependency.Template = class ImportDependencyTemplate extends (
+	ModuleDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/ImportEagerDependency.js

@@ -38,7 +38,9 @@ makeSerializable(
 	"webpack/lib/dependencies/ImportEagerDependency"
 );
 
-ImportEagerDependency.Template = class ImportEagerDependencyTemplate extends ImportDependency.Template {
+ImportEagerDependency.Template = class ImportEagerDependencyTemplate extends (
+	ImportDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/ImportWeakDependency.js

@@ -35,7 +35,9 @@ makeSerializable(
 	"webpack/lib/dependencies/ImportWeakDependency"
 );
 
-ImportWeakDependency.Template = class ImportDependencyTemplate extends ImportDependency.Template {
+ImportWeakDependency.Template = class ImportDependencyTemplate extends (
+	ImportDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/LocalModuleDependency.js

@@ -47,7 +47,9 @@ makeSerializable(
 	"webpack/lib/dependencies/LocalModuleDependency"
 );
 
-LocalModuleDependency.Template = class LocalModuleDependencyTemplate extends NullDependency.Template {
+LocalModuleDependency.Template = class LocalModuleDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/ModuleDecoratorDependency.js

@@ -13,7 +13,6 @@ const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
@@ -95,7 +94,9 @@ makeSerializable(
 	"webpack/lib/dependencies/ModuleDecoratorDependency"
 );
 
-ModuleDecoratorDependency.Template = class ModuleDecoratorDependencyTemplate extends NullDependency.Template {
+ModuleDecoratorDependency.Template = class ModuleDecoratorDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/NullDependency.js

@@ -10,7 +10,6 @@ const DependencyTemplate = require("../DependencyTemplate");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
@@ -38,7 +37,9 @@ class NullDependency extends Dependency {
 	}
 }
 
-NullDependency.Template = class NullDependencyTemplate extends DependencyTemplate {
+NullDependency.Template = class NullDependencyTemplate extends (
+	DependencyTemplate
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/PureExpressionDependency.js

@@ -68,7 +68,9 @@ makeSerializable(
 	"webpack/lib/dependencies/PureExpressionDependency"
 );
 
-PureExpressionDependency.Template = class PureExpressionDependencyTemplate extends NullDependency.Template {
+PureExpressionDependency.Template = class PureExpressionDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/RequireEnsureDependency.js

@@ -53,7 +53,9 @@ makeSerializable(
 	"webpack/lib/dependencies/RequireEnsureDependency"
 );
 
-RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends NullDependency.Template {
+RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/RequireHeaderDependency.js

@@ -38,7 +38,9 @@ makeSerializable(
 	"webpack/lib/dependencies/RequireHeaderDependency"
 );
 
-RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate extends NullDependency.Template {
+RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/RequireIncludeDependency.js

@@ -11,7 +11,6 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
@@ -49,7 +48,9 @@ makeSerializable(
 	"webpack/lib/dependencies/RequireIncludeDependency"
 );
 
-RequireIncludeDependency.Template = class RequireIncludeDependencyTemplate extends ModuleDependency.Template {
+RequireIncludeDependency.Template = class RequireIncludeDependencyTemplate extends (
+	ModuleDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/RequireResolveHeaderDependency.js

@@ -41,7 +41,9 @@ makeSerializable(
 	"webpack/lib/dependencies/RequireResolveHeaderDependency"
 );
 
-RequireResolveHeaderDependency.Template = class RequireResolveHeaderDependencyTemplate extends NullDependency.Template {
+RequireResolveHeaderDependency.Template = class RequireResolveHeaderDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/RuntimeRequirementsDependency.js

@@ -53,7 +53,9 @@ makeSerializable(
 	"webpack/lib/dependencies/RuntimeRequirementsDependency"
 );
 
-RuntimeRequirementsDependency.Template = class RuntimeRequirementsDependencyTemplate extends NullDependency.Template {
+RuntimeRequirementsDependency.Template = class RuntimeRequirementsDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/URLDependency.js

@@ -36,7 +36,9 @@ class URLDependency extends ModuleDependency {
 	}
 }
 
-URLDependency.Template = class URLDependencyTemplate extends ModuleDependency.Template {
+URLDependency.Template = class URLDependencyTemplate extends (
+	ModuleDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/UnsupportedDependency.js

@@ -44,7 +44,9 @@ makeSerializable(
 	"webpack/lib/dependencies/UnsupportedDependency"
 );
 
-UnsupportedDependency.Template = class UnsupportedDependencyTemplate extends NullDependency.Template {
+UnsupportedDependency.Template = class UnsupportedDependencyTemplate extends (
+	NullDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/dependencies/WorkerDependency.js

@@ -13,7 +13,6 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../AsyncDependenciesBlock")} AsyncDependenciesBlock */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
@@ -51,7 +50,9 @@ class WorkerDependency extends ModuleDependency {
 	}
 }
 
-WorkerDependency.Template = class WorkerDependencyTemplate extends ModuleDependency.Template {
+WorkerDependency.Template = class WorkerDependencyTemplate extends (
+	ModuleDependency.Template
+) {
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified

lib/hmr/HotModuleReplacement.runtime.js

@@ -33,6 +33,7 @@ module.exports = function () {
 	var currentUpdateApplyHandlers;
 	var queuedInvalidatedModules;
 
+	// eslint-disable-next-line no-unused-vars
 	$hmrModuleData$ = currentModuleData;
 
 	$interceptModuleExecution$.push(function (options) {

lib/optimize/SplitChunksPlugin.js

@@ -26,7 +26,6 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
 /** @typedef {import("../../declarations/WebpackOptions").OptimizationSplitChunksOptions} OptimizationSplitChunksOptions */
 /** @typedef {import("../../declarations/WebpackOptions").OptimizationSplitChunksSizes} OptimizationSplitChunksSizes */
 /** @typedef {import("../../declarations/WebpackOptions").Output} OutputOptions */
-/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../ChunkGroup")} ChunkGroup */
 /** @typedef {import("../Compilation").AssetInfo} AssetInfo */

lib/performance/AssetsOverSizeLimitWarning.js

@@ -10,7 +10,9 @@ const WebpackError = require("../WebpackError");
 
 /** @typedef {import("./SizeLimitsPlugin").AssetDetails} AssetDetails */
 
-module.exports = class AssetsOverSizeLimitWarning extends WebpackError {
+module.exports = class AssetsOverSizeLimitWarning extends (
+	WebpackError
+) {
 	/**
 	 * @param {AssetDetails[]} assetsOverSizeLimit the assets
 	 * @param {number} assetLimit the size limit

lib/performance/EntrypointsOverSizeLimitWarning.js

@@ -10,7 +10,9 @@ const WebpackError = require("../WebpackError");
 
 /** @typedef {import("./SizeLimitsPlugin").EntrypointDetails} EntrypointDetails */
 
-module.exports = class EntrypointsOverSizeLimitWarning extends WebpackError {
+module.exports = class EntrypointsOverSizeLimitWarning extends (
+	WebpackError
+) {
 	/**
 	 * @param {EntrypointDetails[]} entrypoints the entrypoints
 	 * @param {number} entrypointLimit the size limit

lib/performance/NoAsyncChunksWarning.js

@@ -7,7 +7,9 @@
 
 const WebpackError = require("../WebpackError");
 
-module.exports = class NoAsyncChunksWarning extends WebpackError {
+module.exports = class NoAsyncChunksWarning extends (
+	WebpackError
+) {
 	constructor() {
 		super(
 			"webpack performance recommendations: \n" +

lib/runtime/LoadScriptRuntimeModule.js

@@ -11,7 +11,6 @@ const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
 /** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
 
 /**

lib/serialization/FileMiddleware.js

@@ -233,7 +233,8 @@ class FileMiddleware extends SerializerMiddleware {
 	 * @param {Object} context context object
 	 * @returns {SerializedType|Promise<SerializedType>} serialized data
 	 */
-	serialize(data, { filename, extension = "" }) {
+	serialize(data, context) {
+		const { filename, extension = "" } = context;
 		return new Promise((resolve, reject) => {
 			mkdirp(this.fs, dirname(this.fs, filename), err => {
 				if (err) return reject(err);
@@ -301,7 +302,8 @@ class FileMiddleware extends SerializerMiddleware {
 	 * @param {Object} context context object
 	 * @returns {DeserializedType|Promise<DeserializedType>} deserialized data
 	 */
-	deserialize(data, { filename, extension = "" }) {
+	deserialize(data, context) {
+		const { filename, extension = "" } = context;
 		const readFile = name =>
 			new Promise((resolve, reject) => {
 				const file = name

lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -17,7 +17,6 @@ const memorize = require("../util/memorize");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Module")} Module */

lib/wasm-sync/UnsupportedWebAssemblyFeatureError.js

@@ -6,7 +6,9 @@
 
 const WebpackError = require("../WebpackError");
 
-module.exports = class UnsupportedWebAssemblyFeatureError extends WebpackError {
+module.exports = class UnsupportedWebAssemblyFeatureError extends (
+	WebpackError
+) {
 	/** @param {string} message Error message */
 	constructor(message) {
 		super(message);

lib/wasm-sync/WebAssemblyInInitialChunkError.js

@@ -79,7 +79,9 @@ const getInitialModuleChains = (
 	return Array.from(results);
 };
 
-module.exports = class WebAssemblyInInitialChunkError extends WebpackError {
+module.exports = class WebAssemblyInInitialChunkError extends (
+	WebpackError
+) {
 	/**
 	 * @param {Module} module WASM module
 	 * @param {ModuleGraph} moduleGraph the module graph

lib/webpack.js

@@ -19,9 +19,7 @@ const NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
 const validateSchema = require("./validateSchema");
 
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
-/** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Compiler").WatchOptions} WatchOptions */
-/** @typedef {import("./MultiCompiler")} MultiCompiler */
 /** @typedef {import("./MultiStats")} MultiStats */
 /** @typedef {import("./Stats")} Stats */
 

package.json

@@ -38,8 +38,8 @@
   "devDependencies": {
     "@babel/core": "^7.11.1",
     "@babel/preset-react": "^7.10.4",
-    "@types/jest": "^25.2.3",
+    "@types/jest": "^26.0.15",
-    "@types/node": "^13.13.15",
+    "@types/node": "^14.14.10",
     "babel-loader": "^8.1.0",
     "benchmark": "^2.1.4",
     "bundle-loader": "^0.5.6",
@@ -52,10 +52,10 @@
     "date-fns": "^2.15.0",
     "es5-ext": "^0.10.53",
     "es6-promise-polyfill": "^1.2.0",
-    "eslint": "^6.8.0",
+    "eslint": "^7.14.0",
     "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-jest": "^23.20.0",
+    "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-jsdoc": "^22.0.0",
+    "eslint-plugin-jsdoc": "^30.7.8",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.1.4",
     "file-loader": "^6.0.0",
@@ -63,9 +63,9 @@
     "husky": "^4.2.5",
     "is-ci": "^2.0.0",
     "istanbul": "^0.4.5",
-    "jest": "^25.1.0",
+    "jest": "^26.6.3",
-    "jest-diff": "^25.1.0",
+    "jest-diff": "^26.6.2",
-    "jest-junit": "^11.1.0",
+    "jest-junit": "^12.0.0",
     "json-loader": "^0.5.7",
     "json5": "^2.1.3",
     "less": "^3.12.2",
@@ -78,7 +78,7 @@
     "mini-css-extract-plugin": "^1.0.0",
     "mini-svg-data-uri": "^1.2.3",
     "open-cli": "^6.0.1",
-    "prettier": "^2.0.5",
+    "prettier": "^2.2.0",
     "pretty-format": "^26.3.0",
     "pug": "^3.0.0",
     "pug-loader": "^2.4.0",
@@ -90,9 +90,9 @@
     "simple-git": "^2.17.0",
     "strip-ansi": "^6.0.0",
     "style-loader": "^1.1.4",
-    "terser": "^4.8.0",
+    "terser": "^5.5.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.8.1",
+    "tooling": "webpack/tooling#v1.10.0",
     "ts-loader": "^8.0.2",
     "typescript": "^3.9.7",
     "url-loader": "^4.1.0",
@@ -100,7 +100,7 @@
     "webassembly-feature": "1.3.0",
     "xxhashjs": "^0.2.2",
     "yamljs": "^0.3.0",
-    "yarn-deduplicate": "^2.1.1"
+    "yarn-deduplicate": "^3.1.0"
   },
   "engines": {
     "node": ">=10.13.0"

test/BenchmarkTestCases.benchmark.js

@@ -76,7 +76,7 @@ describe("BenchmarkTestCases", function () {
 					}
 
 					function doLoadWebpack() {
-						const baselineWebpack = require.requireActual(
+						const baselineWebpack = jest.requireActual(
 							path.resolve(baselinePath, "lib/index.js")
 						);
 						baselines.push({
@@ -289,7 +289,7 @@ describe("BenchmarkTestCases", function () {
 						);
 						const config =
 							Object.create(
-								require.requireActual(
+								jest.requireActual(
 									path.join(testDirectory, "webpack.config.js")
 								)
 							) || {};
@@ -314,7 +314,7 @@ describe("BenchmarkTestCases", function () {
 							testName
 						);
 						const config =
-							require.requireActual(
+							jest.requireActual(
 								path.join(testDirectory, "webpack.config.js")
 							) || {};
 						config.output = config.output || {};

test/WatchTestCases.test.js

@@ -303,7 +303,7 @@ describe("WatchTestCases", () => {
 												module in testConfig.modules
 											) {
 												return testConfig.modules[module];
-											} else return require.requireActual(module);
+											} else return jest.requireActual(module);
 										}
 
 										let testConfig = {};

test/__snapshots__/StatsTestCases.test.js.snap

@@ -1095,9 +1095,9 @@ asset <CLR=32,BOLD>main.js</CLR> 54 bytes <CLR=32,BOLD>[emitted]</CLR> (name: ma
 
 <CLR=31,BOLD>DEBUG</CLR> <CLR=BOLD>LOG from ./node_modules/custom-loader/index.js ./node_modules/custom-loader/index.js!./index.js</CLR>
 <e> <CLR=31,BOLD>An error</CLR>
-|     at Object.module.exports (Xdir/logging/node_modules/custom-loader/index.js:5:9)
+|     at Object.<anonymous>.module.exports (Xdir/logging/node_modules/custom-loader/index.js:5:9)
 <w> <CLR=33,BOLD>A warning</CLR>
-|     at Object.module.exports (Xdir/logging/node_modules/custom-loader/index.js:6:9)
+|     at Object.<anonymous>.module.exports (Xdir/logging/node_modules/custom-loader/index.js:6:9)
 <-> <CLR=36,BOLD>Unimportant</CLR>
   <i> <CLR=32,BOLD>Info message</CLR>
       <CLR=BOLD>Just log</CLR>
@@ -1106,7 +1106,7 @@ asset <CLR=32,BOLD>main.js</CLR> 54 bytes <CLR=32,BOLD>[emitted]</CLR> (name: ma
   <-> <CLR=36,BOLD>Nested</CLR>
         <CLR=BOLD>Log inside collapsed group</CLR>
       Trace
-  |     at Object.module.exports (Xdir/logging/node_modules/custom-loader/index.js:15:9)
+  |     at Object.<anonymous>.module.exports (Xdir/logging/node_modules/custom-loader/index.js:15:9)
   <t> <CLR=35,BOLD>Measure: X ms</CLR>
       -------
       <CLR=BOLD>After clear</CLR>
@@ -2228,12 +2228,12 @@ LOG from webpack.FileSystemInfo
 exports[`StatsTestCases should print correct stats for real-content-hash 1`] = `
 "a-normal:
   assets by path *.js 2.99 KiB
-    asset e840f17fae83d26b8752-e840f1.js 2.6 KiB [emitted] [immutable] [minimized] (name: runtime~main)
+    asset b91fe81d9da1269a285f-b91fe8.js 2.6 KiB [emitted] [immutable] [minimized] (name: runtime~main)
     asset 3cc8faad16137711c07e-3cc8fa.js 210 bytes [emitted] [immutable] [minimized] (name: main)
     asset b6f77787a670e97d47b5-b6f777.js 193 bytes [emitted] [immutable] [minimized] (name: lazy)
   asset 89a353e9c515885abd8e.png 14.6 KiB [emitted] [immutable] [from: file.png] (auxiliary name: lazy)
   asset 7382fad5b015914e0811.jpg 5.89 KiB [emitted] [immutable] [from: file.jpg] (auxiliary name: main)
-  Entrypoint main 2.8 KiB (5.89 KiB) = e840f17fae83d26b8752-e840f1.js 2.6 KiB 3cc8faad16137711c07e-3cc8fa.js 210 bytes 1 auxiliary asset
+  Entrypoint main 2.8 KiB (5.89 KiB) = b91fe81d9da1269a285f-b91fe8.js 2.6 KiB 3cc8faad16137711c07e-3cc8fa.js 210 bytes 1 auxiliary asset
   runtime modules 7.36 KiB 8 modules
   orphan modules 23 bytes [orphan] 1 module
   cacheable modules 340 bytes (javascript) 20.4 KiB (asset)
@@ -2247,12 +2247,12 @@ exports[`StatsTestCases should print correct stats for real-content-hash 1`] = `
 
 b-normal:
   assets by path *.js 2.99 KiB
-    asset de036140a684abb46a68-de0361.js 2.6 KiB [emitted] [immutable] [minimized] (name: runtime~main)
+    asset 92a0a394f8459d57eed5-92a0a3.js 2.6 KiB [emitted] [immutable] [minimized] (name: runtime~main)
     asset 3cc8faad16137711c07e-3cc8fa.js 210 bytes [emitted] [immutable] [minimized] (name: main)
     asset b6f77787a670e97d47b5-b6f777.js 193 bytes [emitted] [immutable] [minimized] (name: lazy)
   asset 89a353e9c515885abd8e.png 14.6 KiB [emitted] [immutable] [from: file.png] (auxiliary name: lazy)
   asset 7382fad5b015914e0811.jpg 5.89 KiB [emitted] [immutable] [from: file.jpg] (auxiliary name: main)
-  Entrypoint main 2.8 KiB (5.89 KiB) = de036140a684abb46a68-de0361.js 2.6 KiB 3cc8faad16137711c07e-3cc8fa.js 210 bytes 1 auxiliary asset
+  Entrypoint main 2.8 KiB (5.89 KiB) = 92a0a394f8459d57eed5-92a0a3.js 2.6 KiB 3cc8faad16137711c07e-3cc8fa.js 210 bytes 1 auxiliary asset
   runtime modules 7.36 KiB 8 modules
   orphan modules 19 bytes [orphan] 1 module
   cacheable modules 295 bytes (javascript) 20.4 KiB (asset)
@@ -2266,15 +2266,15 @@ b-normal:
 
 a-source-map:
   assets by path *.js 3.16 KiB
-    asset 34a1f137ab6013192ef7-34a1f1.js 2.65 KiB [emitted] [immutable] [minimized] (name: runtime~main)
+    asset 1faadf70e8b4376ef06a-1faadf.js 2.65 KiB [emitted] [immutable] [minimized] (name: runtime~main)
-      sourceMap 34a1f137ab6013192ef7-34a1f1.js.map 14.3 KiB [emitted] [dev] (auxiliary name: runtime~main)
+      sourceMap 1faadf70e8b4376ef06a-1faadf.js.map 14.3 KiB [emitted] [dev] (auxiliary name: runtime~main)
     asset b8bfcec62cdd15c9a840-b8bfce.js 266 bytes [emitted] [immutable] [minimized] (name: main)
       sourceMap b8bfcec62cdd15c9a840-b8bfce.js.map 366 bytes [emitted] [dev] (auxiliary name: main)
     asset c7c0f8bb2e61b59a89f5-c7c0f8.js 249 bytes [emitted] [immutable] [minimized] (name: lazy)
       sourceMap c7c0f8bb2e61b59a89f5-c7c0f8.js.map 331 bytes [emitted] [dev] (auxiliary name: lazy)
   asset 89a353e9c515885abd8e.png 14.6 KiB [emitted] [immutable] [from: file.png] (auxiliary name: lazy)
   asset 7382fad5b015914e0811.jpg 5.89 KiB [emitted] [immutable] [from: file.jpg] (auxiliary name: main)
-  Entrypoint main 2.91 KiB (20.5 KiB) = 34a1f137ab6013192ef7-34a1f1.js 2.65 KiB b8bfcec62cdd15c9a840-b8bfce.js 266 bytes 3 auxiliary assets
+  Entrypoint main 2.91 KiB (20.5 KiB) = 1faadf70e8b4376ef06a-1faadf.js 2.65 KiB b8bfcec62cdd15c9a840-b8bfce.js 266 bytes 3 auxiliary assets
   runtime modules 7.36 KiB 8 modules
   orphan modules 23 bytes [orphan] 1 module
   cacheable modules 340 bytes (javascript) 20.4 KiB (asset)
@@ -2288,15 +2288,15 @@ a-source-map:
 
 b-source-map:
   assets by path *.js 3.16 KiB
-    asset 6d482476dfc44d9f4352-6d4824.js 2.65 KiB [emitted] [immutable] [minimized] (name: runtime~main)
+    asset df1717060760bf22714c-df1717.js 2.65 KiB [emitted] [immutable] [minimized] (name: runtime~main)
-      sourceMap 6d482476dfc44d9f4352-6d4824.js.map 14.3 KiB [emitted] [dev] (auxiliary name: runtime~main)
+      sourceMap df1717060760bf22714c-df1717.js.map 14.3 KiB [emitted] [dev] (auxiliary name: runtime~main)
     asset b8bfcec62cdd15c9a840-b8bfce.js 266 bytes [emitted] [immutable] [minimized] (name: main)
       sourceMap b8bfcec62cdd15c9a840-b8bfce.js.map 323 bytes [emitted] [dev] (auxiliary name: main)
     asset c7c0f8bb2e61b59a89f5-c7c0f8.js 249 bytes [emitted] [immutable] [minimized] (name: lazy)
       sourceMap c7c0f8bb2e61b59a89f5-c7c0f8.js.map 327 bytes [emitted] [dev] (auxiliary name: lazy)
   asset 89a353e9c515885abd8e.png 14.6 KiB [emitted] [immutable] [from: file.png] (auxiliary name: lazy)
   asset 7382fad5b015914e0811.jpg 5.89 KiB [emitted] [immutable] [from: file.jpg] (auxiliary name: main)
-  Entrypoint main 2.91 KiB (20.5 KiB) = 6d482476dfc44d9f4352-6d4824.js 2.65 KiB b8bfcec62cdd15c9a840-b8bfce.js 266 bytes 3 auxiliary assets
+  Entrypoint main 2.91 KiB (20.5 KiB) = df1717060760bf22714c-df1717.js 2.65 KiB b8bfcec62cdd15c9a840-b8bfce.js 266 bytes 3 auxiliary assets
   runtime modules 7.36 KiB 8 modules
   orphan modules 19 bytes [orphan] 1 module
   cacheable modules 295 bytes (javascript) 20.4 KiB (asset)

test/configCases/finish-modules/simple/webpack.config.js

@@ -3,12 +3,12 @@
  */
 var testPlugin = function () {
 	this.hooks.compilation.tap("TestPlugin", compilation => {
-		compilation.hooks.finishModules.tapAsync("TestPlugin", function (
+		compilation.hooks.finishModules.tapAsync(
-			_modules,
+			"TestPlugin",
-			callback
+			function (_modules, callback) {
-		) {
+				callback();
-			callback();
+			}
-		});
+		);
 	});
 };
 

types.d.ts

@@ -271,7 +271,7 @@ declare interface AssetInfo {
 }
 type AssetModuleFilename =
 	| string
-	| ((pathData: PathData, assetInfo: AssetInfo) => string);
+	| ((pathData: PathData, assetInfo?: AssetInfo) => string);
 declare abstract class AsyncDependenciesBlock extends DependenciesBlock {
 	groupOptions: {
 		preloadOrder?: number;
@@ -296,10 +296,10 @@ declare abstract class AsyncDependenciesBlock extends DependenciesBlock {
 declare abstract class AsyncQueue<T, K, R> {
 	hooks: {
 		beforeAdd: AsyncSeriesHook<[T]>;
-		added: SyncHook<[T], void>;
+		added: SyncHook<[T]>;
 		beforeStart: AsyncSeriesHook<[T]>;
-		started: SyncHook<[T], void>;
+		started: SyncHook<[T]>;
-		result: SyncHook<[T, Error, R], void>;
+		result: SyncHook<[T, Error, R]>;
 	};
 	add(item: T, callback: CallbackFunction<R>): void;
 	invalidate(item: T): void;
@@ -507,7 +507,7 @@ declare class Cache {
 		>;
 		store: AsyncParallelHook<[string, Etag, any]>;
 		storeBuildDependencies: AsyncParallelHook<[Iterable<string>]>;
-		beginIdle: SyncHook<[], void>;
+		beginIdle: SyncHook<[]>;
 		endIdle: AsyncParallelHook<[]>;
 		shutdown: AsyncParallelHook<[]>;
 	};
@@ -684,7 +684,7 @@ declare class Chunk {
 }
 type ChunkFilename =
 	| string
-	| ((pathData: PathData, assetInfo: AssetInfo) => string);
+	| ((pathData: PathData, assetInfo?: AssetInfo) => string);
 declare class ChunkGraph {
 	constructor(moduleGraph: ModuleGraph);
 	moduleGraph: ModuleGraph;
@@ -1096,11 +1096,11 @@ declare class Compilation {
 	 */
 	constructor(compiler: Compiler);
 	hooks: Readonly<{
-		buildModule: SyncHook<[Module], void>;
+		buildModule: SyncHook<[Module]>;
-		rebuildModule: SyncHook<[Module], void>;
+		rebuildModule: SyncHook<[Module]>;
-		failedModule: SyncHook<[Module, WebpackError], void>;
+		failedModule: SyncHook<[Module, WebpackError]>;
-		succeedModule: SyncHook<[Module], void>;
+		succeedModule: SyncHook<[Module]>;
-		stillValidModule: SyncHook<[Module], void>;
+		stillValidModule: SyncHook<[Module]>;
 		addEntry: SyncHook<
 			[
 				Dependency,
@@ -1113,8 +1113,7 @@ declare class Compilation {
 					| "runtime"
 					| "wasmLoading"
 				>
-			],
+			]
-			void
 		>;
 		failedEntry: SyncHook<
 			[
@@ -1129,8 +1128,7 @@ declare class Compilation {
 					| "wasmLoading"
 				>,
 				Error
-			],
+			]
-			void
 		>;
 		succeedEntry: SyncHook<
 			[
@@ -1145,8 +1143,7 @@ declare class Compilation {
 					| "wasmLoading"
 				>,
 				Module
-			],
+			]
-			void
 		>;
 		dependencyReferencedExports: SyncWaterfallHook<
 			[
@@ -1157,64 +1154,61 @@ declare class Compilation {
 		>;
 		finishModules: AsyncSeriesHook<[Iterable<Module>]>;
 		finishRebuildingModule: AsyncSeriesHook<[Module]>;
-		unseal: SyncHook<[], void>;
+		unseal: SyncHook<[]>;
-		seal: SyncHook<[], void>;
+		seal: SyncHook<[]>;
-		beforeChunks: SyncHook<[], void>;
+		beforeChunks: SyncHook<[]>;
-		afterChunks: SyncHook<[Iterable<Chunk>], void>;
+		afterChunks: SyncHook<[Iterable<Chunk>]>;
 		optimizeDependencies: SyncBailHook<[Iterable<Module>], any>;
-		afterOptimizeDependencies: SyncHook<[Iterable<Module>], void>;
+		afterOptimizeDependencies: SyncHook<[Iterable<Module>]>;
-		optimize: SyncHook<[], void>;
+		optimize: SyncHook<[]>;
 		optimizeModules: SyncBailHook<[Iterable<Module>], any>;
-		afterOptimizeModules: SyncHook<[Iterable<Module>], void>;
+		afterOptimizeModules: SyncHook<[Iterable<Module>]>;
 		optimizeChunks: SyncBailHook<[Iterable<Chunk>, ChunkGroup[]], any>;
-		afterOptimizeChunks: SyncHook<[Iterable<Chunk>, ChunkGroup[]], void>;
+		afterOptimizeChunks: SyncHook<[Iterable<Chunk>, ChunkGroup[]]>;
 		optimizeTree: AsyncSeriesHook<[Iterable<Chunk>, Iterable<Module>]>;
-		afterOptimizeTree: SyncHook<[Iterable<Chunk>, Iterable<Module>], void>;
+		afterOptimizeTree: SyncHook<[Iterable<Chunk>, Iterable<Module>]>;
 		optimizeChunkModules: AsyncSeriesBailHook<
 			[Iterable<Chunk>, Iterable<Module>],
 			any
 		>;
-		afterOptimizeChunkModules: SyncHook<
+		afterOptimizeChunkModules: SyncHook<[Iterable<Chunk>, Iterable<Module>]>;
-			[Iterable<Chunk>, Iterable<Module>],
-			void
-		>;
 		shouldRecord: SyncBailHook<[], boolean>;
-		additionalChunkRuntimeRequirements: SyncHook<[Chunk, Set<string>], void>;
+		additionalChunkRuntimeRequirements: SyncHook<[Chunk, Set<string>]>;
 		runtimeRequirementInChunk: HookMap<SyncBailHook<[Chunk, Set<string>], any>>;
-		additionalModuleRuntimeRequirements: SyncHook<[Module, Set<string>], void>;
+		additionalModuleRuntimeRequirements: SyncHook<[Module, Set<string>]>;
 		runtimeRequirementInModule: HookMap<
 			SyncBailHook<[Module, Set<string>], any>
 		>;
-		additionalTreeRuntimeRequirements: SyncHook<[Chunk, Set<string>], void>;
+		additionalTreeRuntimeRequirements: SyncHook<[Chunk, Set<string>]>;
 		runtimeRequirementInTree: HookMap<SyncBailHook<[Chunk, Set<string>], any>>;
-		runtimeModule: SyncHook<[RuntimeModule, Chunk], void>;
+		runtimeModule: SyncHook<[RuntimeModule, Chunk]>;
-		reviveModules: SyncHook<[Iterable<Module>, any], void>;
+		reviveModules: SyncHook<[Iterable<Module>, any]>;
-		beforeModuleIds: SyncHook<[Iterable<Module>], void>;
+		beforeModuleIds: SyncHook<[Iterable<Module>]>;
-		moduleIds: SyncHook<[Iterable<Module>], void>;
+		moduleIds: SyncHook<[Iterable<Module>]>;
-		optimizeModuleIds: SyncHook<[Iterable<Module>], void>;
+		optimizeModuleIds: SyncHook<[Iterable<Module>]>;
-		afterOptimizeModuleIds: SyncHook<[Iterable<Module>], void>;
+		afterOptimizeModuleIds: SyncHook<[Iterable<Module>]>;
-		reviveChunks: SyncHook<[Iterable<Chunk>, any], void>;
+		reviveChunks: SyncHook<[Iterable<Chunk>, any]>;
-		beforeChunkIds: SyncHook<[Iterable<Chunk>], void>;
+		beforeChunkIds: SyncHook<[Iterable<Chunk>]>;
-		chunkIds: SyncHook<[Iterable<Chunk>], void>;
+		chunkIds: SyncHook<[Iterable<Chunk>]>;
-		optimizeChunkIds: SyncHook<[Iterable<Chunk>], void>;
+		optimizeChunkIds: SyncHook<[Iterable<Chunk>]>;
-		afterOptimizeChunkIds: SyncHook<[Iterable<Chunk>], void>;
+		afterOptimizeChunkIds: SyncHook<[Iterable<Chunk>]>;
-		recordModules: SyncHook<[Iterable<Module>, any], void>;
+		recordModules: SyncHook<[Iterable<Module>, any]>;
-		recordChunks: SyncHook<[Iterable<Chunk>, any], void>;
+		recordChunks: SyncHook<[Iterable<Chunk>, any]>;
-		optimizeCodeGeneration: SyncHook<[Iterable<Module>], void>;
+		optimizeCodeGeneration: SyncHook<[Iterable<Module>]>;
-		beforeModuleHash: SyncHook<[], void>;
+		beforeModuleHash: SyncHook<[]>;
-		afterModuleHash: SyncHook<[], void>;
+		afterModuleHash: SyncHook<[]>;
-		beforeCodeGeneration: SyncHook<[], void>;
+		beforeCodeGeneration: SyncHook<[]>;
-		afterCodeGeneration: SyncHook<[], void>;
+		afterCodeGeneration: SyncHook<[]>;
-		beforeRuntimeRequirements: SyncHook<[], void>;
+		beforeRuntimeRequirements: SyncHook<[]>;
-		afterRuntimeRequirements: SyncHook<[], void>;
+		afterRuntimeRequirements: SyncHook<[]>;
-		beforeHash: SyncHook<[], void>;
+		beforeHash: SyncHook<[]>;
-		contentHash: SyncHook<[Chunk], void>;
+		contentHash: SyncHook<[Chunk]>;
-		afterHash: SyncHook<[], void>;
+		afterHash: SyncHook<[]>;
-		recordHash: SyncHook<[any], void>;
+		recordHash: SyncHook<[any]>;
-		record: SyncHook<[Compilation, any], void>;
+		record: SyncHook<[Compilation, any]>;
-		beforeModuleAssets: SyncHook<[], void>;
+		beforeModuleAssets: SyncHook<[]>;
 		shouldGenerateChunkAssets: SyncBailHook<[], boolean>;
-		beforeChunkAssets: SyncHook<[], void>;
+		beforeChunkAssets: SyncHook<[]>;
 		additionalChunkAssets: Pick<
 			AsyncSeriesHook<[Set<Chunk>]>,
 			"tap" | "tapAsync" | "tapPromise" | "name"
@@ -1236,9 +1230,9 @@ declare class Compilation {
 		> &
 			FakeHookMarker;
 		optimizeAssets: AsyncSeriesHook<[Record<string, Source>]>;
-		afterOptimizeAssets: SyncHook<[Record<string, Source>], void>;
+		afterOptimizeAssets: SyncHook<[Record<string, Source>]>;
 		processAssets: AsyncSeriesHook<[Record<string, Source>]>;
-		afterProcessAssets: SyncHook<[Record<string, Source>], void>;
+		afterProcessAssets: SyncHook<[Record<string, Source>]>;
 		needAdditionalSeal: SyncBailHook<[], boolean>;
 		afterSeal: AsyncSeriesHook<[]>;
 		renderManifest: SyncWaterfallHook<
@@ -1247,21 +1241,21 @@ declare class Compilation {
 				RenderManifestOptions
 			]
 		>;
-		fullHash: SyncHook<[Hash], void>;
+		fullHash: SyncHook<[Hash]>;
-		chunkHash: SyncHook<[Chunk, Hash, ChunkHashContext], void>;
+		chunkHash: SyncHook<[Chunk, Hash, ChunkHashContext]>;
-		moduleAsset: SyncHook<[Module, string], void>;
+		moduleAsset: SyncHook<[Module, string]>;
-		chunkAsset: SyncHook<[Chunk, string], void>;
+		chunkAsset: SyncHook<[Chunk, string]>;
 		assetPath: SyncWaterfallHook<[string, any, AssetInfo]>;
 		needAdditionalPass: SyncBailHook<[], boolean>;
-		childCompiler: SyncHook<[Compiler, string, number], void>;
+		childCompiler: SyncHook<[Compiler, string, number]>;
 		log: SyncBailHook<[string, LogEntry], true>;
 		processWarnings: SyncWaterfallHook<[WebpackError[]]>;
 		processErrors: SyncWaterfallHook<[WebpackError[]]>;
-		statsPreset: HookMap<SyncHook<[any, any], void>>;
+		statsPreset: HookMap<SyncHook<[any, any]>>;
-		statsNormalize: SyncHook<[any, any], void>;
+		statsNormalize: SyncHook<[any, any]>;
-		statsFactory: SyncHook<[StatsFactory, any], void>;
+		statsFactory: SyncHook<[StatsFactory, any]>;
-		statsPrinter: SyncHook<[StatsPrinter, any], void>;
+		statsPrinter: SyncHook<[StatsPrinter, any]>;
-		readonly normalModuleLoader: SyncHook<[any, NormalModule], void>;
+		readonly normalModuleLoader: SyncHook<[any, NormalModule]>;
 	}>;
 	name: string;
 	startTime: any;
@@ -1597,7 +1591,7 @@ declare interface CompilationHooksJavascriptModulesPlugin {
 	renderMain: SyncWaterfallHook<[Source, RenderContextObject]>;
 	render: SyncWaterfallHook<[Source, RenderContextObject]>;
 	renderRequire: SyncWaterfallHook<[string, RenderBootstrapContext]>;
-	chunkHash: SyncHook<[Chunk, Hash, ChunkHashContext], void>;
+	chunkHash: SyncHook<[Chunk, Hash, ChunkHashContext]>;
 	useSourceMap: SyncBailHook<[Chunk, RenderContextObject], boolean>;
 }
 declare interface CompilationParams {
@@ -1607,34 +1601,34 @@ declare interface CompilationParams {
 declare class Compiler {
 	constructor(context: string);
 	hooks: Readonly<{
-		initialize: SyncHook<[], void>;
+		initialize: SyncHook<[]>;
 		shouldEmit: SyncBailHook<[Compilation], boolean>;
 		done: AsyncSeriesHook<[Stats]>;
-		afterDone: SyncHook<[Stats], void>;
+		afterDone: SyncHook<[Stats]>;
 		additionalPass: AsyncSeriesHook<[]>;
 		beforeRun: AsyncSeriesHook<[Compiler]>;
 		run: AsyncSeriesHook<[Compiler]>;
 		emit: AsyncSeriesHook<[Compilation]>;
 		assetEmitted: AsyncSeriesHook<[string, AssetEmittedInfo]>;
 		afterEmit: AsyncSeriesHook<[Compilation]>;
-		thisCompilation: SyncHook<[Compilation, CompilationParams], void>;
+		thisCompilation: SyncHook<[Compilation, CompilationParams]>;
-		compilation: SyncHook<[Compilation, CompilationParams], void>;
+		compilation: SyncHook<[Compilation, CompilationParams]>;
-		normalModuleFactory: SyncHook<[NormalModuleFactory], void>;
+		normalModuleFactory: SyncHook<[NormalModuleFactory]>;
-		contextModuleFactory: SyncHook<[ContextModuleFactory], void>;
+		contextModuleFactory: SyncHook<[ContextModuleFactory]>;
 		beforeCompile: AsyncSeriesHook<[CompilationParams]>;
-		compile: SyncHook<[CompilationParams], void>;
+		compile: SyncHook<[CompilationParams]>;
 		make: AsyncParallelHook<[Compilation]>;
 		finishMake: AsyncParallelHook<[Compilation]>;
 		afterCompile: AsyncSeriesHook<[Compilation]>;
 		watchRun: AsyncSeriesHook<[Compiler]>;
-		failed: SyncHook<[Error], void>;
+		failed: SyncHook<[Error]>;
-		invalid: SyncHook<[string, number], void>;
+		invalid: SyncHook<[string, number]>;
-		watchClose: SyncHook<[], void>;
+		watchClose: SyncHook<[]>;
 		infrastructureLog: SyncBailHook<[string, string, any[]], true>;
-		environment: SyncHook<[], void>;
+		environment: SyncHook<[]>;
-		afterEnvironment: SyncHook<[], void>;
+		afterEnvironment: SyncHook<[]>;
-		afterPlugins: SyncHook<[Compiler], void>;
+		afterPlugins: SyncHook<[Compiler]>;
-		afterResolvers: SyncHook<[Compiler], void>;
+		afterResolvers: SyncHook<[Compiler]>;
 		entryOption: SyncBailHook<[string, EntryNormalized], boolean>;
 	}>;
 	webpack: typeof exports;
@@ -2194,8 +2188,20 @@ declare class DefinePlugin {
 	/**
 	 * Create a new define plugin
 	 */
-	constructor(definitions: Record<string, RecursiveArrayOrRecord>);
+	constructor(
-	definitions: Record<string, RecursiveArrayOrRecord>;
+		definitions: Record<
+			string,
+			RecursiveArrayOrRecord<
+				string | number | bigint | boolean | Function | RegExp | RuntimeValue
+			>
+		>
+	);
+	definitions: Record<
+		string,
+		RecursiveArrayOrRecord<
+			string | number | bigint | boolean | Function | RegExp | RuntimeValue
+		>
+	>;
 
 	/**
 	 * Apply the plugin
@@ -3213,7 +3219,7 @@ type ExternalItem =
 	| { [index: string]: string | boolean | string[] | { [index: string]: any } }
 	| ((
 			data: { context: string; request: string },
-			callback: (err: Error, result: string) => void
+			callback: (err?: Error, result?: string) => void
 	  ) => void);
 declare class ExternalModule extends Module {
 	constructor(request?: any, type?: any, userRequest?: any);
@@ -3237,7 +3243,7 @@ type Externals =
 	| { [index: string]: string | boolean | string[] | { [index: string]: any } }
 	| ((
 			data: { context: string; request: string },
-			callback: (err: Error, result: string) => void
+			callback: (err?: Error, result?: string) => void
 	  ) => void);
 declare class ExternalsPlugin {
 	constructor(type: string, externals: Externals);
@@ -3444,7 +3450,7 @@ declare interface FileSystem {
 	};
 }
 declare interface FileSystemCallback<T> {
-	(err: PossibleFileSystemError & Error, result: T): any;
+	(err?: PossibleFileSystemError & Error, result?: T): any;
 }
 declare interface FileSystemDirent {
 	name: string | Buffer;
@@ -3526,7 +3532,9 @@ declare interface FileSystemStats {
 	isDirectory: () => boolean;
 	isFile: () => boolean;
 }
-type Filename = string | ((pathData: PathData, assetInfo: AssetInfo) => string);
+type Filename =
+	| string
+	| ((pathData: PathData, assetInfo?: AssetInfo) => string);
 type FilterItemTypes = string | RegExp | ((value: string) => boolean);
 type FilterTypes =
 	| string
@@ -3659,7 +3667,7 @@ declare interface HashedModuleIdsPluginOptions {
 	/**
 	 * The encoding to use when generating the hash, defaults to 'base64'. All encodings from Node.JS' hash.digest are supported.
 	 */
-	hashDigest?: "hex" | "latin1" | "base64";
+	hashDigest?: "base64" | "latin1" | "hex";
 
 	/**
 	 * The prefix length of the hash digest to use, defaults to 4.
@@ -5314,10 +5322,10 @@ declare abstract class ModuleTemplate {
 declare class MultiCompiler {
 	constructor(compilers: Compiler[] | Record<string, Compiler>);
 	hooks: Readonly<{
-		done: SyncHook<[MultiStats], void>;
+		done: SyncHook<[MultiStats]>;
-		invalid: MultiHook<SyncHook<[string, number], void>>;
+		invalid: MultiHook<SyncHook<[string, number]>>;
 		run: MultiHook<AsyncSeriesHook<[Compiler]>>;
-		watchClose: SyncHook<[], void>;
+		watchClose: SyncHook<[]>;
 		watchRun: MultiHook<AsyncSeriesHook<[Compiler]>>;
 		infrastructureLog: MultiHook<SyncBailHook<[string, string, any[]], true>>;
 	}>;
@@ -5626,8 +5634,8 @@ declare class NormalModule extends Module {
 	static deserialize(context?: any): NormalModule;
 }
 declare interface NormalModuleCompilationHooks {
-	loader: SyncHook<[any, NormalModule], void>;
+	loader: SyncHook<[any, NormalModule]>;
-	beforeLoaders: SyncHook<[LoaderItem[], NormalModule, any], void>;
+	beforeLoaders: SyncHook<[LoaderItem[], NormalModule, any]>;
 	readResourceForScheme: HookMap<
 		AsyncSeriesBailHook<[string, NormalModule], string | Buffer>
 	>;
@@ -5656,9 +5664,9 @@ declare abstract class NormalModuleFactory extends ModuleFactory {
 		createModule: AsyncSeriesBailHook<[any, ResolveData], any>;
 		module: SyncWaterfallHook<[Module, any, ResolveData]>;
 		createParser: HookMap<SyncBailHook<any, any>>;
-		parser: HookMap<SyncHook<any, void>>;
+		parser: HookMap<SyncHook<any>>;
 		createGenerator: HookMap<SyncBailHook<any, any>>;
-		generator: HookMap<SyncHook<any, void>>;
+		generator: HookMap<SyncHook<any>>;
 	}>;
 	resolverFactory: ResolverFactory;
 	ruleSet: RuleSet;
@@ -5914,7 +5922,7 @@ declare interface OptimizationSplitChunksCacheGroup {
 	/**
 	 * Sets the template for the filename for created chunks.
 	 */
-	filename?: string | ((pathData: PathData, assetInfo: AssetInfo) => string);
+	filename?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
 
 	/**
 	 * Sets the hint for chunk id.
@@ -6057,7 +6065,7 @@ declare interface OptimizationSplitChunksOptions {
 	/**
 	 * Sets the template for the filename for created chunks.
 	 */
-	filename?: string | ((pathData: PathData, assetInfo: AssetInfo) => string);
+	filename?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
 
 	/**
 	 * Prevents exposing path info when creating names for parts splitted by maxSize.
@@ -6862,13 +6870,13 @@ declare interface ProvidesObject {
 }
 type PublicPath =
 	| string
-	| ((pathData: PathData, assetInfo: AssetInfo) => string);
+	| ((pathData: PathData, assetInfo?: AssetInfo) => string);
 declare interface RawChunkGroupOptions {
 	preloadOrder?: number;
 	prefetchOrder?: number;
 }
 declare class RawSource extends Source {
-	constructor(source: string | Buffer, convertToString: boolean);
+	constructor(source: string | Buffer, convertToString?: boolean);
 	isBuffer(): boolean;
 }
 declare class ReadFileCompileWasmPlugin {
@@ -6885,16 +6893,10 @@ declare interface RealDependencyLocation {
 	end?: SourcePosition;
 	index?: number;
 }
-type RecursiveArrayOrRecord =
+type RecursiveArrayOrRecord<T> =
-	| string
+	| { [index: string]: RecursiveArrayOrRecord<T> }
-	| number
+	| RecursiveArrayOrRecord<T>[]
-	| bigint
+	| T;
-	| boolean
-	| Function
-	| RegExp
-	| RuntimeValue
-	| { [index: string]: RecursiveArrayOrRecord }
-	| RecursiveArrayOrRecord[];
 declare interface ReferencedExport {
 	/**
 	 * name of the referenced export
@@ -7045,9 +7047,9 @@ declare interface RenderManifestOptions {
 	chunkGraph: ChunkGraph;
 }
 declare class ReplaceSource extends Source {
-	constructor(source: Source, name: string);
+	constructor(source: Source, name?: string);
-	replace(start: number, end: number, newValue: string, name: string): void;
+	replace(start: number, end: number, newValue: string, name?: string): void;
-	insert(pos: number, newValue: string, name: string): void;
+	insert(pos: number, newValue: string, name?: string): void;
 	getName(): string;
 	original(): string;
 	getReplacements(): {
@@ -7376,10 +7378,9 @@ declare abstract class Resolver {
 			[
 				AsyncSeriesBailHook<[ResolveRequest, ResolveContext], ResolveRequest>,
 				ResolveRequest
-			],
+			]
-			void
 		>;
-		noResolve: SyncHook<[ResolveRequest, Error], void>;
+		noResolve: SyncHook<[ResolveRequest, Error]>;
 		resolve: AsyncSeriesBailHook<
 			[ResolveRequest, ResolveContext],
 			ResolveRequest
@@ -7402,7 +7403,7 @@ declare abstract class Resolver {
 		path: string,
 		request: string,
 		resolveContext: ResolveContext,
-		callback: (arg0: Error, arg1: DevTool, arg2: ResolveRequest) => void
+		callback: (arg0: Error, arg1?: DevTool, arg2?: ResolveRequest) => void
 	): void;
 	doResolve(
 		hook?: any,
@@ -7651,8 +7652,7 @@ declare abstract class ResolverFactory {
 						dependencyType?: string;
 						resolveToContext?: boolean;
 					}
-				],
+				]
-				void
 			>
 		>;
 	}>;
@@ -8299,14 +8299,6 @@ declare abstract class RuntimeTemplate {
 		 * true, if this is a weak dependency
 		 */
 		weak?: boolean;
-		/**
-		 * runtime for which this code will be generated
-		 */
-		runtime?: string | SortableSet<string>;
-		/**
-		 * only execute the statement in some runtimes
-		 */
-		runtimeCondition?: string | boolean | SortableSet<string>;
 		/**
 		 * if set, will be filled with runtime requirements
 		 */
@@ -8695,8 +8687,8 @@ declare abstract class SortableSet<T> extends Set<T> {
 declare class Source {
 	constructor();
 	size(): number;
-	map(options: MapOptions): Object;
+	map(options?: MapOptions): Object;
-	sourceAndMap(options: MapOptions): { source: string | Buffer; map: Object };
+	sourceAndMap(options?: MapOptions): { source: string | Buffer; map: Object };
 	updateHash(hash: Hash): void;
 	source(): string | Buffer;
 	buffer(): Buffer;
@@ -8799,8 +8791,8 @@ declare class SourceMapSource extends Source {
 		source: string | Buffer,
 		name: string,
 		sourceMap: string | Object | Buffer,
-		originalSource: string | Buffer,
+		originalSource?: string | Buffer,
-		innerSourceMap: string | Object | Buffer
+		innerSourceMap?: string | Object | Buffer
 	);
 	getArgsAsBuffers(): [Buffer, string, Buffer, Buffer, Buffer];
 }