From f3d45ea78bee0955f4b19b138d01cedad3fa350e Mon Sep 17 00:00:00 2001
From: Iku-turso <mikko.aspiala@gmail.com>
Date: Thu, 9 Dec 2021 14:32:58 +0200
Subject: [PATCH] Fix hangup on application start by auto-registering more
 injectables

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/renderer/components/getDi.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/getDi.tsx b/src/renderer/components/getDi.tsx
index 859563534e..d341d9c3ae 100644
--- a/src/renderer/components/getDi.tsx
+++ b/src/renderer/components/getDi.tsx
@@ -20,15 +20,21 @@
  */
 
 import { createContainer } from "@ogre-tools/injectable";
-import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
 import { setDiKludge } from "../../common/di-kludge/di-kludge";
 
 export const getDi = () => {
-  const di: ConfigurableDependencyInjectionContainer = createContainer(
-    () => require.context("./", true, /\.injectable\.(ts|tsx)$/),
+  const di = createContainer(
+    getRequireContextForRendererCode,
+    getRequireContextForCommonExtensionCode,
   );
 
   setDiKludge(di);
 
   return di;
 };
+
+const getRequireContextForRendererCode = () =>
+  require.context("./", true, /\.injectable\.(ts|tsx)$/);
+
+const getRequireContextForCommonExtensionCode = () =>
+  require.context("../../extensions", true, /\.injectable\.(ts|tsx)$/);