hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Iku-turso 2022-06-23 10:51:19 +03:00
parent b95ab425ba
commit 6b72f7b49d
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/getDi.ts
View File

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

3
src/main/getDiForUnitTesting.ts
View File

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

1
src/renderer/getDi.tsx
View File

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

3
src/renderer/getDiForUnitTesting.tsx
View File

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