From 5bfe8917c79531f2f1ab7f969390819f7ad6e48b Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 27 Oct 2021 21:20:57 +0200
Subject: [PATCH] app-defaults: move AppThemeProvider back to core-app-api

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/app-defaults/src/createApp/defaults/components.tsx  | 2 --
 packages/core-app-api/src/app/App.tsx                        | 5 +++--
 .../components => core-app-api/src/app}/AppThemeProvider.tsx | 0
 packages/core-app-api/src/app/types.ts                       | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename packages/{app-defaults/src/createApp/components => core-app-api/src/app}/AppThemeProvider.tsx (100%)

diff --git a/packages/app-defaults/src/createApp/defaults/components.tsx b/packages/app-defaults/src/createApp/defaults/components.tsx
index 659af21cd7..139bea4862 100644
--- a/packages/app-defaults/src/createApp/defaults/components.tsx
+++ b/packages/app-defaults/src/createApp/defaults/components.tsx
@@ -27,7 +27,6 @@ import {
   BootErrorPageProps,
   ErrorBoundaryFallbackProps,
 } from '@backstage/core-plugin-api';
-import { AppThemeProvider } from '../components/AppThemeProvider';
 
 export function OptionallyWrapInRouter({ children }: { children: ReactNode }) {
   if (useInRouterContext()) {
@@ -81,7 +80,6 @@ const DefaultErrorBoundaryFallback = ({
 export const components: AppComponents = {
   Progress,
   Router: BrowserRouter,
-  ThemeProvider: AppThemeProvider,
   NotFoundErrorPage: DefaultNotFoundPage,
   BootErrorPage: DefaultBootErrorPage,
   ErrorBoundaryFallback: DefaultErrorBoundaryFallback,
diff --git a/packages/core-app-api/src/app/App.tsx b/packages/core-app-api/src/app/App.tsx
index 6fadd22808..81da370b6c 100644
--- a/packages/core-app-api/src/app/App.tsx
+++ b/packages/core-app-api/src/app/App.tsx
@@ -77,6 +77,7 @@ import {
   SignInPageProps,
   SignInResult,
 } from './types';
+import { AppThemeProvider } from './AppThemeProvider';
 
 export function generateBoundRoutes(bindRoutes: AppOptions['bindRoutes']) {
   const result = new Map<ExternalRouteRef, RouteRef | SubRouteRef>();
@@ -151,7 +152,7 @@ function useConfigLoader(
     noConfigNode = <BootErrorPage step="load-config" error={config.error} />;
   }
 
-  const { ThemeProvider } = components;
+  const { ThemeProvider = AppThemeProvider } = components;
 
   // Before the config is loaded we can't use a router, so exit early
   if (noConfigNode) {
@@ -307,7 +308,7 @@ export class PrivateAppImpl implements BackstageApp {
         return loadedConfig.node;
       }
 
-      const { ThemeProvider } = this.components;
+      const { ThemeProvider = AppThemeProvider } = this.components;
 
       return (
         <ApiProvider apis={this.getApiHolder()}>
diff --git a/packages/app-defaults/src/createApp/components/AppThemeProvider.tsx b/packages/core-app-api/src/app/AppThemeProvider.tsx
similarity index 100%
rename from packages/app-defaults/src/createApp/components/AppThemeProvider.tsx
rename to packages/core-app-api/src/app/AppThemeProvider.tsx
diff --git a/packages/core-app-api/src/app/types.ts b/packages/core-app-api/src/app/types.ts
index 78ef277c90..41e997e179 100644
--- a/packages/core-app-api/src/app/types.ts
+++ b/packages/core-app-api/src/app/types.ts
@@ -97,7 +97,7 @@ export type AppComponents = {
   Progress: ComponentType<{}>;
   Router: ComponentType<{}>;
   ErrorBoundaryFallback: ComponentType<ErrorBoundaryFallbackProps>;
-  ThemeProvider: ComponentType<{}>;
+  ThemeProvider?: ComponentType<{}>;
 
   /**
    * An optional sign-in page that will be rendered instead of the AppRouter at startup.