diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/separator-after-extensions/separator-after-extensions.injectable.ts b/src/features/application-menu/main/menu-items/primary-for-mac/separator-after-extensions/separator-after-extensions.injectable.ts deleted file mode 100644 index 17a28c4927..0000000000 --- a/src/features/application-menu/main/menu-items/primary-for-mac/separator-after-extensions/separator-after-extensions.injectable.ts +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; - -import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token"; - -const id = "separator-after-extensions"; - -const separatorAfterExtensionsInjectable = getInjectable({ - id, - - instantiate: () => ({ - id, - parentId: "primary-for-mac", - type: "separator" as const, - orderNumber: 70, - }), - - injectionToken: applicationMenuItemInjectionToken, -}); - -export default separatorAfterExtensionsInjectable; diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/separator-after-check-for-updates/separator-after-check-for-updates.injectable.ts b/src/features/application-menu/main/menu-items/primary-for-mac/separators/separators.injectable.ts similarity index 59% rename from src/features/application-menu/main/menu-items/primary-for-mac/separator-after-check-for-updates/separator-after-check-for-updates.injectable.ts rename to src/features/application-menu/main/menu-items/primary-for-mac/separators/separators.injectable.ts index 3a8319f7a3..f30f6affbe 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/separator-after-check-for-updates/separator-after-check-for-updates.injectable.ts +++ b/src/features/application-menu/main/menu-items/primary-for-mac/separators/separators.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token"; -const separatorAfterCheckForUpdatesInjectable = getInjectable({ +export const separatorAfterCheckForUpdatesInjectable = getInjectable({ id: "separator-after-check-for-updates", instantiate: () => ({ @@ -19,4 +19,15 @@ const separatorAfterCheckForUpdatesInjectable = getInjectable({ injectionToken: applicationMenuItemInjectionToken, }); -export default separatorAfterCheckForUpdatesInjectable; +export const separatorAfterExtensionsInjectable = getInjectable({ + id: "separator-after-extensions", + + instantiate: () => ({ + id: "separator-after-extensions", + parentId: "primary-for-mac", + type: "separator" as const, + orderNumber: 70, + }), + + injectionToken: applicationMenuItemInjectionToken, +}); diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index 035f81adcd..e112ec9c21 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -5,7 +5,8 @@ import { kebabCase, noop, chunk } from "lodash/fp"; import type { DiContainer, Injectable } from "@ogre-tools/injectable"; -import { createContainer } from "@ogre-tools/injectable"; +// @ts-ignore +import { createContainer, injectableSymbol } from "@ogre-tools/injectable"; import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import writeJsonFileInjectable from "../common/fs/write-json-file.injectable"; import readJsonFileInjectable from "../common/fs/read-json-file.injectable"; @@ -95,8 +96,12 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) di.preventSideEffects(); - const injectables: Injectable[] = (global as any).mainInjectablePaths.map( - (filePath: string) => require(filePath).default, + const injectables: Injectable[] = ( + global as any + ).mainInjectablePaths.flatMap((filePath: string) => + Object.values(require(filePath)).filter( + (maybeInjectable: any) => maybeInjectable.aliasType === injectableSymbol, + ), ); runInAction(() => {