From eb489db0c1169dcc356d39683eb096fcbe888535 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 10 Nov 2021 17:31:15 +0100
Subject: [PATCH] app-defaults: lazier api initialization to work around import
 cycle

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/app-defaults/src/defaults/apis.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/app-defaults/src/defaults/apis.ts b/packages/app-defaults/src/defaults/apis.ts
index 85c004eece..d3c76d52bd 100644
--- a/packages/app-defaults/src/defaults/apis.ts
+++ b/packages/app-defaults/src/defaults/apis.ts
@@ -68,8 +68,16 @@ export const apis = [
         `${configApi.getString('backend.baseUrl')}/api/{{ pluginId }}`,
       ),
   }),
-  createApiFactory(alertApiRef, new AlertApiForwarder()),
-  createApiFactory(analyticsApiRef, new NoOpAnalyticsApi()),
+  createApiFactory({
+    api: alertApiRef,
+    deps: {},
+    factory: () => new AlertApiForwarder(),
+  }),
+  createApiFactory({
+    api: analyticsApiRef,
+    deps: {},
+    factory: () => new NoOpAnalyticsApi(),
+  }),
   createApiFactory({
     api: errorApiRef,
     deps: { alertApi: alertApiRef },
@@ -84,7 +92,11 @@ export const apis = [
     deps: { errorApi: errorApiRef },
     factory: ({ errorApi }) => WebStorage.create({ errorApi }),
   }),
-  createApiFactory(oauthRequestApiRef, new OAuthRequestManager()),
+  createApiFactory({
+    api: oauthRequestApiRef,
+    deps: {},
+    factory: () => new OAuthRequestManager(),
+  }),
   createApiFactory({
     api: googleAuthApiRef,
     deps: {