1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Make injectables in new "features"-directory auto register to make ADR in #6015 possible (#6034)

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

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

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2022-08-16 15:56:11 +03:00 committed by GitHub
parent 63d5a34379
commit 3e02229920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions

View File

@ -48,10 +48,15 @@ global.ResizeObserver = class {
jest.mock("./renderer/components/monaco-editor/monaco-editor"); jest.mock("./renderer/components/monaco-editor/monaco-editor");
jest.mock("./renderer/components/tooltip/withTooltip"); jest.mock("./renderer/components/tooltip/withTooltip");
const getInjectables = (environment: "renderer" | "main", filePathGlob: string) => const getInjectables = (environment: "renderer" | "main", filePathGlob: string) => [
glob.sync(`./{common,extensions,${environment}}/**/${filePathGlob}`, { ...glob.sync(`./{common,extensions,${environment}}/**/${filePathGlob}`, {
cwd: __dirname, cwd: __dirname,
}).map(x => path.resolve(__dirname, x)); }),
...glob.sync(`./features/**/{${environment},common}/**/${filePathGlob}`, {
cwd: __dirname,
}),
].map(x => path.resolve(__dirname, x));
(global as any).rendererInjectablePaths = getInjectables("renderer", "*.injectable.{ts,tsx}"); (global as any).rendererInjectablePaths = getInjectables("renderer", "*.injectable.{ts,tsx}");
(global as any).rendererGlobalOverridePaths = getInjectables("renderer", "*.global-override-for-injectable.{ts,tsx}"); (global as any).rendererGlobalOverridePaths = getInjectables("renderer", "*.global-override-for-injectable.{ts,tsx}");

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("../features", true, /.*\/(main|common)\/.*\.injectable\.(ts|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("../features", true, /.*\/(renderer|common)\/.*\.injectable\.(ts|tsx)$/),
], ],
}); });