From 65175377d0005de68ab0bb79ee6e547446868490 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Fri, 3 Feb 2023 15:15:08 +0200
Subject: [PATCH] fix common extension api bundling (#7099)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 packages/core/src/common/library.ts         | 2 --
 packages/core/src/main/library.ts           | 3 ++-
 packages/core/src/renderer/library.ts       | 3 ++-
 packages/extension-api/src/extension-api.ts | 5 ++---
 packages/open-lens/src/main/index.ts        | 3 +--
 packages/open-lens/src/renderer/index.ts    | 3 +--
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/core/src/common/library.ts b/packages/core/src/common/library.ts
index a9728c8174..f4aee75513 100644
--- a/packages/core/src/common/library.ts
+++ b/packages/core/src/common/library.ts
@@ -7,5 +7,3 @@
 export { applicationInformationToken } from "./vars/application-information-token";
 export type { ApplicationInformation } from "./vars/application-information-token";
 export { bundledExtensionInjectionToken } from "../extensions/extension-discovery/bundled-extension-token";
-
-export * as extensionApi from "../extensions/common-api";
diff --git a/packages/core/src/main/library.ts b/packages/core/src/main/library.ts
index 045c1d4c7d..a8b4507b69 100644
--- a/packages/core/src/main/library.ts
+++ b/packages/core/src/main/library.ts
@@ -10,5 +10,6 @@ export { beforeElectronIsReadyInjectionToken } from "./start-main-application/ru
 export { onLoadOfApplicationInjectionToken } from "./start-main-application/runnable-tokens/on-load-of-application-injection-token";
 export { createApp } from "./create-app";
 export * as Mobx from "mobx";
-export * as extensionApi from "../extensions/main-api";
+export * as mainExtensionApi from "../extensions/main-api";
+export * as commonExtensionApi from "../extensions/common-api";
 export * as Pty from "node-pty";
diff --git a/packages/core/src/renderer/library.ts b/packages/core/src/renderer/library.ts
index b6c8a3ed75..be72fc6c89 100644
--- a/packages/core/src/renderer/library.ts
+++ b/packages/core/src/renderer/library.ts
@@ -12,5 +12,6 @@ export * as Mobx from "mobx";
 export * as MobxReact from "mobx-react";
 export * as ReactRouter from "react-router";
 export * as ReactRouterDom from "react-router-dom";
-export * as extensionApi from "../extensions/renderer-api";
+export * as rendererExtensionApi from "../extensions/renderer-api";
+export * as commonExtensionApi from "../extensions/common-api";
 export { createApp } from "./create-app";
diff --git a/packages/extension-api/src/extension-api.ts b/packages/extension-api/src/extension-api.ts
index cdd09231f1..d411278128 100644
--- a/packages/extension-api/src/extension-api.ts
+++ b/packages/extension-api/src/extension-api.ts
@@ -3,6 +3,5 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-export { extensionApi as Main } from "@k8slens/core/main";
-export { extensionApi as Renderer } from "@k8slens/core/renderer";
-export { extensionApi as Common } from "@k8slens/core/common";
+export { mainExtensionApi as Main, commonExtensionApi as Common } from "@k8slens/core/main";
+export { rendererExtensionApi as Renderer } from "@k8slens/core/renderer";
diff --git a/packages/open-lens/src/main/index.ts b/packages/open-lens/src/main/index.ts
index 103cce48f7..d806e9fe49 100644
--- a/packages/open-lens/src/main/index.ts
+++ b/packages/open-lens/src/main/index.ts
@@ -1,8 +1,7 @@
 import { createContainer } from "@ogre-tools/injectable";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
 import { runInAction } from "mobx";
-import { createApp, extensionApi as Main } from "@k8slens/core/main";
-import { extensionApi as Common } from "@k8slens/core/common";
+import { createApp, mainExtensionApi as Main, commonExtensionApi as Common } from "@k8slens/core/main";
 
 const di = createContainer("main");
 const app = createApp({
diff --git a/packages/open-lens/src/renderer/index.ts b/packages/open-lens/src/renderer/index.ts
index 133e1a8d88..c1ebf0f588 100644
--- a/packages/open-lens/src/renderer/index.ts
+++ b/packages/open-lens/src/renderer/index.ts
@@ -1,8 +1,7 @@
 import "@k8slens/core/styles";
 import { createContainer } from "@ogre-tools/injectable";
 import { runInAction } from "mobx";
-import { createApp, extensionApi as Renderer } from "@k8slens/core/renderer";
-import { extensionApi as Common } from "@k8slens/core/common";
+import { createApp, rendererExtensionApi as Renderer, commonExtensionApi as Common } from "@k8slens/core/renderer";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
 
 const di = createContainer("renderer");