fix some internal types

eevloeev · Apr 22, 2021 · 7cc4078 · 7cc4078
1 parent e42915c
commit 7cc4078
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -3963,8 +3963,8 @@ This prevents using hashes of each other and should be avoided.`);
 	 * from parent (or top level compiler) and creates a child Compilation
 	 *
 	 * @param {string} name name of the child compiler
-	 * @param {OutputOptions} outputOptions // Need to convert config schema to types for this
-	 * @param {Array<WebpackPluginInstance | WebpackPluginFunction>} plugins webpack plugins that will be applied
+	 * @param {OutputOptions=} outputOptions // Need to convert config schema to types for this
+	 * @param {Array<WebpackPluginInstance | WebpackPluginFunction>=} plugins webpack plugins that will be applied
 	 * @returns {Compiler} creates a child Compiler instance
 	 */
 	createChildCompiler(name, outputOptions, plugins) {

diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -917,8 +917,8 @@ ${other}`);
 	 * @param {Compilation} compilation the compilation
 	 * @param {string} compilerName the compiler's name
 	 * @param {number} compilerIndex the compiler's index
-	 * @param {OutputOptions} outputOptions the output options
-	 * @param {WebpackPluginInstance[]} plugins the plugins to apply
+	 * @param {OutputOptions=} outputOptions the output options
+	 * @param {WebpackPluginInstance[]=} plugins the plugins to apply
 	 * @returns {Compiler} a child compiler
 	 */
 	createChildCompiler(

diff --git a/lib/EntryPlugin.js b/lib/EntryPlugin.js
@@ -17,7 +17,7 @@ class EntryPlugin {
 	 *
 	 * @param {string} context context path
 	 * @param {string} entry entry path
-	 * @param {EntryOptions | string} options entry options (passing a string is deprecated)
+	 * @param {EntryOptions | string=} options entry options (passing a string is deprecated)
 	 */
 	constructor(context, entry, options) {
 		this.context = context;

diff --git a/lib/NormalModule.js b/lib/NormalModule.js
@@ -42,7 +42,7 @@ const { contextify, absolutify } = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
 
-/** @typedef {import("source-map").RawSourceMap} SourceMap */
+/** @typedef {import("source-map").RawSourceMap} RawSourceMap */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/LoaderContext").NormalModuleLoaderContext} NormalModuleLoaderContext */
 /** @typedef {import("../declarations/WebpackOptions").Mode} Mode */
@@ -69,6 +69,8 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
+/** @typedef {Omit<RawSourceMap, "version"> & { version: number }} SourceMap */
+
 const getInvalidDependenciesModuleWarning = memoize(() =>
 	require("./InvalidDependenciesModuleWarning")
 );

diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -18,7 +18,6 @@ const { absolutify } = require("./util/identifier");
 
 const schema = require("../schemas/plugins/SourceMapDevToolPlugin.json");
 
-/** @typedef {import("source-map").RawSourceMap} SourceMap */
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
@@ -28,6 +27,7 @@ const schema = require("../schemas/plugins/SourceMapDevToolPlugin.json");
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module")} Module */
+/** @typedef {import("./NormalModule").SourceMap} SourceMap */
 /** @typedef {import("./util/Hash")} Hash */
 
 /**

diff --git a/types.d.ts b/types.d.ts
@@ -1648,8 +1648,8 @@ declare class Compilation {
 	 */
 	createChildCompiler(
 		name: string,
-		outputOptions: OutputNormalized,
-		plugins: (
+		outputOptions?: OutputNormalized,
+		plugins?: (
 			| ((this: Compiler, compiler: Compiler) => void)
 			| WebpackPluginInstance
 		)[]
@@ -1853,8 +1853,8 @@ declare class Compiler {
 		compilation: Compilation,
 		compilerName: string,
 		compilerIndex: number,
-		outputOptions: OutputNormalized,
-		plugins: WebpackPluginInstance[]
+		outputOptions?: OutputNormalized,
+		plugins?: WebpackPluginInstance[]
 	): Compiler;
 	isChild(): boolean;
 	createCompilation(): Compilation;
@@ -3033,7 +3033,7 @@ declare class EntryPlugin {
 	 * An entry plugin which will handle
 	 * creation of the EntryDependency
 	 */
-	constructor(context: string, entry: string, options: string | EntryOptions);
+	constructor(context: string, entry: string, options?: string | EntryOptions);
 	context: string;
 	entry: string;
 	options: string | EntryOptions;