From c8122c42c0ac1151950a0410d65e9292dc80b938 Mon Sep 17 00:00:00 2001
From: Paul Cowan <paul.cowan@cutting.scot>
Date: Fri, 23 Dec 2022 16:45:32 +0000
Subject: [PATCH] export NextLayoutOptions

Signed-off-by: Paul Cowan <paul.cowan@cutting.scot>
---
 plugins/scaffolder/api-report.md     | 13 ++++++++++++-
 plugins/scaffolder/src/next/types.ts |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 82a8dfd8d3..f90a771703 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -159,7 +159,9 @@ export interface FieldSchema<TReturn, TUiOptions> {
 export type FormProps = Pick<
   FormProps_3,
   'transformErrors' | 'noHtml5Validate'
->;
+> & {
+  layouts?: NextLayoutOptions[];
+};
 
 // @public
 export type LayoutComponent<_TInputProps> = () => null;
@@ -526,6 +528,15 @@ export type TemplateParameterSchema = TemplateParameterSchema_2;
 // @public
 export const TemplateTypePicker: () => JSX.Element | null;
 
+<<<<<<< HEAD
 // @public @deprecated (undocumented)
 export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets_2;
+=======
+// @public
+export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets;
+
+// Warnings were encountered during analysis:
+//
+// src/next/types.d.ts:23:5 - (ae-forgotten-export) The symbol "NextLayoutOptions" needs to be exported by the entry point index.d.ts
+>>>>>>> 55041019c8 (export NextLayoutOptions)
 ```
diff --git a/plugins/scaffolder/src/next/types.ts b/plugins/scaffolder/src/next/types.ts
index 0e2d525472..e84fade2cd 100644
--- a/plugins/scaffolder/src/next/types.ts
+++ b/plugins/scaffolder/src/next/types.ts
@@ -25,7 +25,7 @@ import type { FormProps as SchemaFormProps } from '@rjsf/core-v5';
 /**
  * The field template from \@rjsf/core which is a react component that gets passed \@rjsf/core field related props.
  *
- * @public
+ * @alpha
  */
 export type NextLayoutTemplate<T = any> = NonNullable<
   SchemaFormProps<T>['uiSchema']
@@ -34,7 +34,7 @@ export type NextLayoutTemplate<T = any> = NonNullable<
 /**
  * The type of layouts that is passed to the TemplateForms
  *
- * @public
+ * @alpha
  */
 export interface NextLayoutOptions<P = any> {
   name: string;