From 442a1ebca5c3025f78785d561a85aab227ecc957 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 7 May 2021 18:14:25 +0200
Subject: [PATCH] rename validate function to avoid conflict

---
 generate-types-config.js | 1 +
 types.d.ts               | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/generate-types-config.js b/generate-types-config.js
index b8890a8ea..b1a47a828 100644
--- a/generate-types-config.js
+++ b/generate-types-config.js
@@ -1,6 +1,7 @@
 module.exports = {
 	nameMapping: {
 		FsStats: /^Stats Import fs/,
+		validateFunction: /^validate Import/,
 		Configuration: /^WebpackOptions /
 	},
 	exclude: [/^devServer in WebpackOptions /],
diff --git a/types.d.ts b/types.d.ts
index 38cbc6615..6b9637961 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -79,7 +79,7 @@ import {
 	WithStatement,
 	YieldExpression
 } from "estree";
-import { ValidationError, validate } from "schema-utils";
+import { ValidationError, validate as validateFunction } from "schema-utils";
 import { ValidationErrorConfiguration } from "schema-utils/declarations/validate";
 import {
 	AsArray,
@@ -7181,7 +7181,7 @@ declare abstract class NormalModuleFactory extends ModuleFactory {
 declare interface NormalModuleLoaderContext<OptionsType> {
 	version: number;
 	getOptions(): OptionsType;
-	getOptions(schema: Parameters<typeof validate>[0]): OptionsType;
+	getOptions(schema: Parameters<typeof validateFunction>[0]): OptionsType;
 	emitWarning(warning: Error): void;
 	emitError(error: Error): void;
 	getLogger(name?: string): WebpackLogger;
@@ -11929,8 +11929,8 @@ declare namespace exports {
 	};
 	export const validate: (options?: any) => void;
 	export const validateSchema: (
-		schema: Parameters<typeof validate>[0],
-		options: Parameters<typeof validate>[1],
+		schema: Parameters<typeof validateFunction>[0],
+		options: Parameters<typeof validateFunction>[1],
 		validationConfiguration?: ValidationErrorConfiguration
 	) => void;
 	export const version: string;