From a85f2fc20653f31acd0cbdf30eb415f432078851 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Wed, 27 Apr 2022 11:00:26 +0300
Subject: [PATCH] Adapt injectable to auto register using a plugin instead of
 internal feature that no longer exists

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/main/getDi.ts      | 28 ++++++++++++++--------------
 src/renderer/getDi.tsx | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/main/getDi.ts b/src/main/getDi.ts
index d6f76122b7..f912b7ffcc 100644
--- a/src/main/getDi.ts
+++ b/src/main/getDi.ts
@@ -4,25 +4,25 @@
  */
 
 import { createContainer } from "@ogre-tools/injectable";
+import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
+import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 
 export const getDi = () => {
-  const di = createContainer(
-    getRequireContextForMainCode,
-    getRequireContextForCommonExtensionCode,
-    getRequireContextForCommonCode,
-  );
+  const di = createContainer();
+
+  registerMobX(di);
+
+  autoRegister({
+    di,
+    requireContexts: [
+      require.context("./", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../common", true, /\.injectable\.(ts|tsx)$/),
+    ],
+  });
 
   setLegacyGlobalDiForExtensionApi(di, Environments.main);
 
   return di;
 };
-
-const getRequireContextForMainCode = () =>
-  require.context("./", true, /\.injectable\.(ts|tsx)$/);
-
-const getRequireContextForCommonExtensionCode = () =>
-  require.context("../extensions", true, /\.injectable\.(ts|tsx)$/);
-
-const getRequireContextForCommonCode = () =>
-  require.context("../common", true, /\.injectable\.(ts|tsx)$/);
diff --git a/src/renderer/getDi.tsx b/src/renderer/getDi.tsx
index 8735eabc6d..094af6292f 100644
--- a/src/renderer/getDi.tsx
+++ b/src/renderer/getDi.tsx
@@ -4,25 +4,25 @@
  */
 
 import { createContainer } from "@ogre-tools/injectable";
+import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
+import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 
 export const getDi = () => {
-  const di = createContainer(
-    getRequireContextForRendererCode,
-    getRequireContextForCommonExtensionCode,
-    getRequireContextForCommonCode,
-  );
+  const di = createContainer();
+
+  registerMobX(di);
+
+  autoRegister({
+    di,
+    requireContexts: [
+      require.context("./", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../common", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
+    ],
+  });
 
   setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
 
   return di;
 };
-
-const getRequireContextForRendererCode = () =>
-  require.context("./", true, /\.injectable\.(ts|tsx)$/);
-
-const getRequireContextForCommonCode = () =>
-  require.context("../common", true, /\.injectable\.(ts|tsx)$/);
-
-const getRequireContextForCommonExtensionCode = () =>
-  require.context("../extensions", true, /\.injectable\.(ts|tsx)$/);