Introduce a way to start replacing usages of Singleton base-class with no changes required on use places

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

src/main/getDi.ts

@@ -20,13 +20,19 @@
  */
 
 import { createContainer } from "@ogre-tools/injectable";
+import { setDiKludge } from "../common/di-kludge/di-kludge";
 
-export const getDi = () =>
-  createContainer(
+export const getDi = () => {
+  const di = createContainer(
     getRequireContextForMainCode,
     getRequireContextForCommonExtensionCode,
   );
 
+  setDiKludge(di);
+
+  return di;
+};
+
 const getRequireContextForMainCode = () =>
   require.context("./", true, /\.injectable\.(ts|tsx)$/);
 

src/main/getDiForUnitTesting.ts

@@ -26,10 +26,13 @@ import {
   createContainer,
   ConfigurableDependencyInjectionContainer,
 } from "@ogre-tools/injectable";
+import { setDiKludge } from "../common/di-kludge/di-kludge";
 
 export const getDiForUnitTesting = () => {
   const di: ConfigurableDependencyInjectionContainer = createContainer();
 
+  setDiKludge(di);
+
   getInjectableFilePaths()
     .map(key => {
       // eslint-disable-next-line @typescript-eslint/no-var-requires