From 3c112f69671652b7c0b082ca763f3aee7760cf5c Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Tue, 20 Dec 2022 10:43:10 +0000 Subject: [PATCH 1/5] rollback @rjsf/validator-ajv8 to @rjsf/validator-v6 Signed-off-by: Paul Cowan --- .changeset/eight-dragons-accept.md | 5 +++++ .yarnrc.yml | 2 ++ plugins/scaffolder/api-report.md | 8 ++++---- plugins/scaffolder/package.json | 2 +- .../src/next/TemplateWizardPage/Stepper/Stepper.tsx | 2 +- yarn.lock | 8 ++++---- 6 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 .changeset/eight-dragons-accept.md diff --git a/.changeset/eight-dragons-accept.md b/.changeset/eight-dragons-accept.md new file mode 100644 index 0000000000..733fd6ddbc --- /dev/null +++ b/.changeset/eight-dragons-accept.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +rollback @rjsf/validator-ajv8 to @rjsf/validator-v6 diff --git a/.yarnrc.yml b/.yarnrc.yml index 0b1cd8e1ae..c2d39a20f3 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -11,3 +11,5 @@ plugins: spec: '@yarnpkg/plugin-workspace-tools' yarnPath: .yarn/releases/yarn-3.2.3.cjs + +checksumBehavior: update diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md index 7611e952dc..12436785d6 100644 --- a/plugins/scaffolder/api-report.md +++ b/plugins/scaffolder/api-report.md @@ -110,9 +110,9 @@ export type EntityPickerUiOptions = export const EntityTagsPickerFieldExtension: FieldExtensionComponent< string[], { - showCounts?: boolean | undefined; - kinds?: string[] | undefined; helperText?: string | undefined; + kinds?: string[] | undefined; + showCounts?: boolean | undefined; } >; @@ -120,9 +120,9 @@ export const EntityTagsPickerFieldExtension: FieldExtensionComponent< export const EntityTagsPickerFieldSchema: FieldSchema< string[], { - showCounts?: boolean | undefined; - kinds?: string[] | undefined; helperText?: string | undefined; + kinds?: string[] | undefined; + showCounts?: boolean | undefined; } >; diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 90c76fe9c9..2fcd4cf2cc 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -59,7 +59,7 @@ "@rjsf/material-ui": "^3.2.1", "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@^5.0.0-beta.14", "@rjsf/utils": "^5.0.0-beta.14", - "@rjsf/validator-ajv8": "^5.0.0-beta.14", + "@rjsf/validator-ajv6": "^5.0.0-beta.14", "@types/json-schema": "^7.0.9", "@uiw/react-codemirror": "^4.9.3", "classnames": "^2.2.6", diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx index 27230b2f7b..3d5cb1bfd2 100644 --- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx +++ b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx @@ -34,7 +34,7 @@ import { TemplateParameterSchema } from '../../../types'; import { createAsyncValidators } from './createAsyncValidators'; import { useTemplateSchema } from './useTemplateSchema'; import { ReviewState } from './ReviewState'; -import validator from '@rjsf/validator-ajv8'; +import validator from '@rjsf/validator-ajv6'; import { selectedTemplateRouteRef } from '../../../routes'; import { getDefaultFormState } from '@rjsf/utils'; import { useFormData } from './useFormData'; diff --git a/yarn.lock b/yarn.lock index b20a8ce49b..7996f3e587 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7489,7 +7489,7 @@ __metadata: "@rjsf/material-ui": ^3.2.1 "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@^5.0.0-beta.14" "@rjsf/utils": ^5.0.0-beta.14 - "@rjsf/validator-ajv8": ^5.0.0-beta.14 + "@rjsf/validator-ajv6": ^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 @@ -12762,9 +12762,9 @@ __metadata: languageName: node linkType: hard -"@rjsf/validator-ajv8@npm:^5.0.0-beta.14": +"@rjsf/validator-ajv6@npm:^5.0.0-beta.14": version: 5.0.0-beta.14 - resolution: "@rjsf/validator-ajv8@npm:5.0.0-beta.14" + resolution: "@rjsf/validator-ajv6@npm:5.0.0-beta.14" dependencies: ajv-formats: ^2.1.1 ajv8: "npm:ajv@^8.11.0" @@ -12772,7 +12772,7 @@ __metadata: lodash-es: ^4.17.15 peerDependencies: "@rjsf/utils": ^5.0.0-beta.12 - checksum: 14f31eabf6bb668953dcedd1c4b2c1dce4d98022600aa511451798a211a0b00a1f50abd861fce8891f7d6dfeb0a0885bcf1686b6d3a7f4add746abe8b58fc8b0 + checksum: 57b5c6968475a66762f644f2832aad077f8dde0ca9e71c8b0b27c06174855b7e6330f44fa6078fc0f347b728a4a5fd62399378fad26ada3cde32da89bddf6f9f languageName: node linkType: hard From 0089bb9065f95511df14db1375a90f1dea7120b0 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Tue, 20 Dec 2022 10:50:36 +0000 Subject: [PATCH 2/5] remove chcksum setting in yarnrc Signed-off-by: Paul Cowan --- .yarnrc.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index c2d39a20f3..0b1cd8e1ae 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -11,5 +11,3 @@ plugins: spec: '@yarnpkg/plugin-workspace-tools' yarnPath: .yarn/releases/yarn-3.2.3.cjs - -checksumBehavior: update From 82bcb7b232c5e441fe8bfd216a3380723e461a4c Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Tue, 20 Dec 2022 10:53:33 +0000 Subject: [PATCH 3/5] update changeset Signed-off-by: Paul Cowan --- .changeset/eight-dragons-accept.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/eight-dragons-accept.md b/.changeset/eight-dragons-accept.md index 733fd6ddbc..a3d46de4a3 100644 --- a/.changeset/eight-dragons-accept.md +++ b/.changeset/eight-dragons-accept.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder': patch --- -rollback @rjsf/validator-ajv8 to @rjsf/validator-v6 +rollback `@rjsf/validator-ajv8` to `@rjsf/validator-v6` From b5c0bc2c505796dd8a8176cdbfd26f98fad01532 Mon Sep 17 00:00:00 2001 From: Paul Cowan Date: Tue, 20 Dec 2022 11:12:30 +0000 Subject: [PATCH 4/5] run api-report Signed-off-by: Paul Cowan --- plugins/scaffolder/api-report.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md index 12436785d6..7611e952dc 100644 --- a/plugins/scaffolder/api-report.md +++ b/plugins/scaffolder/api-report.md @@ -110,9 +110,9 @@ export type EntityPickerUiOptions = export const EntityTagsPickerFieldExtension: FieldExtensionComponent< string[], { - helperText?: string | undefined; - kinds?: string[] | undefined; showCounts?: boolean | undefined; + kinds?: string[] | undefined; + helperText?: string | undefined; } >; @@ -120,9 +120,9 @@ export const EntityTagsPickerFieldExtension: FieldExtensionComponent< export const EntityTagsPickerFieldSchema: FieldSchema< string[], { - helperText?: string | undefined; - kinds?: string[] | undefined; showCounts?: boolean | undefined; + kinds?: string[] | undefined; + helperText?: string | undefined; } >; From 25c8b2d04626858c60a0e141f86c80cf4e0a5e9b Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 20 Dec 2022 16:55:10 +0100 Subject: [PATCH 5/5] chore: modify the yarn lock resolution Signed-off-by: blam --- yarn.lock | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7996f3e587..e78f32baa8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12766,12 +12766,11 @@ __metadata: version: 5.0.0-beta.14 resolution: "@rjsf/validator-ajv6@npm:5.0.0-beta.14" dependencies: - ajv-formats: ^2.1.1 - ajv8: "npm:ajv@^8.11.0" + ajv: ^6.7.0 lodash: ^4.17.15 lodash-es: ^4.17.15 peerDependencies: - "@rjsf/utils": ^5.0.0-beta.12 + "@rjsf/utils": ^5.0.0-beta.1 checksum: 57b5c6968475a66762f644f2832aad077f8dde0ca9e71c8b0b27c06174855b7e6330f44fa6078fc0f347b728a4a5fd62399378fad26ada3cde32da89bddf6f9f languageName: node linkType: hard @@ -16259,18 +16258,6 @@ __metadata: languageName: node linkType: hard -"ajv8@npm:ajv@^8.11.0, ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.8.0": - version: 8.11.2 - resolution: "ajv@npm:8.11.2" - dependencies: - fast-deep-equal: ^3.1.1 - json-schema-traverse: ^1.0.0 - require-from-string: ^2.0.2 - uri-js: ^4.2.2 - checksum: 53435bf79ee7d1eabba8085962dba4c08d08593334b304db7772887f0b7beebc1b3d957432f7437ed4b60e53b5d966a57b439869890209c50fed610459999e3e - languageName: node - linkType: hard - "ajv@npm:^6.10.0, ajv@npm:^6.10.1, ajv@npm:^6.12.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.5.5, ajv@npm:^6.7.0, ajv@npm:~6.12.6": version: 6.12.6 resolution: "ajv@npm:6.12.6" @@ -16283,6 +16270,18 @@ __metadata: languageName: node linkType: hard +"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.8.0": + version: 8.11.2 + resolution: "ajv@npm:8.11.2" + dependencies: + fast-deep-equal: ^3.1.1 + json-schema-traverse: ^1.0.0 + require-from-string: ^2.0.2 + uri-js: ^4.2.2 + checksum: 53435bf79ee7d1eabba8085962dba4c08d08593334b304db7772887f0b7beebc1b3d957432f7437ed4b60e53b5d966a57b439869890209c50fed610459999e3e + languageName: node + linkType: hard + "alphanum-sort@npm:^1.0.2": version: 1.0.2 resolution: "alphanum-sort@npm:1.0.2"