From c1f5541d5c1d8a640210e05fcafee40c4af6368c Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 10 Nov 2022 17:35:09 +0100
Subject: [PATCH] chore: fixing the type for the return of the
 `createNextScaffolderFieldExtension`

Signed-off-by: blam <ben@blam.sh>
---
 .../components/scaffolder/customScaffolderExtensions.tsx  | 8 +++++---
 plugins/scaffolder/src/extensions/index.tsx               | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
index 2a4dedf080..3265d347a2 100644
--- a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
+++ b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 import React from 'react';
-import type { FieldValidation } from '@rjsf/core';
+import type { FieldValidation } from '@rjsf/utils';
 import {
+  createNextScaffolderFieldExtension,
   createScaffolderFieldExtension,
   FieldExtensionComponentProps,
+  NextFieldExtensionComponentProps,
   scaffolderPlugin,
 } from '@backstage/plugin-scaffolder';
 
@@ -64,7 +66,7 @@ export const LowerCaseValuePickerFieldExtension = scaffolderPlugin.provide(
 );
 
 const MockDelayComponent = (
-  props: FieldExtensionComponentProps<{ test?: string }>,
+  props: NextFieldExtensionComponentProps<{ test?: string }>,
 ) => {
   const { onChange, formData, rawErrors } = props;
   return (
@@ -80,7 +82,7 @@ const MockDelayComponent = (
 };
 
 export const DelayingComponentFieldExtension = scaffolderPlugin.provide(
-  createScaffolderFieldExtension({
+  createNextScaffolderFieldExtension({
     name: 'DelayingComponent',
     component: MockDelayComponent,
     validation: async (
diff --git a/plugins/scaffolder/src/extensions/index.tsx b/plugins/scaffolder/src/extensions/index.tsx
index 08075b5b9d..3d9e8dde77 100644
--- a/plugins/scaffolder/src/extensions/index.tsx
+++ b/plugins/scaffolder/src/extensions/index.tsx
@@ -72,7 +72,7 @@ export function createNextScaffolderFieldExtension<
   TInputProps extends UIOptionsType = {},
 >(
   options: NextFieldExtensionOptions<TReturnValue, TInputProps>,
-): Extension<NextFieldExtensionComponentProps<TReturnValue, TInputProps>> {
+): Extension<React.ComponentType> {
   return {
     expose() {
       const FieldExtensionDataHolder: any = () => null;