From a9495557c1a9e002c05f54e8819e057ed869fd46 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 26 Apr 2023 17:53:18 +0200 Subject: [PATCH 1/5] chore: this should be broken Signed-off-by: blam --- plugins/home/package.json | 5 +++-- .../components/CustomHomepage/WidgetSettingsOverlay.tsx | 4 +++- yarn.lock | 9 +++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/home/package.json b/plugins/home/package.json index 35310158a7..63e5a591d4 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -42,9 +42,10 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@rjsf/core": "^3.2.1", - "@rjsf/material-ui": "^3.2.1", + "@rjsf/core": "5.6.0", + "@rjsf/material-ui": "5.6.0", "@rjsf/utils": "5.6.0", + "@rjsf/validator-ajv8": "5.6.0", "@types/react": "^16.13.1 || ^17.0.0", "lodash": "^4.17.21", "object-hash": "^3.0.0", diff --git a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx index de64695ecb..b3be6503d1 100644 --- a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx +++ b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx @@ -27,7 +27,9 @@ import SettingsIcon from '@material-ui/icons/Settings'; import DeleteIcon from '@material-ui/icons/Delete'; import React from 'react'; import { Widget } from './types'; -import Form from '@rjsf/material-ui'; +import { withTheme } from '@rjsf/core'; + +const Form = withTheme(require('@rjsf/material-ui').Theme); const useStyles = makeStyles((theme: Theme) => createStyles({ diff --git a/yarn.lock b/yarn.lock index a426cab8b5..b8f02c7cbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6975,9 +6975,10 @@ __metadata: "@material-ui/core": ^4.12.2 "@material-ui/icons": ^4.9.1 "@material-ui/lab": 4.0.0-alpha.61 - "@rjsf/core": ^3.2.1 - "@rjsf/material-ui": ^3.2.1 + "@rjsf/core": 5.6.0 + "@rjsf/material-ui": 5.6.0 "@rjsf/utils": 5.6.0 + "@rjsf/validator-ajv8": 5.6.0 "@testing-library/dom": ^8.0.0 "@testing-library/jest-dom": ^5.10.1 "@testing-library/react": ^12.1.3 @@ -13708,7 +13709,7 @@ __metadata: languageName: node linkType: hard -"@rjsf/core-v5@npm:@rjsf/core@5.6.0": +"@rjsf/core-v5@npm:@rjsf/core@5.6.0, @rjsf/core@npm:5.6.0": version: 5.6.0 resolution: "@rjsf/core@npm:5.6.0" dependencies: @@ -13743,7 +13744,7 @@ __metadata: languageName: node linkType: hard -"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.6.0": +"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.6.0, @rjsf/material-ui@npm:5.6.0": version: 5.6.0 resolution: "@rjsf/material-ui@npm:5.6.0" peerDependencies: From bd53eb2be1f94a11299c1bcd912c152de36330cc Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 26 Apr 2023 18:16:32 +0200 Subject: [PATCH 2/5] chore: rename this package like we do in scaffolder to avoid typescript namespace clashes Signed-off-by: blam --- plugins/home/package.json | 2 +- .../src/components/CustomHomepage/WidgetSettingsOverlay.tsx | 4 +++- yarn.lock | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/home/package.json b/plugins/home/package.json index 63e5a591d4..e8eb7f3ba9 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -42,7 +42,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@rjsf/core": "5.6.0", + "@rjsf/core-v5": "npm:@rjsf/core@5.6.0", "@rjsf/material-ui": "5.6.0", "@rjsf/utils": "5.6.0", "@rjsf/validator-ajv8": "5.6.0", diff --git a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx index b3be6503d1..65e0917fb1 100644 --- a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx +++ b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx @@ -27,7 +27,8 @@ import SettingsIcon from '@material-ui/icons/Settings'; import DeleteIcon from '@material-ui/icons/Delete'; import React from 'react'; import { Widget } from './types'; -import { withTheme } from '@rjsf/core'; +import { withTheme } from '@rjsf/core-v5'; +import validator from '@rjsf/validator-ajv8'; const Form = withTheme(require('@rjsf/material-ui').Theme); @@ -74,6 +75,7 @@ export const WidgetSettingsOverlay = (props: WidgetSettingsOverlayProps) => { >
Date: Wed, 26 Apr 2023 18:19:12 +0200 Subject: [PATCH 3/5] chore: small rename and fix ts Signed-off-by: blam --- .../src/components/CustomHomepage/WidgetSettingsOverlay.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx index 65e0917fb1..027031f0e8 100644 --- a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx +++ b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx @@ -29,8 +29,9 @@ import React from 'react'; import { Widget } from './types'; import { withTheme } from '@rjsf/core-v5'; import validator from '@rjsf/validator-ajv8'; +import { Theme as MuiTheme } from '@rjsf/material-ui'; -const Form = withTheme(require('@rjsf/material-ui').Theme); +const Form = withTheme(MuiTheme); const useStyles = makeStyles((theme: Theme) => createStyles({ From 0e19e7b0f3affef2f196350728dcb0ddf2c4c6c9 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 26 Apr 2023 18:21:28 +0200 Subject: [PATCH 4/5] chore: add changeset Signed-off-by: blam --- .changeset/nine-ties-smoke.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nine-ties-smoke.md diff --git a/.changeset/nine-ties-smoke.md b/.changeset/nine-ties-smoke.md new file mode 100644 index 0000000000..f7ae8016be --- /dev/null +++ b/.changeset/nine-ties-smoke.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-home': patch +--- + +Bump to using the later v5 versions of `@rjsf/*` From 586f2bb3a4415b9dce8b6145802adb39ec3d3ff9 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 26 Apr 2023 19:24:59 +0200 Subject: [PATCH 5/5] chore: little fix Signed-off-by: blam --- .../src/components/CustomHomepage/WidgetSettingsOverlay.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx index 027031f0e8..65e0917fb1 100644 --- a/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx +++ b/plugins/home/src/components/CustomHomepage/WidgetSettingsOverlay.tsx @@ -29,9 +29,8 @@ import React from 'react'; import { Widget } from './types'; import { withTheme } from '@rjsf/core-v5'; import validator from '@rjsf/validator-ajv8'; -import { Theme as MuiTheme } from '@rjsf/material-ui'; -const Form = withTheme(MuiTheme); +const Form = withTheme(require('@rjsf/material-ui').Theme); const useStyles = makeStyles((theme: Theme) => createStyles({