chore: fix typescript and updating api-reports

Signed-off-by: blam <ben@blam.sh>

plugins/scaffolder-common/api-report.md

@@ -10,6 +10,11 @@ import type { JsonValue } from '@backstage/types';
 import { KindValidator } from '@backstage/catalog-model';
 import type { UserEntity } from '@backstage/catalog-model';
 
+// @public
+export const isTemplateEntityV1beta3: (
+  entity: Entity,
+) => entity is TemplateEntityV1beta3;
+
 // @public
 export type TaskSpec = TaskSpecV1beta3;
 

plugins/scaffolder-react/alpha-api-report.md

@@ -208,6 +208,12 @@ export const TemplateCategoryPicker: () => JSX.Element | null;
 // @alpha
 export const TemplateGroup: (props: TemplateGroupProps) => JSX.Element;
 
+// @alpha (undocumented)
+export type TemplateGroupFilter = {
+  title?: React_2.ReactNode;
+  filter: (entity: TemplateEntityV1beta3) => boolean;
+};
+
 // @alpha
 export interface TemplateGroupProps {
   // (undocumented)
@@ -229,6 +235,29 @@ export interface TemplateGroupProps {
   title: React_2.ReactNode;
 }
 
+// @alpha (undocumented)
+export const TemplateGroups: (props: TemplateGroupsProps) => JSX.Element | null;
+
+// @alpha (undocumented)
+export interface TemplateGroupsProps {
+  // (undocumented)
+  additionalLinksForEntity?: (template: TemplateEntityV1beta3) => {
+    icon: IconComponent;
+    text: string;
+    url: string;
+  }[];
+  // (undocumented)
+  groups: TemplateGroupFilter[];
+  // (undocumented)
+  onTemplateSelected?: (template: TemplateEntityV1beta3) => void;
+  // (undocumented)
+  TemplateCardComponent?: React_2.ComponentType<{
+    template: TemplateEntityV1beta3;
+  }>;
+  // (undocumented)
+  templateFilter?: (entity: TemplateEntityV1beta3) => boolean;
+}
+
 // @alpha
 export const useFormDataFromQuery: (
   initialState?: Record<string, JsonValue>,

plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.tsx

@@ -15,7 +15,6 @@
  */
 import React, { useCallback } from 'react';
 
-import { parseEntityRef, stringifyEntityRef } from '@backstage/catalog-model';
 import { useEntityList } from '@backstage/plugin-catalog-react';
 import {
   isTemplateEntityV1beta3,

plugins/scaffolder/alpha-api-report.md

@@ -13,6 +13,7 @@ import { PropsWithChildren } from 'react';
 import { default as React_2 } from 'react';
 import { ScaffolderTaskOutput } from '@backstage/plugin-scaffolder-react';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
+import { TemplateGroupFilter } from '@backstage/plugin-scaffolder-react/alpha';
 
 // @alpha @deprecated
 export type FormProps = Pick<
@@ -48,27 +49,6 @@ export const NextScaffolderPage: (
   props: PropsWithChildren<NextRouterProps>,
 ) => JSX.Element;
 
-// @alpha (undocumented)
-export type TemplateGroupFilter = {
-  title?: React_2.ReactNode;
-  filter: (entity: TemplateEntityV1beta3) => boolean;
-};
-
-// @alpha (undocumented)
-export const TemplateGroups: (props: TemplateGroupsProps) => JSX.Element | null;
-
-// @alpha (undocumented)
-export interface TemplateGroupsProps {
-  // (undocumented)
-  groups: TemplateGroupFilter[];
-  // (undocumented)
-  TemplateCardComponent?: React_2.ComponentType<{
-    template: TemplateEntityV1beta3;
-  }>;
-  // (undocumented)
-  templateFilter?: (entity: TemplateEntityV1beta3) => boolean;
-}
-
 // @alpha (undocumented)
 export type TemplateListPageProps = {
   TemplateCardComponent?: React_2.ComponentType<{

plugins/scaffolder/api-report.md

@@ -138,8 +138,8 @@ export const EntityTagsPickerFieldExtension: FieldExtensionComponent_2<
   string[],
   {
     showCounts?: boolean | undefined;
-    helperText?: string | undefined;
     kinds?: string[] | undefined;
+    helperText?: string | undefined;
   }
 >;
 
@@ -148,8 +148,8 @@ export const EntityTagsPickerFieldSchema: FieldSchema<
   string[],
   {
     showCounts?: boolean | undefined;
-    helperText?: string | undefined;
     kinds?: string[] | undefined;
+    helperText?: string | undefined;
   }
 >;
 
@@ -315,8 +315,8 @@ export const RepoUrlPickerFieldExtension: FieldExtensionComponent_2<
             | {
                 azure?: string[] | undefined;
                 github?: string[] | undefined;
-                bitbucket?: string[] | undefined;
                 gitlab?: string[] | undefined;
+                bitbucket?: string[] | undefined;
                 gerrit?: string[] | undefined;
               }
             | undefined;
@@ -341,8 +341,8 @@ export const RepoUrlPickerFieldSchema: FieldSchema<
             | {
                 azure?: string[] | undefined;
                 github?: string[] | undefined;
-                bitbucket?: string[] | undefined;
                 gitlab?: string[] | undefined;
+                bitbucket?: string[] | undefined;
                 gerrit?: string[] | undefined;
               }
             | undefined;

plugins/scaffolder/src/alpha.ts

@@ -16,9 +16,6 @@
 
 export { NextScaffolderPage } from './plugin';
 export {
-  TemplateGroups,
-  type TemplateGroupFilter,
-  type TemplateGroupsProps,
   type NextRouterProps,
   type FormProps,
   type TemplateListPageProps,

plugins/scaffolder/src/next/Router/Router.tsx

@@ -23,6 +23,7 @@ import {
 import {
   NextFieldExtensionOptions,
   FormProps,
+  TemplateGroupFilter,
 } from '@backstage/plugin-scaffolder-react/alpha';
 import {
   ScaffolderTaskOutput,
@@ -32,7 +33,6 @@ import {
 } from '@backstage/plugin-scaffolder-react';
 
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
-import { TemplateGroupFilter } from '../TemplateListPage';
 import { DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from '../../extensions/default';
 
 import {