From 6e266402f47e355408a0c214d60dfe59eb0bcd6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 8 Jun 2021 21:14:34 +0200
Subject: [PATCH] update api-reports and tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 packages/core-app-api/src/app/App.test.tsx                 | 2 +-
 packages/core-app-api/src/plugins/collectors.test.tsx      | 5 +++--
 packages/core-app-api/src/routing/RoutingProvider.test.tsx | 2 +-
 packages/core-app-api/src/routing/collectors.test.tsx      | 3 ++-
 packages/core-plugin-api/api-report.md                     | 6 +++---
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/core-app-api/src/app/App.test.tsx b/packages/core-app-api/src/app/App.test.tsx
index c282ba6b7f..cde3af9456 100644
--- a/packages/core-app-api/src/app/App.test.tsx
+++ b/packages/core-app-api/src/app/App.test.tsx
@@ -20,7 +20,6 @@ import { lightTheme } from '@backstage/theme';
 import { render, screen } from '@testing-library/react';
 import React, { PropsWithChildren } from 'react';
 import { BrowserRouter, Routes } from 'react-router-dom';
-import { createRoutableExtension } from '../extensions';
 import { defaultAppIcons } from './icons';
 import {
   configApiRef,
@@ -31,6 +30,7 @@ import {
   createExternalRouteRef,
   createRouteRef,
   createSubRouteRef,
+  createRoutableExtension,
 } from '@backstage/core-plugin-api';
 import { generateBoundRoutes, PrivateAppImpl } from './App';
 
diff --git a/packages/core-app-api/src/plugins/collectors.test.tsx b/packages/core-app-api/src/plugins/collectors.test.tsx
index 220d89690f..46c19ec7bf 100644
--- a/packages/core-app-api/src/plugins/collectors.test.tsx
+++ b/packages/core-app-api/src/plugins/collectors.test.tsx
@@ -15,11 +15,12 @@
  */
 
 import React, { PropsWithChildren } from 'react';
-import { createPlugin, createRouteRef } from '@backstage/core-plugin-api';
 import {
+  createPlugin,
+  createRouteRef,
   createRoutableExtension,
   createComponentExtension,
-} from '../extensions';
+} from '@backstage/core-plugin-api';
 import { MemoryRouter, Routes, Route } from 'react-router-dom';
 import {
   traverseElementTree,
diff --git a/packages/core-app-api/src/routing/RoutingProvider.test.tsx b/packages/core-app-api/src/routing/RoutingProvider.test.tsx
index 39528fe3a9..8f8ffc820b 100644
--- a/packages/core-app-api/src/routing/RoutingProvider.test.tsx
+++ b/packages/core-app-api/src/routing/RoutingProvider.test.tsx
@@ -25,7 +25,6 @@ import { render } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 import { VersionedValue } from '../lib/versionedValues';
 import { getGlobalSingleton } from '../lib/globalObject';
-import { createRoutableExtension } from '../extensions';
 import {
   childDiscoverer,
   routeElementDiscoverer,
@@ -34,6 +33,7 @@ import {
 import {
   createPlugin,
   useRouteRef,
+  createRoutableExtension,
   createRouteRef,
   createExternalRouteRef,
   RouteRef,
diff --git a/packages/core-app-api/src/routing/collectors.test.tsx b/packages/core-app-api/src/routing/collectors.test.tsx
index 40b57bf25a..50c8ec1772 100644
--- a/packages/core-app-api/src/routing/collectors.test.tsx
+++ b/packages/core-app-api/src/routing/collectors.test.tsx
@@ -27,11 +27,12 @@ import {
   routeElementDiscoverer,
 } from '../extensions/traversal';
 import {
+  createRoutableExtension,
   createRouteRef,
   createPlugin,
   RouteRef,
 } from '@backstage/core-plugin-api';
-import { attachComponentData, createRoutableExtension } from '../extensions';
+import { attachComponentData } from '../extensions';
 import { MemoryRouter, Routes, Route } from 'react-router-dom';
 
 const MockComponent = ({ children }: PropsWithChildren<{ path?: string }>) => (
diff --git a/packages/core-plugin-api/api-report.md b/packages/core-plugin-api/api-report.md
index dcf53d8aed..686d096b7f 100644
--- a/packages/core-plugin-api/api-report.md
+++ b/packages/core-plugin-api/api-report.md
@@ -172,7 +172,7 @@ export function createApiFactory<Api, Impl extends Api>(api: ApiRef<Api>, instan
 export function createApiRef<T>(config: ApiRefConfig): ApiRef<T>;
 
 // @public (undocumented)
-export function createComponentExtension<T extends (props: any) => JSX.Element>(options: {
+export function createComponentExtension<T extends (props: any) => JSX.Element | null>(options: {
     component: ComponentLoader<T>;
 }): Extension<T>;
 
@@ -189,13 +189,13 @@ export function createExternalRouteRef<Params extends {
 export function createPlugin<Routes extends AnyRoutes = {}, ExternalRoutes extends AnyExternalRoutes = {}>(config: PluginConfig<Routes, ExternalRoutes>): BackstagePlugin<Routes, ExternalRoutes>;
 
 // @public (undocumented)
-export function createReactExtension<T extends (props: any) => JSX.Element>(options: {
+export function createReactExtension<T extends (props: any) => JSX.Element | null>(options: {
     component: ComponentLoader<T>;
     data?: Record<string, unknown>;
 }): Extension<T>;
 
 // @public (undocumented)
-export function createRoutableExtension<T extends (props: any) => JSX.Element>(options: {
+export function createRoutableExtension<T extends (props: any) => JSX.Element | null>(options: {
     component: () => Promise<T>;
     mountPoint: RouteRef;
 }): Extension<T>;