root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename validate function to avoid conflict

This commit is contained in:
Tobias Koppers 2021-05-07 18:14:25 +02:00
parent b6693feeff
commit 442a1ebca5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
generate-types-config.js
View File

@ -1,6 +1,7 @@
module.exports = { module.exports = {
nameMapping: { nameMapping: {
FsStats: /^Stats Import fs/, FsStats: /^Stats Import fs/,
validateFunction: /^validate Import/,
Configuration: /^WebpackOptions / Configuration: /^WebpackOptions /
}, },
exclude: [/^devServer in WebpackOptions /], exclude: [/^devServer in WebpackOptions /],

8
types.d.ts vendored
View File

@ -79,7 +79,7 @@ import {
WithStatement, WithStatement,
YieldExpression YieldExpression
} from "estree"; } from "estree";
import { ValidationError, validate } from "schema-utils"; import { ValidationError, validate as validateFunction } from "schema-utils";
import { ValidationErrorConfiguration } from "schema-utils/declarations/validate"; import { ValidationErrorConfiguration } from "schema-utils/declarations/validate";
import { import {
AsArray, AsArray,
@ -7181,7 +7181,7 @@ declare abstract class NormalModuleFactory extends ModuleFactory {
declare interface NormalModuleLoaderContext<OptionsType> { declare interface NormalModuleLoaderContext<OptionsType> {
version: number; version: number;
getOptions(): OptionsType; getOptions(): OptionsType;
getOptions(schema: Parameters<typeof validate>[0]): OptionsType; getOptions(schema: Parameters<typeof validateFunction>[0]): OptionsType;
emitWarning(warning: Error): void; emitWarning(warning: Error): void;
emitError(error: Error): void; emitError(error: Error): void;
getLogger(name?: string): WebpackLogger; getLogger(name?: string): WebpackLogger;
@ -11929,8 +11929,8 @@ declare namespace exports {
}; };
export const validate: (options?: any) => void; export const validate: (options?: any) => void;
export const validateSchema: ( export const validateSchema: (
schema: Parameters<typeof validate>[0], schema: Parameters<typeof validateFunction>[0],
options: Parameters<typeof validate>[1], options: Parameters<typeof validateFunction>[1],
validationConfiguration?: ValidationErrorConfiguration validationConfiguration?: ValidationErrorConfiguration
) => void; ) => void;
export const version: string; export const version: string;