From 3c112f69671652b7c0b082ca763f3aee7760cf5c Mon Sep 17 00:00:00 2001
From: Paul Cowan <paul.cowan@cutting.scot>
Date: Tue, 20 Dec 2022 10:43:10 +0000
Subject: [PATCH] rollback @rjsf/validator-ajv8 to @rjsf/validator-v6

Signed-off-by: Paul Cowan <paul.cowan@cutting.scot>
---
 .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