diff --git a/.changeset/grumpy-bottles-stare.md b/.changeset/grumpy-bottles-stare.md new file mode 100644 index 0000000000..1e6040f57f --- /dev/null +++ b/.changeset/grumpy-bottles-stare.md @@ -0,0 +1,6 @@ +--- +'@backstage/plugin-scaffolder-react': patch +'@backstage/plugin-scaffolder': patch +--- + +Upgrade `@rjsf` version 5 dependencies to `beta.18` diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index 58b22edf09..dbd64d1f2d 100644 --- a/plugins/scaffolder-react/package.json +++ b/plugins/scaffolder-react/package.json @@ -47,11 +47,11 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "@rjsf/core": "^3.2.1", - "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.16", + "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.18", "@rjsf/material-ui": "^3.2.1", - "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.0.0-beta.16", - "@rjsf/utils": "5.0.0-beta.16", - "@rjsf/validator-ajv6": "5.0.0-beta.16", + "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.0.0-beta.18", + "@rjsf/utils": "5.0.0-beta.18", + "@rjsf/validator-ajv8": "5.0.0-beta.18", "@types/json-schema": "^7.0.9", "classnames": "^2.2.6", "json-schema": "^0.4.0", diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx index 6189bdc975..096173deb7 100644 --- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx +++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx @@ -30,7 +30,7 @@ import { TemplateParameterSchema } from '../../../types'; import { createAsyncValidators } from './createAsyncValidators'; import { ReviewState, type ReviewStateProps } from '../ReviewState'; import { useTemplateSchema } from '../../hooks/useTemplateSchema'; -import validator from '@rjsf/validator-ajv6'; +import validator from '@rjsf/validator-ajv8'; import { useFormDataFromQuery } from '../../hooks'; import type { FormProps, LayoutOptions } from '../../types'; import { useTransformSchemaToProps } from '../../hooks/useTransformSchemaToProps'; @@ -125,9 +125,9 @@ export const Stepper = (stepperProps: StepperProps) => { ); const handleNext = async ({ - formData, + formData = {}, }: { - formData: Record; + formData?: Record; }) => { // TODO(blam): What do we do about loading states, does each field extension get a chance // to display it's own loading? Or should we grey out the entire form. diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index c56f3e74aa..1967349922 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -56,9 +56,8 @@ "@material-ui/lab": "4.0.0-alpha.57", "@react-hookz/web": "^20.0.0", "@rjsf/core": "^3.2.1", - "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.16", "@rjsf/material-ui": "^3.2.1", - "@rjsf/utils": "5.0.0-beta.16", + "@rjsf/utils": "5.0.0-beta.18", "@uiw/react-codemirror": "^4.9.3", "classnames": "^2.2.6", "git-url-parse": "^13.0.0", diff --git a/yarn.lock b/yarn.lock index eb900961b5..8760a490cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7361,11 +7361,11 @@ __metadata: "@material-ui/icons": ^4.9.1 "@material-ui/lab": 4.0.0-alpha.57 "@rjsf/core": ^3.2.1 - "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.16" + "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.18" "@rjsf/material-ui": ^3.2.1 - "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.0.0-beta.16" - "@rjsf/utils": 5.0.0-beta.16 - "@rjsf/validator-ajv6": 5.0.0-beta.16 + "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.0.0-beta.18" + "@rjsf/utils": 5.0.0-beta.18 + "@rjsf/validator-ajv8": 5.0.0-beta.18 "@testing-library/jest-dom": ^5.10.1 "@testing-library/react": ^12.1.3 "@testing-library/react-hooks": ^8.0.0 @@ -7419,9 +7419,8 @@ __metadata: "@material-ui/lab": 4.0.0-alpha.57 "@react-hookz/web": ^20.0.0 "@rjsf/core": ^3.2.1 - "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.16" "@rjsf/material-ui": ^3.2.1 - "@rjsf/utils": 5.0.0-beta.16 + "@rjsf/utils": 5.0.0-beta.18 "@testing-library/jest-dom": ^5.10.1 "@testing-library/react": ^12.1.3 "@testing-library/react-hooks": ^8.0.0 @@ -12758,9 +12757,9 @@ __metadata: languageName: node linkType: hard -"@rjsf/core-v5@npm:@rjsf/core@5.0.0-beta.16": - version: 5.0.0-beta.16 - resolution: "@rjsf/core@npm:5.0.0-beta.16" +"@rjsf/core-v5@npm:@rjsf/core@5.0.0-beta.18": + version: 5.0.0-beta.18 + resolution: "@rjsf/core@npm:5.0.0-beta.18" dependencies: lodash: ^4.17.15 lodash-es: ^4.17.15 @@ -12769,7 +12768,7 @@ __metadata: peerDependencies: "@rjsf/utils": ^5.0.0-beta.1 react: ^16.14.0 || >=17 - checksum: 38b0e02cfc394958d714f1c2b29262e95c5da01fbfffd657db7af8546ae5b00d1900fd0484be07be13d354dd1e48833cabcdcdaa8e9ffa0dfba63fba7e9556c3 + checksum: 1a2f2d43929790c20b6aeaa99b56bb02fc523edfa47eeffa29437dd80e337f9af5b4e4b274a637ac83e33b91799fda2a459e84903efe709def05018820f0fa83 languageName: node linkType: hard @@ -12792,16 +12791,16 @@ __metadata: languageName: node linkType: hard -"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.0.0-beta.16": - version: 5.0.0-beta.16 - resolution: "@rjsf/material-ui@npm:5.0.0-beta.16" +"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.0.0-beta.18": + version: 5.0.0-beta.18 + resolution: "@rjsf/material-ui@npm:5.0.0-beta.18" peerDependencies: "@material-ui/core": ^4.12.3 "@material-ui/icons": ^4.11.2 "@rjsf/core": ^5.0.0-beta.1 "@rjsf/utils": ^5.0.0-beta.1 react: ^16.14.0 || >=17 - checksum: b8252dd7edd07435c065393cf4a86f7a8db0224646f71206561f9d300fb8d39a658282b5181f1b0100b069f775620953c03f89818fecdf34c52076e39108b93f + checksum: b40a86d4aaeb863c1e7ce7fc0256adc0e4a8cfce510c6957fdc3385d0eac3292349501c1364b640fafbdce78e214ebb927199a2a5bdeb3d7814a7680bb8d8d44 languageName: node linkType: hard @@ -12817,9 +12816,9 @@ __metadata: languageName: node linkType: hard -"@rjsf/utils@npm:5.0.0-beta.16": - version: 5.0.0-beta.16 - resolution: "@rjsf/utils@npm:5.0.0-beta.16" +"@rjsf/utils@npm:5.0.0-beta.18": + version: 5.0.0-beta.18 + resolution: "@rjsf/utils@npm:5.0.0-beta.18" dependencies: json-schema-merge-allof: ^0.8.1 jsonpointer: ^5.0.1 @@ -12828,20 +12827,21 @@ __metadata: react-is: ^18.2.0 peerDependencies: react: ^16.14.0 || >=17 - checksum: 7a0f04f20b1b12eff33322bef322ee96e222fc621142fb34906cb18386a2a0dd97224fd97851899644994a1adaab33c6f107076f344b66108219fcb809132703 + checksum: ac71ec2a96449e70bb7aa8af901804e3152a94908607ee8b0be90249bf5ff571c69f63b55abc6f95f3f1ec12d9a0bf467013c08b9f4276ff31ce44a36ee72633 languageName: node linkType: hard -"@rjsf/validator-ajv6@npm:5.0.0-beta.16": - version: 5.0.0-beta.16 - resolution: "@rjsf/validator-ajv6@npm:5.0.0-beta.16" +"@rjsf/validator-ajv8@npm:5.0.0-beta.18": + version: 5.0.0-beta.18 + resolution: "@rjsf/validator-ajv8@npm:5.0.0-beta.18" dependencies: - ajv: ^6.7.0 + ajv: ^8.11.0 + ajv-formats: ^2.1.1 lodash: ^4.17.15 lodash-es: ^4.17.15 peerDependencies: - "@rjsf/utils": ^5.0.0-beta.1 - checksum: c4296e37608907c904424c46c884a15991101229e708caaa43e2e3c7d7e44a7e88ba206a902f80853f9a7f4c78d129fe47452ee5265cfd845b916051e99cd70d + "@rjsf/utils": ^5.0.0-beta.16 + checksum: eb4ca8b40a21bbca4f7dd67900aa4423aaaf3fa1e4d893c8a5d00e869b7fc44514e0f262b240556f22b4dc9363ce6e554046bb8c42d599c92d191fa5bee84d0d languageName: node linkType: hard @@ -16366,7 +16366,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.8.0": +"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.11.0, ajv@npm:^8.8.0": version: 8.12.0 resolution: "ajv@npm:8.12.0" dependencies: