diff --git a/src/common/ipc/ipc.ts b/src/common/ipc/ipc.ts index e7826acff7..f11227d17e 100644 --- a/src/common/ipc/ipc.ts +++ b/src/common/ipc/ipc.ts @@ -15,7 +15,6 @@ import type { Disposer } from "../utils"; import ipcMainInjectable from "../../main/utils/channel/ipc-main/ipc-main.injectable"; import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable"; -import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; import loggerInjectable from "../logger.injectable"; export const broadcastMainChannel = "ipc:broadcast-main"; @@ -43,7 +42,8 @@ export async function broadcastMessage(channel: string, ...args: any[]): Promise return; } - const logger = asLegacyGlobalForExtensionApi(loggerInjectable); + const di = getLegacyGlobalDiForExtensionApi(); + const logger = di.inject(loggerInjectable); ipcMain.listeners(channel).forEach((func) => func({ processId: undefined, frameId: undefined, sender: undefined, senderFrame: undefined, diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts index ea0bc26d4e..2f4101c402 100644 --- a/src/common/k8s-api/kube-api.ts +++ b/src/common/k8s-api/kube-api.ts @@ -20,7 +20,7 @@ import type { Patch } from "rfc6902"; import assert from "assert"; import type { PartialDeep } from "type-fest"; import type { Logger } from "../logger"; -import { Environments, getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; +import { Environments, getEnvironmentSpecificLegacyGlobalDiForExtensionApi, getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import autoRegistrationEmitterInjectable from "./api-manager/auto-registration-emitter.injectable"; import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; import { apiKubeInjectionToken } from "./api-kube"; @@ -286,7 +286,7 @@ export class KubeApi< constructor(opts: KubeApiOptions) { const { objectConstructor, - request = asLegacyGlobalForExtensionApi(apiKubeInjectionToken), + request = getLegacyGlobalDiForExtensionApi().inject(apiKubeInjectionToken), kind = objectConstructor.kind, isNamespaced, apiBase: fullApiPathname = objectConstructor.apiBase,