Merge branch 'master' into remove-duplicate-runnable-ids-rebased

# Conflicts: # package-lock.json # packages/core/package.json # packages/core/src/features/application-menu/main/start-application-menu.injectable.ts # packages/core/src/features/application-update/child-features/periodical-checking-of-updates/main/start-checking-for-updates.injectable.ts # packages/core/src/features/application-update/main/emit-current-version-to-analytics.injectable.ts # packages/core/src/features/application-update/main/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts # packages/core/src/features/cluster/state-sync/main/setup-sync.injectable.ts # packages/core/src/features/cluster/store/main/init.injectable.ts # packages/core/src/features/file-system-provisioner/main/init-store.injectable.ts # packages/core/src/features/hotbar/store/main/init.injectable.ts # packages/core/src/features/shell-sync/main/setup-shell.injectable.ts # packages/core/src/features/theme/system-type/main/setup-update-emitter.injectable.ts # packages/core/src/main/cluster/initialize-manager.injectable.ts # packages/core/src/main/electron-app/runnables/enforce-single-application-instance.injectable.ts # packages/core/src/main/electron-app/runnables/setup-application-name.injectable.ts # packages/core/src/main/electron-app/runnables/setup-deep-linking.injectable.ts # packages/core/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts # packages/core/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts # packages/core/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts # packages/core/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts # packages/core/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts # packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts # packages/core/src/main/library.ts # packages/core/src/main/start-main-application/runnable-tokens/phases.ts # packages/core/src/main/start-main-application/runnables/emit-service-start-to-event-bus.injectable.ts # packages/core/src/main/start-main-application/runnables/initialize-extensions.injectable.ts # packages/core/src/main/start-main-application/runnables/kube-config-sync/add-source.injectable.ts # packages/core/src/main/start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable.ts # packages/core/src/main/start-main-application/runnables/sentry/setup.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-hardware-acceleration.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-hostnames.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-immer.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-lens-proxy-certificate.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-mobx.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-proxy-env.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts # packages/core/src/main/start-main-application/runnables/setup-system-ca.injectable.ts # packages/core/src/main/start-main-application/runnables/show-initial-window.injectable.ts # packages/core/src/main/start-main-application/runnables/show-loading.injectable.ts # packages/core/src/main/start-main-application/start-main-application.injectable.ts # packages/core/src/main/stores/init-user-store.injectable.ts # packages/core/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts # packages/core/src/main/tray/electron-tray/start-tray.injectable.ts # packages/core/src/main/tray/menu-icon/start-reactivity.injectable.ts # packages/core/src/main/tray/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts # packages/core/src/main/user-store/sync-open-at-login-with-os.injectable.ts # packages/core/src/main/utils/channel/channel-listeners/start-listening-on-channels.injectable.ts # packages/core/src/main/vars/build-version/init.injectable.ts # packages/core/src/main/vars/default-update-channel/init.injectable.ts # packages/core/src/main/vars/release-channel/init.injectable.ts # packages/core/src/main/vars/semantic-build-version/init.injectable.ts # packages/core/src/renderer/components/test-utils/get-application-builder.tsx # packages/core/src/renderer/getDiForUnitTesting.tsx # packages/open-lens/package.json
2025-05-20 05:10:56 +00:00 · 2023-03-06 12:21:48 +02:00
commit c6861b6f6e
@@ -196,17 +196,20 @@
  },
  "dependencies": {
    "@k8slens/application": "^6.5.0-alpha.0",
+    "@k8slens/feature-core": "^6.5.0-alpha.0",
+    "@k8slens/application-for-electron-main": "^6.5.0-alpha.0",
    "@k8slens/core": "^6.5.0-alpha.0",
    "@k8slens/ensure-binaries": "^6.5.0-alpha.0",
    "@k8slens/generate-tray-icons": "^6.5.0-alpha.0",
    "@k8slens/run-many": "^1.0.0",
    "@k8slens/test-utils": "^1.0.0",
    "@k8slens/utilities": "^1.0.0",
-    "@ogre-tools/fp": "^15.1.1",
-    "@ogre-tools/injectable": "^15.1.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.1",
-    "@ogre-tools/injectable-extension-for-mobx": "^15.1.1",
-    "@ogre-tools/injectable-react": "^15.1.1",
+    "@ogre-tools/fp": "^15.1.2",
+    "@ogre-tools/injectable": "^15.1.2",
+    "@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"
  },
@@ -215,7 +218,7 @@
    "@k8slens/node-fetch": "^6.5.0-alpha.0",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
    "@swc/cli": "^0.1.61",
-    "@swc/core": "^1.3.35",
+    "@swc/core": "^1.3.37",
    "@swc/jest": "^0.2.24",
    "@types/byline": "^4.2.33",
    "@types/chart.js": "^2.9.36",
@@ -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 { applicationFeature, startApplicationInjectionToken } from '@k8slens/application'
+import { 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);
 })
@@ -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,
+});
@@ -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 {
+  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,
@@ -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,
+});
@@ -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 = {