From 5d8250cbd3d97148979c1f5e1d32c6e73c27224d Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 10 Jan 2023 13:45:02 +0100
Subject: [PATCH] chore: fix Signed-off-by: blam <ben@blam.sh>

Signed-off-by: blam <ben@blam.sh>
---
 plugins/scaffolder/package.json                            | 1 +
 .../src/components/MultistepJsonForm/MultistepJsonForm.tsx | 7 +------
 yarn.lock                                                  | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 8a93c8795f..0a9f476f11 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -58,6 +58,7 @@
     "@rjsf/core": "^3.2.1",
     "@rjsf/core-v5": "npm:@rjsf/core@^5.0.0-beta.14",
     "@rjsf/material-ui": "^3.2.1",
+    "@rjsf/utils": "^5.0.0-beta.14",
     "@uiw/react-codemirror": "^4.9.3",
     "classnames": "^2.2.6",
     "git-url-parse": "^13.0.0",
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index ed8471ec1e..3a1196bc0e 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -30,7 +30,6 @@ import {
   useApi,
 } from '@backstage/core-plugin-api';
 import { FormProps, IChangeEvent, withTheme } from '@rjsf/core';
-import { UiSchema } from '@rjsf/utils';
 import { Theme as MuiTheme } from '@rjsf/material-ui';
 import React, { ComponentType, useState } from 'react';
 import { transformSchemaToProps } from './schema';
@@ -68,11 +67,7 @@ export type MultistepJsonFormProps = {
   ReviewStepComponent?: ComponentType<ReviewStepProps>;
 };
 
-export function getSchemasFromSteps(steps: Step[]): {
-  uiSchema: UiSchema;
-  mergedSchema: JsonObject;
-  schema: JsonObject;
-}[] {
+export function getSchemasFromSteps(steps: Step[]) {
   return steps.map(({ schema }) => ({
     mergedSchema: schema,
     ...extractSchemaFromStep(schema),
diff --git a/yarn.lock b/yarn.lock
index aa654f12a9..5e1c17cdba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7532,6 +7532,7 @@ __metadata:
     "@rjsf/core": ^3.2.1
     "@rjsf/core-v5": "npm:@rjsf/core@^5.0.0-beta.14"
     "@rjsf/material-ui": ^3.2.1
+    "@rjsf/utils": ^5.0.0-beta.14
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0