Switch to using start application from Feature

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

packages/open-lens/package.json

@@ -196,6 +196,7 @@
   },
   "dependencies": {
     "@k8slens/application": "^6.4.0-beta.13",
+    "@k8slens/application-for-electron-main": "^6.4.0-beta.13",
     "@k8slens/core": "^6.4.0-beta.13",
     "@k8slens/ensure-binaries": "^6.4.0-beta.13",
     "@k8slens/generate-tray-icons": "^6.4.0-beta.13",
@@ -204,6 +205,7 @@
     "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
     "@ogre-tools/injectable-extension-for-mobx": "^15.1.2",
     "@ogre-tools/injectable-react": "^15.1.2",
+    "@ogre-tools/injectable-utils": "^15.1.2",
     "mobx": "^6.8.0",
     "rimraf": "^4.1.2"
   },

packages/open-lens/src/main/index.ts

@@ -1,15 +1,30 @@
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
 import { runInAction } from "mobx";
-import { createApplication, mainExtensionApi as Main, commonExtensionApi as Common } from "@k8slens/core/main";
+import {
+  mainExtensionApi as Main,
+  commonExtensionApi as Common,
+  registerLensCore,
+} from "@k8slens/core/main";
+import { createContainer } from "@ogre-tools/injectable";
+import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
+import { registerFeature } from "@k8slens/feature-core";
+import { feature as applicationFeature, startApplicationInjectionToken } from '@k8slens/application'
+import { feature as applicationFeatureForElectronMain } from '@k8slens/application-for-electron-main'
 
-const app = createApplication({
-  mode: process.env.NODE_ENV || "development"
-});
+const environment = "main";
+
+const di = createContainer(environment);
+
+registerMobX(di);
 
 runInAction(() => {
+  registerLensCore(di, environment);
+
+  registerFeature(di, applicationFeature, applicationFeatureForElectronMain);
+
   try {
     autoRegister({
-      di: app.di,
+      di,
       targetModule: module,
       getRequireContexts: () => [
         require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
@@ -22,7 +37,9 @@ runInAction(() => {
   }
 });
 
-app.start().catch((error) => {
+const startApplication = di.inject(startApplicationInjectionToken);
+
+startApplication().catch((error) => {
   console.error(error);
   process.exit(1);
 })

packages/open-lens/src/main/node-env.injectable.ts

@@ -0,0 +1,8 @@
+import { getInjectable } from "@ogre-tools/injectable";
+import { nodeEnvInjectionToken } from "@k8slens/core/main";
+
+export const nodeEnvInjectable = getInjectable({
+  id: "node-env",
+  instantiate: () => process.env.NODE_ENV || "development",
+  injectionToken: nodeEnvInjectionToken,
+});

packages/open-lens/src/renderer/index.ts

@@ -1,15 +1,32 @@
 import "@k8slens/core/styles";
 import { runInAction } from "mobx";
-import { createApplication, rendererExtensionApi as Renderer, commonExtensionApi as Common } from "@k8slens/core/renderer";
+import {
+  rendererExtensionApi as Renderer,
+  commonExtensionApi as Common,
+  registerLensCore,
+} from "@k8slens/core/renderer";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
+import { registerFeature } from "@k8slens/feature-core";
+import {
+  feature as applicationFeature,
+  startApplicationInjectionToken
+} from "@k8slens/application";
+import { createContainer } from "@ogre-tools/injectable";
+import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
+import { registerInjectableReact } from "@ogre-tools/injectable-react";
 
-const app = createApplication({
-  mode: process.env.NODE_ENV || "development"
-});
+const environment = "main";
+
+const di = createContainer(environment);
 
 runInAction(() => {
+  registerMobX(di);
+  registerInjectableReact(di);
+  registerLensCore(di, environment);
+  registerFeature(di, applicationFeature);
+
   autoRegister({
-    di: app.di,
+    di,
     targetModule: module,
     getRequireContexts: () => [
       require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
@@ -18,7 +35,9 @@ runInAction(() => {
   });
 });
 
-app.start();
+const startApplication = di.inject(startApplicationInjectionToken);
+
+startApplication();
 
 export {
   React,

packages/open-lens/src/renderer/node-env.injectable.ts

@@ -0,0 +1,8 @@
+import { getInjectable } from "@ogre-tools/injectable";
+import { nodeEnvInjectionToken } from "@k8slens/core/renderer";
+
+export const nodeEnvInjectable = getInjectable({
+  id: "node-env",
+  instantiate: () => process.env.NODE_ENV || "development",
+  injectionToken: nodeEnvInjectionToken,
+});

packages/open-lens/webpack/renderer.ts

@@ -14,7 +14,7 @@
  import CopyPlugin from "copy-webpack-plugin";
  import type { WebpackPluginInstance } from "webpack";
  import { DefinePlugin } from "webpack";
- import { assetsFolderName, isDevelopment, rendererDir, buildDir, htmlTemplate, publicPath, sassCommonVars } from "./vars";
+ import { assetsFolderName, isDevelopment, rendererDir, buildDir, htmlTemplate, publicPath } from "./vars";
  import { platform } from "process";
 
  const renderer: webpack.Configuration = {
@@ -23,7 +23,7 @@
   mode: isDevelopment ? "development" : "production",
   // https://webpack.js.org/configuration/devtool/ (see description of each option)
   devtool: isDevelopment ? "cheap-module-source-map" : "source-map",
-  cache: isDevelopment ? { type: "filesystem" } : false,
+  cache: false, //isDevelopment ? { type: "filesystem" } : false,
   entry: {
     lens: path.resolve(rendererDir, "index.ts"),
   },