chore: fix

Signed-off-by: blam <ben@blam.sh>

plugins/scaffolder/package.json

@@ -54,10 +54,12 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
     "@react-hookz/web": "^15.0.0",
-    "@rjsf/core": "^5.0.0-beta.2",
-    "@rjsf/material-ui": "^5.0.0-beta.2",
-    "@rjsf/utils": "^5.0.0-beta.2",
-    "@rjsf/validator-ajv6": "^5.0.0-beta.2",
+    "@rjsf/core": "^3.2.1",
+    "@rjsf/core-v5": "npm:@rjsf/core@^5.0.0-beta.9",
+    "@rjsf/material-ui": "^3.2.1",
+    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@^5.0.0-beta.9",
+    "@rjsf/utils": "^5.0.0-beta.9",
+    "@rjsf/validator-ajv8": "^5.0.0-beta.9",
     "@types/json-schema": "^7.0.9",
     "@uiw/react-codemirror": "^4.9.3",
     "classnames": "^2.2.6",

plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx

@@ -32,7 +32,6 @@ import {
 import { UiSchema } from '@rjsf/utils';
 import { FormProps, IChangeEvent, withTheme } from '@rjsf/core';
 import { Theme } from '@rjsf/material-ui';
-import validator from '@rjsf/validator-ajv6';
 import React, { useState } from 'react';
 import { transformSchemaToProps } from './schema';
 import { Content, StructuredMetadataTable } from '@backstage/core-components';
@@ -208,7 +207,6 @@ export const MultistepJsonForm = (props: Props) => {
               </StepLabel>
               <StepContent key={title}>
                 <Form
-                  validator={validator}
                   showErrorList={false}
                   fields={{ ...fieldOverrides, ...fields }}
                   widgets={widgets}

plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx

@@ -26,7 +26,6 @@ import {
 } from '@backstage/integration-react';
 import { scaffolderApiRef } from '../../../api';
 import { ScaffolderApi } from '../../../types';
-import validator from '@rjsf/validator-ajv6';
 import {
   SecretsContextProvider,
   SecretsContext,
@@ -67,7 +66,6 @@ describe('RepoUrlPicker', () => {
         >
           <SecretsContextProvider>
             <Form
-              validator={validator}
               schema={{ type: 'string' }}
               uiSchema={{ 'ui:field': 'RepoUrlPicker' }}
               fields={{ RepoUrlPicker: RepoUrlPicker as Field<unknown> }}

plugins/scaffolder/src/extensions/types.ts

@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 import { ApiHolder } from '@backstage/core-plugin-api';
-import {
-  FieldValidation,
-  FieldProps,
-  UIOptionsType,
-  UiSchema,
-} from '@rjsf/utils';
+import { FieldValidation, FieldProps, UiSchema } from '@rjsf/core';
 import { PropsWithChildren } from 'react';
 
 /**
@@ -41,7 +36,7 @@ export type CustomFieldValidator<TFieldReturnValue> = (
  */
 export type FieldExtensionOptions<
   TFieldReturnValue = unknown,
-  TInputProps extends UIOptionsType = {},
+  TInputProps extends {} = {},
 > = {
   name: string;
   component: (
@@ -60,7 +55,7 @@ export interface FieldExtensionComponentProps<
   TFieldReturnValue,
   TUiOptions = {},
 > extends PropsWithChildren<FieldProps<TFieldReturnValue>> {
-  uiSchema?: UiSchema<TFieldReturnValue> & {
-    'ui:options'?: TUiOptions & UIOptionsType;
+  uiSchema: UiSchema & {
+    'ui:options': TUiOptions;
   };
 }