From e3ed8abea6ec3b8af690b460b8c36baedc2fd4d9 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Wed, 24 Aug 2022 16:29:14 +0300
Subject: [PATCH] Test waters with features as NPM packages

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 .../extension/extension.injectable.ts         |  6 ++++++
 src/main/index.ts                             |  7 +++++++
 .../tray-menu-item-injection-token.ts         | 21 ++-----------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/extensions/extension-loader/extension/extension.injectable.ts b/src/extensions/extension-loader/extension/extension.injectable.ts
index ba1bb6aea8..5dc13e9b89 100644
--- a/src/extensions/extension-loader/extension/extension.injectable.ts
+++ b/src/extensions/extension-loader/extension/extension.injectable.ts
@@ -23,6 +23,12 @@ const extensionInjectable = getInjectable({
 
         return {
           register: () => {
+            const anyInstance = instance as any;
+
+            if (anyInstance.__v2Register) {
+              anyInstance.__v2Register(childDi);
+            }
+
             const injectables = extensionRegistrators.flatMap((getInjectablesOfExtension) =>
               getInjectablesOfExtension(instance),
             );
diff --git a/src/main/index.ts b/src/main/index.ts
index 8a95ad02db..17f21b0171 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -11,9 +11,16 @@ import * as LensExtensionsMainApi from "../extensions/main-api";
 import { getDi } from "./getDi";
 import startMainApplicationInjectable from "./start-main-application/start-main-application.injectable";
 import shouldStartHiddenInjectable from "./electron-app/features/should-start-hidden.injectable";
+import registerTray from "@lensapp/tray";
+import registerMikko from "@lensapp/mikko";
+import registerJanne from "@lensapp/janne";
 
 const di = getDi();
 
+registerTray();
+registerMikko(di);
+registerJanne(di);
+
 const shouldStartHidden = di.inject(shouldStartHiddenInjectable);
 
 const startApplication = di.inject(startMainApplicationInjectable);
diff --git a/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts b/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts
index 3e0a0b243a..1147af0b88 100644
--- a/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts
+++ b/src/main/tray/tray-menu-item/tray-menu-item-injection-token.ts
@@ -2,22 +2,5 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { IComputedValue } from "mobx";
-
-export interface TrayMenuItem {
-  id: string;
-  parentId: string | null;
-  orderNumber: number;
-  enabled: IComputedValue<boolean>;
-  visible: IComputedValue<boolean>;
-
-  label?: IComputedValue<string>;
-  click?: () => Promise<void> | void;
-  tooltip?: string;
-  separator?: boolean;
-}
-
-export const trayMenuItemInjectionToken = getInjectionToken<TrayMenuItem>({
-  id: "tray-menu-item",
-});
+export { trayMenuItemInjectionToken } from "@lensapp/tray";
+export type { TrayMenuItem } from "@lensapp/tray";