Revert to again permit modular directory structures for behaviours in spirit of "Screaming Architecture"

See https://blog.cleancoder.com/uncle-bob/2011/09/30/Screaming-Architecture.html

This reverts commit b627448155.

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>

src/main/getDi.ts

@@ -18,6 +18,7 @@ export const getDi = () => {
       require.context("./", true, /\.injectable\.(ts|tsx)$/),
       require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
       require.context("../common", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../behaviours", true, /.*\/(main|common)\/.*\.injectable\.(ts|tsx)$/),
     ],
   });
 

src/main/getDiForUnitTesting.ts

@@ -204,6 +204,9 @@ const getInjectableFilePaths = memoize(() => [
   ...glob.sync("./**/*.injectable.{ts,tsx}", { cwd: __dirname }),
   ...glob.sync("../extensions/**/*.injectable.{ts,tsx}", { cwd: __dirname }),
   ...glob.sync("../common/**/*.injectable.{ts,tsx}", { cwd: __dirname }),
+  ...glob.sync("../behaviours/**/{main,common}/*.injectable.{ts,tsx}", {
+    cwd: __dirname,
+  }),
 ]);
 
 // TODO: Reorganize code in Runnables to get rid of requirement for override

src/renderer/getDi.tsx

@@ -19,6 +19,7 @@ export const getDi = () => {
       require.context("./", true, /\.injectable\.(ts|tsx)$/),
       require.context("../common", true, /\.injectable\.(ts|tsx)$/),
       require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../behaviours", true, /.*\/(renderer|common)\/.*\.injectable\.(ts|tsx)$/),
     ],
   });
 

src/renderer/getDiForUnitTesting.tsx

@@ -158,6 +158,9 @@ const getInjectableFilePaths = memoize(() => [
   ...glob.sync("./**/*.injectable.{ts,tsx}", { cwd: __dirname }),
   ...glob.sync("../common/**/*.injectable.{ts,tsx}", { cwd: __dirname }),
   ...glob.sync("../extensions/**/*.injectable.{ts,tsx}", { cwd: __dirname }),
+  ...glob.sync("../behaviours/**/{renderer,common}/*.injectable.{ts,tsx}", {
+    cwd: __dirname,
+  }),
 ]);
 
 const overrideFunctionalInjectables = (di: DiContainer, injectables: Injectable<any, any, any>[]) => {