chore: fixing api-reports and merge conflicts

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

plugins/scaffolder/alpha-api-report.md

@@ -31,6 +31,7 @@ export type NextRouterProps = {
     }>;
   };
   groups?: TemplateGroupFilter[];
+  templateFilter?: TemplateFilter;
   FormProps?: FormProps_2;
   contextMenu?: {
     editor?: boolean;
@@ -44,6 +45,9 @@ export const NextScaffolderPage: (
   props: PropsWithChildren<NextRouterProps>,
 ) => JSX.Element;
 
+// @alpha (undocumented)
+export type TemplateFilter = (entity: Entity) => boolean;
+
 // @alpha (undocumented)
 export type TemplateGroupFilter = {
   title?: React_2.ReactNode;

plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx

@@ -243,7 +243,7 @@ describe('TemplateGroups', () => {
       </TestApiProvider>,
       {
         mountedRoutes: {
-          '/next': nextRouteRef,
+          '/create': rootRouteRef,
         },
       },
     );