diff --git a/.changeset/grumpy-bottles-stare.md b/.changeset/grumpy-bottles-stare.md new file mode 100644 index 0000000000..7ee3727f93 --- /dev/null +++ b/.changeset/grumpy-bottles-stare.md @@ -0,0 +1,6 @@ +--- +'@backstage/plugin-scaffolder-react': patch +'@backstage/plugin-scaffolder': patch +--- + +Upgrade @rjsf v5 dependencies to beta.17 diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index 58b22edf09..860dd6c10c 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.17", "@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.17", + "@rjsf/utils": "5.0.0-beta.17", + "@rjsf/validator-ajv8": "5.0.0-beta.17", "@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..05bf10fb71 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'; diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index c56f3e74aa..d2b262d3d6 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -56,7 +56,7 @@ "@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/core-v5": "npm:@rjsf/core@5.0.0-beta.17", "@rjsf/material-ui": "^3.2.1", "@rjsf/utils": "5.0.0-beta.16", "@uiw/react-codemirror": "^4.9.3", diff --git a/yarn.lock b/yarn.lock index d426940108..92e0f35bc3 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.17" "@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.17" + "@rjsf/utils": 5.0.0-beta.17 + "@rjsf/validator-ajv8": 5.0.0-beta.17 "@testing-library/jest-dom": ^5.10.1 "@testing-library/react": ^12.1.3 "@testing-library/react-hooks": ^8.0.0 @@ -7419,7 +7419,7 @@ __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/core-v5": "npm:@rjsf/core@5.0.0-beta.17" "@rjsf/material-ui": ^3.2.1 "@rjsf/utils": 5.0.0-beta.16 "@testing-library/jest-dom": ^5.10.1 @@ -12760,9 +12760,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.17": + version: 5.0.0-beta.17 + resolution: "@rjsf/core@npm:5.0.0-beta.17" dependencies: lodash: ^4.17.15 lodash-es: ^4.17.15 @@ -12771,7 +12771,7 @@ __metadata: peerDependencies: "@rjsf/utils": ^5.0.0-beta.1 react: ^16.14.0 || >=17 - checksum: 38b0e02cfc394958d714f1c2b29262e95c5da01fbfffd657db7af8546ae5b00d1900fd0484be07be13d354dd1e48833cabcdcdaa8e9ffa0dfba63fba7e9556c3 + checksum: a1def2655196e2090234937861ff8f376236371dc31eb8bce853943a255f6a846b570d9b04cd979108e880f5b789eee299246e837ac72e25900cc9274c099935 languageName: node linkType: hard @@ -12794,16 +12794,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.17": + version: 5.0.0-beta.17 + resolution: "@rjsf/material-ui@npm:5.0.0-beta.17" 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: 98bd63db5979621fee082efed56fc67151f4e3c711160932468695025c8bc202be1a52f294d8bf5018d092a61041edf027c2f52f0304d61273e86e7014709379 languageName: node linkType: hard @@ -12834,16 +12834,32 @@ __metadata: 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/utils@npm:5.0.0-beta.17": + version: 5.0.0-beta.17 + resolution: "@rjsf/utils@npm:5.0.0-beta.17" dependencies: - ajv: ^6.7.0 + json-schema-merge-allof: ^0.8.1 + jsonpointer: ^5.0.1 + lodash: ^4.17.15 + lodash-es: ^4.17.15 + react-is: ^18.2.0 + peerDependencies: + react: ^16.14.0 || >=17 + checksum: 0ad90cd0fde4b59e47612e182958840350f092ad317d021f00608966d54f6c52827173f05cf4a2149b4a6196b38c8d7fa4087589eb0e459c2248b6ebe837dcb2 + languageName: node + linkType: hard + +"@rjsf/validator-ajv8@npm:5.0.0-beta.17": + version: 5.0.0-beta.17 + resolution: "@rjsf/validator-ajv8@npm:5.0.0-beta.17" + dependencies: + 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: 3fab2eba98e4b4790ba6b3f28b0efbbe365c2837bf88221543a37a8daa3ef6269e03b9e5cf7032cd9328d0806689256d4e4ef918ee2b95ff69ff3d811388e558 languageName: node linkType: hard @@ -16377,7 +16393,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: