diff --git a/packages/core/src/extensions/extension-discovery/stop-watching-extensions-on-quit.injectable.ts b/packages/core/src/extensions/extension-discovery/stop-watching-extensions-on-quit.injectable.ts index a8e6eafb9e..9f6f7d97c1 100644 --- a/packages/core/src/extensions/extension-discovery/stop-watching-extensions-on-quit.injectable.ts +++ b/packages/core/src/extensions/extension-discovery/stop-watching-extensions-on-quit.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../main/start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../main/start-main-application/runnable-tokens/phases"; import extensionDiscoveryInjectable from "./extension-discovery.injectable"; const stopWatchingExtensionsOnQuitInjectable = getInjectable({ @@ -17,7 +17,7 @@ const stopWatchingExtensionsOnQuitInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopWatchingExtensionsOnQuitInjectable; diff --git a/packages/core/src/features/application-menu/main/stop-application-menu.injectable.ts b/packages/core/src/features/application-menu/main/stop-application-menu.injectable.ts index 816683b2de..197b509c38 100644 --- a/packages/core/src/features/application-menu/main/stop-application-menu.injectable.ts +++ b/packages/core/src/features/application-menu/main/stop-application-menu.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuReactivityInjectable from "./application-menu-reactivity.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/phases"; const stopApplicationMenuInjectable = getInjectable({ id: "stop-application-menu", @@ -19,7 +19,7 @@ const stopApplicationMenuInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopApplicationMenuInjectable; diff --git a/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts b/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts index df1557466e..d3da227b4f 100644 --- a/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts +++ b/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../../../../main/start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../../../../main/start-main-application/runnable-tokens/phases"; const stopCheckingForUpdatesInjectable = getInjectable({ id: "stop-checking-for-updates", @@ -21,7 +21,7 @@ const stopCheckingForUpdatesInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopCheckingForUpdatesInjectable; diff --git a/packages/core/src/features/application-update/main/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts b/packages/core/src/features/application-update/main/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts index 36a6d3174d..ce855cdeaa 100644 --- a/packages/core/src/features/application-update/main/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts +++ b/packages/core/src/features/application-update/main/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import watchIfUpdateShouldHappenOnQuitInjectable from "./watch-if-update-should-happen-on-quit.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/phases"; const stopWatchingIfUpdateShouldHappenOnQuitInjectable = getInjectable({ id: "stop-watching-if-update-should-happen-on-quit", @@ -19,7 +19,7 @@ const stopWatchingIfUpdateShouldHappenOnQuitInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopWatchingIfUpdateShouldHappenOnQuitInjectable; diff --git a/packages/core/src/features/population-of-logs-to-a-file/main/stop-ipc-logging.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/main/stop-ipc-logging.injectable.ts index 89533411ca..bcf96cb60a 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/main/stop-ipc-logging.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/main/stop-ipc-logging.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfFrontEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/phases"; +import { afterQuitOfFrontEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/phases"; import ipcFileLoggerInjectable from "./ipc-file-logger.injectable"; const stopIpcLoggingInjectable = getInjectable({ @@ -21,7 +21,7 @@ const stopIpcLoggingInjectable = getInjectable({ }; }, - injectionToken: beforeQuitOfFrontEndInjectionToken, + injectionToken: afterQuitOfFrontEndInjectionToken, }); export default stopIpcLoggingInjectable; diff --git a/packages/core/src/features/weblinks/main/stop-validating-weblinks.injectable.ts b/packages/core/src/features/weblinks/main/stop-validating-weblinks.injectable.ts index 221a3ee0dd..eac015df73 100644 --- a/packages/core/src/features/weblinks/main/stop-validating-weblinks.injectable.ts +++ b/packages/core/src/features/weblinks/main/stop-validating-weblinks.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/phases"; import weblinkVerificationStartableStoppableInjectable from "./weblink-verification.injectable"; const stopValidatingWeblinksInjectable = getInjectable({ @@ -17,7 +17,7 @@ const stopValidatingWeblinksInjectable = getInjectable({ return undefined; }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopValidatingWeblinksInjectable; diff --git a/packages/core/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts b/packages/core/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts index faf5013a5f..0ab32646ef 100644 --- a/packages/core/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts +++ b/packages/core/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import catalogSyncToRendererInjectable from "./catalog-sync-to-renderer.injectable"; -import { beforeQuitOfFrontEndInjectionToken } from "../start-main-application/runnable-tokens/phases"; +import { afterQuitOfFrontEndInjectionToken } from "../start-main-application/runnable-tokens/phases"; const stopCatalogSyncInjectable = getInjectable({ id: "stop-catalog-sync", @@ -21,7 +21,7 @@ const stopCatalogSyncInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfFrontEndInjectionToken, + injectionToken: afterQuitOfFrontEndInjectionToken, }); export default stopCatalogSyncInjectable; diff --git a/packages/core/src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts b/packages/core/src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts index 19fb7e1143..37c31db7fc 100644 --- a/packages/core/src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; import lensProtocolRouterMainInjectable from "../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable"; const cleanUpDeepLinkingInjectable = getInjectable({ @@ -19,7 +19,7 @@ const cleanUpDeepLinkingInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default cleanUpDeepLinkingInjectable; diff --git a/packages/core/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts b/packages/core/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts index e61af65da4..421a7c8830 100644 --- a/packages/core/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfFrontEndInjectionToken } from "../../../start-main-application/runnable-tokens/phases"; +import { afterQuitOfFrontEndInjectionToken } from "../../../start-main-application/runnable-tokens/phases"; import electronAppInjectable from "../../electron-app.injectable"; import { isEmpty } from "lodash/fp"; import getVisibleWindowsInjectable from "../../../start-main-application/lens-window/get-visible-windows.injectable"; @@ -25,7 +25,7 @@ const hideDockForLastClosedWindowInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfFrontEndInjectionToken, + injectionToken: afterQuitOfFrontEndInjectionToken, }); export default hideDockForLastClosedWindowInjectable; diff --git a/packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts b/packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts index 9843d2c223..a65e36622d 100644 --- a/packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { beforeElectronIsReadyInjectionToken } from "@k8slens/application-for-electron-main"; -import { beforeQuitOfFrontEndInjectionToken, beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; +import { afterQuitOfFrontEndInjectionToken, onQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; import electronAppInjectable from "../electron-app.injectable"; import isIntegrationTestingInjectable from "../../../common/vars/is-integration-testing.injectable"; import autoUpdaterInjectable from "../features/auto-updater.injectable"; @@ -17,8 +17,8 @@ const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({ run: () => { const runManySync = runManySyncFor(di); const runMany = runManyFor(di); - const runRunnablesBeforeQuitOfFrontEnd = runManySync(beforeQuitOfFrontEndInjectionToken); - const runRunnablesBeforeQuitOfBackEnd = runMany(beforeQuitOfBackEndInjectionToken); + const runAfterQuitOfFrontEnd = runManySync(afterQuitOfFrontEndInjectionToken); + const runOnQuitOfBackEnd = runMany(onQuitOfBackEndInjectionToken); const app = di.inject(electronAppInjectable); const isIntegrationTesting = di.inject(isIntegrationTestingInjectable); const autoUpdater = di.inject(autoUpdaterInjectable); @@ -29,7 +29,7 @@ const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({ }); app.on("will-quit", () => { - runRunnablesBeforeQuitOfFrontEnd(); + runAfterQuitOfFrontEnd(); let isAsyncQuitting = false; @@ -42,7 +42,7 @@ const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({ void (async () => { try { - await runRunnablesBeforeQuitOfBackEnd(); + await runOnQuitOfBackEnd(); } catch (error) { console.error("A beforeQuitOfBackEnd failed!!!!", error); exitCode = 1; @@ -53,7 +53,7 @@ const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({ }; app.on("will-quit", (event) => { - runRunnablesBeforeQuitOfFrontEnd(); + runAfterQuitOfFrontEnd(); event.preventDefault(); if (isIntegrationTesting || isAutoUpdating) { diff --git a/packages/core/src/main/lens-proxy/close-on-quit.injectable.ts b/packages/core/src/main/lens-proxy/close-on-quit.injectable.ts index 2ff22d6cf6..defa0d84f7 100644 --- a/packages/core/src/main/lens-proxy/close-on-quit.injectable.ts +++ b/packages/core/src/main/lens-proxy/close-on-quit.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/phases"; import lensProxyInjectable from "./lens-proxy.injectable"; const closeLensProxyOnQuitInjectable = getInjectable({ @@ -15,7 +15,7 @@ const closeLensProxyOnQuitInjectable = getInjectable({ await lensProxy.close(); }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default closeLensProxyOnQuitInjectable; diff --git a/packages/core/src/main/start-main-application/runnable-tokens/phases.ts b/packages/core/src/main/start-main-application/runnable-tokens/phases.ts index b5844436e1..aff3a29906 100644 --- a/packages/core/src/main/start-main-application/runnable-tokens/phases.ts +++ b/packages/core/src/main/start-main-application/runnable-tokens/phases.ts @@ -6,12 +6,12 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type { Runnable, RunnableSync } from "@k8slens/run-many"; -export const beforeQuitOfFrontEndInjectionToken = getInjectionToken({ - id: "before-quit-of-front-end", +export const afterQuitOfFrontEndInjectionToken = getInjectionToken({ + id: "after-quit-of-front-end", }); -export const beforeQuitOfBackEndInjectionToken = getInjectionToken({ - id: "before-quit-of-back-end", +export const onQuitOfBackEndInjectionToken = getInjectionToken({ + id: "on-quit-of-back-end", }); export const afterWindowIsOpenedInjectionToken = getInjectionToken({ diff --git a/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts b/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts index fd428dd1fe..d44d91dc5c 100644 --- a/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../runnable-tokens/phases"; import shellSessionProcessesInjectable from "../../shell-session/processes.injectable"; import prefixedLoggerInjectable from "../../../common/logger/prefixed-logger.injectable"; @@ -31,7 +31,7 @@ const cleanUpShellSessionsInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default cleanUpShellSessionsInjectable; diff --git a/packages/core/src/main/start-main-application/runnables/emit-close-to-event-bus.injectable.ts b/packages/core/src/main/start-main-application/runnables/emit-close-to-event-bus.injectable.ts index cbd7a2d289..3704ab72d5 100644 --- a/packages/core/src/main/start-main-application/runnables/emit-close-to-event-bus.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/emit-close-to-event-bus.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable"; -import { beforeQuitOfFrontEndInjectionToken } from "../runnable-tokens/phases"; +import { afterQuitOfFrontEndInjectionToken } from "../runnable-tokens/phases"; const emitCloseToEventBusInjectable = getInjectable({ id: "emit-close-to-event-bus", @@ -19,7 +19,7 @@ const emitCloseToEventBusInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfFrontEndInjectionToken, + injectionToken: afterQuitOfFrontEndInjectionToken, }); export default emitCloseToEventBusInjectable; diff --git a/packages/core/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts b/packages/core/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts index 078cc7def0..99ce3a8dc5 100644 --- a/packages/core/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { runInAction } from "mobx"; import lensProtocolRouterMainInjectable from "../../../protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable"; -import { beforeQuitOfFrontEndInjectionToken } from "../../runnable-tokens/phases"; +import { afterQuitOfFrontEndInjectionToken } from "../../runnable-tokens/phases"; const flagRendererAsNotLoadedInjectable = getInjectable({ id: "stop-deep-linking", @@ -23,7 +23,7 @@ const flagRendererAsNotLoadedInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfFrontEndInjectionToken, + injectionToken: afterQuitOfFrontEndInjectionToken, }); export default flagRendererAsNotLoadedInjectable; diff --git a/packages/core/src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts b/packages/core/src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts index 118dac2ed4..59a1097d23 100644 --- a/packages/core/src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../runnable-tokens/phases"; import kubeconfigSyncManagerInjectable from "../../../catalog-sources/kubeconfig-sync/manager.injectable"; const stopKubeConfigSyncInjectable = getInjectable({ @@ -19,7 +19,7 @@ const stopKubeConfigSyncInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopKubeConfigSyncInjectable; diff --git a/packages/core/src/main/start-main-application/runnables/stop-cluster-manager.injectable.ts b/packages/core/src/main/start-main-application/runnables/stop-cluster-manager.injectable.ts index f26feb01d7..5d322836f3 100644 --- a/packages/core/src/main/start-main-application/runnables/stop-cluster-manager.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/stop-cluster-manager.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import clusterManagerInjectable from "../../cluster/manager.injectable"; -import { beforeQuitOfFrontEndInjectionToken } from "../runnable-tokens/phases"; +import { afterQuitOfFrontEndInjectionToken } from "../runnable-tokens/phases"; const stopClusterManagerInjectable = getInjectable({ id: "stop-cluster-manager", @@ -19,7 +19,7 @@ const stopClusterManagerInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfFrontEndInjectionToken, + injectionToken: afterQuitOfFrontEndInjectionToken, }); export default stopClusterManagerInjectable; diff --git a/packages/core/src/main/theme/sync-theme-from-os/stop-syncing-theme-from-operating-system.injectable.ts b/packages/core/src/main/theme/sync-theme-from-os/stop-syncing-theme-from-operating-system.injectable.ts index f50a298822..dceb08ccbc 100644 --- a/packages/core/src/main/theme/sync-theme-from-os/stop-syncing-theme-from-operating-system.injectable.ts +++ b/packages/core/src/main/theme/sync-theme-from-os/stop-syncing-theme-from-operating-system.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import syncThemeFromOperatingSystemInjectable from "../../electron-app/features/sync-theme-from-operating-system.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; const stopSyncingThemeFromOperatingSystemInjectable = getInjectable({ id: "stop-syncing-theme-from-operating-system", @@ -19,7 +19,7 @@ const stopSyncingThemeFromOperatingSystemInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopSyncingThemeFromOperatingSystemInjectable; diff --git a/packages/core/src/main/tray/electron-tray/stop-tray.injectable.ts b/packages/core/src/main/tray/electron-tray/stop-tray.injectable.ts index 4bd6bd6c3a..73e376951f 100644 --- a/packages/core/src/main/tray/electron-tray/stop-tray.injectable.ts +++ b/packages/core/src/main/tray/electron-tray/stop-tray.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import electronTrayInjectable from "./electron-tray.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; import stopReactiveTrayMenuItemsInjectable from "../reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable"; const stopTrayInjectable = getInjectable({ @@ -21,7 +21,7 @@ const stopTrayInjectable = getInjectable({ runAfter: stopReactiveTrayMenuItemsInjectable, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopTrayInjectable; diff --git a/packages/core/src/main/tray/menu-icon/stop-reactivity.injectable.ts b/packages/core/src/main/tray/menu-icon/stop-reactivity.injectable.ts index b5908104d2..527457fd85 100644 --- a/packages/core/src/main/tray/menu-icon/stop-reactivity.injectable.ts +++ b/packages/core/src/main/tray/menu-icon/stop-reactivity.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; import reactiveTrayMenuIconInjectable from "./reactive.injectable"; const stopReactiveTrayMenuIconInjectable = getInjectable({ @@ -19,7 +19,7 @@ const stopReactiveTrayMenuIconInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopReactiveTrayMenuIconInjectable; diff --git a/packages/core/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts b/packages/core/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts index d5e5063e92..5ae99cbab1 100644 --- a/packages/core/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts +++ b/packages/core/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import reactiveTrayMenuItemsInjectable from "./reactive-tray-menu-items.injectable"; -import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; +import { onQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/phases"; const stopReactiveTrayMenuItemsInjectable = getInjectable({ id: "stop-reactive-tray-menu-items", @@ -19,7 +19,7 @@ const stopReactiveTrayMenuItemsInjectable = getInjectable({ }, }), - injectionToken: beforeQuitOfBackEndInjectionToken, + injectionToken: onQuitOfBackEndInjectionToken, }); export default stopReactiveTrayMenuItemsInjectable;