From 9cb8ff5f6a38cda8bb203e172c294c22f1d1d938 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Tue, 13 Dec 2022 14:59:57 +0200
Subject: [PATCH] similar interface for both main & renderer

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 package.json              |  2 +-
 src/library.ts            | 33 ---------------------------------
 src/main/library.ts       | 33 +++++++++++++++++++++++++++++++++
 src/renderer/library.ts   | 13 ++++++++++++-
 webpack/library-bundle.ts |  2 +-
 5 files changed, 47 insertions(+), 36 deletions(-)
 delete mode 100644 src/library.ts
 create mode 100644 src/main/library.ts

diff --git a/package.json b/package.json
index ec9cbc57bf..5f606f5998 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "typesVersions": {
     "*": {
       "main": [
-        "./src/library.ts"
+        "./src/main/library.ts"
       ],
       "renderer": [
         "./src/renderer/library.ts"
diff --git a/src/library.ts b/src/library.ts
deleted file mode 100644
index 78c6137dc9..0000000000
--- a/src/library.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { DiContainer } from "@ogre-tools/injectable";
-import { registerInjectables } from "./main/register-injectables";
-import { afterApplicationIsLoadedInjectionToken } from "./main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
-import { beforeApplicationIsLoadingInjectionToken } from "./main/start-main-application/runnable-tokens/before-application-is-loading-injection-token";
-import { beforeElectronIsReadyInjectionToken } from "./main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
-import { onLoadOfApplicationInjectionToken } from "./main/start-main-application/runnable-tokens/on-load-of-application-injection-token";
-import startMainApplicationInjectable from "./main/start-main-application/start-main-application.injectable";
-import * as extensionApi from "./main/extension-api";
-
-interface AppConfig {
-  di: DiContainer;
-}
-
-function startApp(conf: AppConfig) {
-  const { di } = conf;
-
-  return di.inject(startMainApplicationInjectable);
-}
-
-export { 
-  registerInjectables,
-  startApp,
-  extensionApi,
-  afterApplicationIsLoadedInjectionToken,
-  beforeApplicationIsLoadingInjectionToken,
-  beforeElectronIsReadyInjectionToken,
-  onLoadOfApplicationInjectionToken,
-};
diff --git a/src/main/library.ts b/src/main/library.ts
new file mode 100644
index 0000000000..9dad026642
--- /dev/null
+++ b/src/main/library.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DiContainer } from "@ogre-tools/injectable";
+import { registerInjectables } from "./register-injectables";
+import { afterApplicationIsLoadedInjectionToken } from "./start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
+import { beforeApplicationIsLoadingInjectionToken } from "./start-main-application/runnable-tokens/before-application-is-loading-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "./start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
+import { onLoadOfApplicationInjectionToken } from "./start-main-application/runnable-tokens/on-load-of-application-injection-token";
+import startMainApplicationInjectable from "./start-main-application/start-main-application.injectable";
+import * as extensionApi from "./extension-api";
+
+interface AppConfig {
+  di: DiContainer;
+}
+
+function startApp(conf: AppConfig) {
+  const { di } = conf;
+
+  return di.inject(startMainApplicationInjectable);
+}
+
+export { 
+  registerInjectables,
+  startApp,
+  extensionApi,
+  afterApplicationIsLoadedInjectionToken,
+  beforeApplicationIsLoadingInjectionToken,
+  beforeElectronIsReadyInjectionToken,
+  onLoadOfApplicationInjectionToken,
+};
diff --git a/src/renderer/library.ts b/src/renderer/library.ts
index c461054912..f693655ffb 100644
--- a/src/renderer/library.ts
+++ b/src/renderer/library.ts
@@ -7,9 +7,20 @@ import "./components/app.scss";
 import { bootstrap } from "./bootstrap";
 import * as extensionApi from "./extension-api";
 import { registerInjectables } from "./register-injectables";
+import type { DiContainer } from "@ogre-tools/injectable";
+
+interface AppConfig {
+  di: DiContainer;
+}
+
+function startApp(conf: AppConfig) {
+  const { di } = conf;
+  
+  bootstrap(di);
+}
 
 export {
-  bootstrap,
+  startApp,
   extensionApi,
   registerInjectables,
 };
diff --git a/webpack/library-bundle.ts b/webpack/library-bundle.ts
index e4a55da115..2cd7430edc 100644
--- a/webpack/library-bundle.ts
+++ b/webpack/library-bundle.ts
@@ -14,7 +14,7 @@ const config = [
   {
     ...main,
     entry: {
-      main: path.resolve(__dirname, "..", "src", "library.ts"),
+      main: path.resolve(__dirname, "..", "src", "main", "library.ts"),
     },
     output: {
       libraryTarget: "commonjs",