From f2cecbbcae8ba56529f971b03d0a003e1771279c Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Thu, 15 Dec 2022 13:11:10 +0200
Subject: [PATCH] register applicationInformationInjectable in main & renderer

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 .../vars/application-information-token.injectable.ts     | 2 +-
 .../extension-discovery/extension-discovery.ts           | 2 +-
 src/main/getDi.ts                                        | 9 ++++++++-
 src/renderer/getDi.tsx                                   | 9 ++++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/common/vars/application-information-token.injectable.ts b/src/common/vars/application-information-token.injectable.ts
index a3c8853949..dcd56a3146 100644
--- a/src/common/vars/application-information-token.injectable.ts
+++ b/src/common/vars/application-information-token.injectable.ts
@@ -7,7 +7,7 @@ import { getInjectionToken } from "@ogre-tools/injectable";
 import type packageJson from "../../../package.json";
 
 export type ApplicationInformation = Pick<typeof packageJson, "version" | "config" | "productName" | "copyright" | "description" | "name"> & {
-  build: { publish?: unknown[] };
+  build: Partial<typeof packageJson["build"]> & { publish?: unknown[] };
 };
 
 const applicationInformationToken = getInjectionToken<ApplicationInformation>({
diff --git a/src/extensions/extension-discovery/extension-discovery.ts b/src/extensions/extension-discovery/extension-discovery.ts
index ec61a9c332..8c96159bd6 100644
--- a/src/extensions/extension-discovery/extension-discovery.ts
+++ b/src/extensions/extension-discovery/extension-discovery.ts
@@ -30,7 +30,7 @@ import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable"
 import type { GetRelativePath } from "../../common/path/get-relative-path.injectable";
 import type { RemovePath } from "../../common/fs/remove-path.injectable";
 import type TypedEventEmitter from "typed-emitter";
-import type { ApplicationInformation } from "../../common/vars/application-information-injectable";
+import type { ApplicationInformation } from "../../common/vars/application-information-token.injectable";
 
 interface Dependencies {
   readonly extensionLoader: ExtensionLoader;
diff --git a/src/main/getDi.ts b/src/main/getDi.ts
index 719e9c8752..044cee73db 100644
--- a/src/main/getDi.ts
+++ b/src/main/getDi.ts
@@ -3,10 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { createContainer } from "@ogre-tools/injectable";
+import { runInAction } from "mobx";
+import applicationInformationInjectable from "../common/vars/application-information-injectable";
 import { registerInjectables } from "./register-injectables";
 
 export const getDi = () => {
   const di = createContainer("main");
 
-  return registerInjectables(di);
+  runInAction(() => {
+    registerInjectables(di);
+    di.register(applicationInformationInjectable);
+  });
+
+  return di;
 };
diff --git a/src/renderer/getDi.tsx b/src/renderer/getDi.tsx
index aafa33bbe0..0a5b74ee08 100644
--- a/src/renderer/getDi.tsx
+++ b/src/renderer/getDi.tsx
@@ -4,10 +4,17 @@
  */
 
 import { createContainer } from "@ogre-tools/injectable";
+import { runInAction } from "mobx";
+import applicationInformationInjectable from "../common/vars/application-information-injectable";
 import { registerInjectables } from "./register-injectables";
 
 export const getDi = () => {
   const di = createContainer("renderer");
 
-  return registerInjectables(di);
+  runInAction(() => {
+    registerInjectables(di);
+    di.register(applicationInformationInjectable);
+  });
+
+  return di;
 };