From 346d6b6630437de4383f075c61e1d9ea563aa372 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Wed, 25 Jan 2023 08:02:29 +0000 Subject: [PATCH 1/7] Upgrade @rjsf v5 dependencies to beta.17 Signed-off-by: Paul Cowan --- .changeset/grumpy-bottles-stare.md | 6 ++ plugins/scaffolder-react/package.json | 8 +-- .../src/next/components/Stepper/Stepper.tsx | 2 +- plugins/scaffolder/package.json | 2 +- yarn.lock | 56 ++++++++++++------- 5 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 .changeset/grumpy-bottles-stare.md 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: From 73b65278ec7ae43dd6dfbd19143017605e30af14 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Wed, 25 Jan 2023 08:06:45 +0000 Subject: [PATCH 2/7] changeset description Signed-off-by: Paul Cowan --- .changeset/grumpy-bottles-stare.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/grumpy-bottles-stare.md b/.changeset/grumpy-bottles-stare.md index 7ee3727f93..b6e524cf67 100644 --- a/.changeset/grumpy-bottles-stare.md +++ b/.changeset/grumpy-bottles-stare.md @@ -3,4 +3,4 @@ '@backstage/plugin-scaffolder': patch --- -Upgrade @rjsf v5 dependencies to beta.17 +Upgrade `@rjsf-v5` dependencies to `beta.17` From 412c829684319b786fafb15d886c653897355982 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Wed, 25 Jan 2023 08:35:36 +0000 Subject: [PATCH 3/7] bump @rjsf/utils Signed-off-by: Paul Cowan --- plugins/scaffolder/package.json | 2 +- yarn.lock | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index d2b262d3d6..0a2ca2c70a 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -58,7 +58,7 @@ "@rjsf/core": "^3.2.1", "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.17", "@rjsf/material-ui": "^3.2.1", - "@rjsf/utils": "5.0.0-beta.16", + "@rjsf/utils": "5.0.0-beta.17", "@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 92e0f35bc3..b820bf5bba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7421,7 +7421,7 @@ __metadata: "@rjsf/core": ^3.2.1 "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.17" "@rjsf/material-ui": ^3.2.1 - "@rjsf/utils": 5.0.0-beta.16 + "@rjsf/utils": 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 @@ -12819,21 +12819,6 @@ __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" - dependencies: - 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: 7a0f04f20b1b12eff33322bef322ee96e222fc621142fb34906cb18386a2a0dd97224fd97851899644994a1adaab33c6f107076f344b66108219fcb809132703 - languageName: node - linkType: hard - "@rjsf/utils@npm:5.0.0-beta.17": version: 5.0.0-beta.17 resolution: "@rjsf/utils@npm:5.0.0-beta.17" From f4c475d8f8651f38c20deccec356a68416cd4eb8 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Wed, 25 Jan 2023 09:08:27 +0000 Subject: [PATCH 4/7] changeset description Signed-off-by: Paul Cowan --- .changeset/grumpy-bottles-stare.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/grumpy-bottles-stare.md b/.changeset/grumpy-bottles-stare.md index b6e524cf67..1838bb961d 100644 --- a/.changeset/grumpy-bottles-stare.md +++ b/.changeset/grumpy-bottles-stare.md @@ -3,4 +3,4 @@ '@backstage/plugin-scaffolder': patch --- -Upgrade `@rjsf-v5` dependencies to `beta.17` +Upgrade `@rjsf` version 5 dependencies to `beta.17` From ee9081a1fa58201c0210bffa2e90859c8b478d09 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Wed, 25 Jan 2023 09:28:15 +0000 Subject: [PATCH 5/7] bump @rjsf v5 dependencies to beta.18 Signed-off-by: Paul Cowan --- .changeset/grumpy-bottles-stare.md | 2 +- plugins/scaffolder-react/package.json | 8 ++-- .../src/next/components/Stepper/Stepper.tsx | 4 +- plugins/scaffolder/package.json | 4 +- yarn.lock | 44 +++++++++---------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.changeset/grumpy-bottles-stare.md b/.changeset/grumpy-bottles-stare.md index 1838bb961d..1e6040f57f 100644 --- a/.changeset/grumpy-bottles-stare.md +++ b/.changeset/grumpy-bottles-stare.md @@ -3,4 +3,4 @@ '@backstage/plugin-scaffolder': patch --- -Upgrade `@rjsf` version 5 dependencies to `beta.17` +Upgrade `@rjsf` version 5 dependencies to `beta.18` diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index 860dd6c10c..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.17", + "@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.17", - "@rjsf/utils": "5.0.0-beta.17", - "@rjsf/validator-ajv8": "5.0.0-beta.17", + "@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 05bf10fb71..096173deb7 100644 --- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx +++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx @@ -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 0a2ca2c70a..27a0b0d631 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -56,9 +56,9 @@ "@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.17", + "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.18", "@rjsf/material-ui": "^3.2.1", - "@rjsf/utils": "5.0.0-beta.17", + "@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 b820bf5bba..c0e9d05aa1 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.17" + "@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.17" - "@rjsf/utils": 5.0.0-beta.17 - "@rjsf/validator-ajv8": 5.0.0-beta.17 + "@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,9 @@ __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.17" + "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.18" "@rjsf/material-ui": ^3.2.1 - "@rjsf/utils": 5.0.0-beta.17 + "@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 @@ -12760,9 +12760,9 @@ __metadata: languageName: node linkType: hard -"@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" +"@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 @@ -12771,7 +12771,7 @@ __metadata: peerDependencies: "@rjsf/utils": ^5.0.0-beta.1 react: ^16.14.0 || >=17 - checksum: a1def2655196e2090234937861ff8f376236371dc31eb8bce853943a255f6a846b570d9b04cd979108e880f5b789eee299246e837ac72e25900cc9274c099935 + checksum: 1a2f2d43929790c20b6aeaa99b56bb02fc523edfa47eeffa29437dd80e337f9af5b4e4b274a637ac83e33b91799fda2a459e84903efe709def05018820f0fa83 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.17": - version: 5.0.0-beta.17 - resolution: "@rjsf/material-ui@npm:5.0.0-beta.17" +"@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: 98bd63db5979621fee082efed56fc67151f4e3c711160932468695025c8bc202be1a52f294d8bf5018d092a61041edf027c2f52f0304d61273e86e7014709379 + checksum: b40a86d4aaeb863c1e7ce7fc0256adc0e4a8cfce510c6957fdc3385d0eac3292349501c1364b640fafbdce78e214ebb927199a2a5bdeb3d7814a7680bb8d8d44 languageName: node linkType: hard @@ -12819,9 +12819,9 @@ __metadata: languageName: node linkType: hard -"@rjsf/utils@npm:5.0.0-beta.17": - version: 5.0.0-beta.17 - resolution: "@rjsf/utils@npm:5.0.0-beta.17" +"@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 @@ -12830,13 +12830,13 @@ __metadata: react-is: ^18.2.0 peerDependencies: react: ^16.14.0 || >=17 - checksum: 0ad90cd0fde4b59e47612e182958840350f092ad317d021f00608966d54f6c52827173f05cf4a2149b4a6196b38c8d7fa4087589eb0e459c2248b6ebe837dcb2 + checksum: ac71ec2a96449e70bb7aa8af901804e3152a94908607ee8b0be90249bf5ff571c69f63b55abc6f95f3f1ec12d9a0bf467013c08b9f4276ff31ce44a36ee72633 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" +"@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: ^8.11.0 ajv-formats: ^2.1.1 @@ -12844,7 +12844,7 @@ __metadata: lodash-es: ^4.17.15 peerDependencies: "@rjsf/utils": ^5.0.0-beta.16 - checksum: 3fab2eba98e4b4790ba6b3f28b0efbbe365c2837bf88221543a37a8daa3ef6269e03b9e5cf7032cd9328d0806689256d4e4ef918ee2b95ff69ff3d811388e558 + checksum: eb4ca8b40a21bbca4f7dd67900aa4423aaaf3fa1e4d893c8a5d00e869b7fc44514e0f262b240556f22b4dc9363ce6e554046bb8c42d599c92d191fa5bee84d0d languageName: node linkType: hard From 1f58583cba31fc6881e8b1d9e19a55b3654622db Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Wed, 25 Jan 2023 10:37:54 +0000 Subject: [PATCH 6/7] remove @rjsf v5 dependencies from plugin-scaffolder Signed-off-by: Paul Cowan --- plugins/scaffolder/package.json | 2 -- yarn.lock | 2 -- 2 files changed, 4 deletions(-) diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 27a0b0d631..6b5025a5e4 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -56,9 +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.18", "@rjsf/material-ui": "^3.2.1", - "@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 c0e9d05aa1..020397c919 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7419,9 +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.18" "@rjsf/material-ui": ^3.2.1 - "@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 From fbbc88b6175775dd9ebc383fb4125ca2942b7fb6 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Wed, 25 Jan 2023 10:54:12 +0000 Subject: [PATCH 7/7] readd @rjsf/utils to scaffolder Signed-off-by: Paul Cowan --- plugins/scaffolder/package.json | 1 + yarn.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 6b5025a5e4..1967349922 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -57,6 +57,7 @@ "@react-hookz/web": "^20.0.0", "@rjsf/core": "^3.2.1", "@rjsf/material-ui": "^3.2.1", + "@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 020397c919..5acb27b81c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7420,6 +7420,7 @@ __metadata: "@react-hookz/web": ^20.0.0 "@rjsf/core": ^3.2.1 "@rjsf/material-ui": ^3.2.1 + "@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