From b6274481550847c8da40e3d5bcbcf28201c4cd05 Mon Sep 17 00:00:00 2001
From: Iku-turso <mikko.aspiala@gmail.com>
Date: Wed, 22 Jun 2022 13:52:23 +0300
Subject: [PATCH] Revert "Permit modular directory structures for behaviours in
 spirit of "Screaming Architecture""

This reverts commit 75e1231b0e61b74d030d12365352226e7f1ce500.

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

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
---
 src/main/getDi.ts                    | 1 -
 src/main/getDiForUnitTesting.ts      | 3 ---
 src/renderer/getDi.tsx               | 1 -
 src/renderer/getDiForUnitTesting.tsx | 3 ---
 4 files changed, 8 deletions(-)

diff --git a/src/main/getDi.ts b/src/main/getDi.ts
index 6b5de4e07b..ac7dffe12b 100644
--- a/src/main/getDi.ts
+++ b/src/main/getDi.ts
@@ -18,7 +18,6 @@ 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)$/),
     ],
   });
 
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index 74a8198ef9..c72cd993b3 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -204,9 +204,6 @@ 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
diff --git a/src/renderer/getDi.tsx b/src/renderer/getDi.tsx
index 7fdc6dae8a..3380d25c06 100644
--- a/src/renderer/getDi.tsx
+++ b/src/renderer/getDi.tsx
@@ -19,7 +19,6 @@ 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)$/),
     ],
   });
 
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 67cc83f53a..2f030c8ab9 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -158,9 +158,6 @@ 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>[]) => {