From 76e67188743a4b661da2e8ae83e62010e6a58b97 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 28 Apr 2022 10:33:49 +0300 Subject: [PATCH] Tweak timing of runnables Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- src/main/getDiForUnitTesting.ts | 5 +++-- .../implementations/setup-system-ca.injectable.ts | 4 ++-- .../setup-hardware-acceleration.injectable.ts | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) rename src/main/start-main-application/{before-application-is-ready => after-application-is-ready}/implementations/setup-system-ca.injectable.ts (75%) rename src/main/start-main-application/{after-application-is-ready => before-application-is-ready}/implementations/setup-hardware-acceleration.injectable.ts (85%) diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index 7e1a0fa94d..2d40ef3dbb 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -5,7 +5,8 @@ import glob from "glob"; import { kebabCase, memoize, noop } from "lodash/fp"; -import { createContainer, DiContainer } from "@ogre-tools/injectable"; +import type { DiContainer } from "@ogre-tools/injectable"; +import { createContainer } from "@ogre-tools/injectable"; import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import appNameInjectable from "./app-paths/app-name/app-name.injectable"; import registerChannelInjectable from "./app-paths/register-channel/register-channel.injectable"; @@ -55,7 +56,7 @@ import trayInjectable from "./tray/tray.injectable"; import applicationMenuInjectable from "./menu/application-menu.injectable"; import windowManagerInjectable from "./window-manager.injectable"; import isDevelopmentInjectable from "../common/vars/is-development.injectable"; -import setupSystemCaInjectable from "./start-main-application/before-application-is-ready/implementations/setup-system-ca.injectable"; +import setupSystemCaInjectable from "./start-main-application/after-application-is-ready/implementations/setup-system-ca.injectable"; import setupDeepLinkingInjectable from "./electron-app/after-application-is-ready/setup-deep-linking.injectable"; import exitAppInjectable from "./electron-app/features/exit-app.injectable"; import getCommandLineSwitchInjectable from "./electron-app/features/get-command-line-switch.injectable"; diff --git a/src/main/start-main-application/before-application-is-ready/implementations/setup-system-ca.injectable.ts b/src/main/start-main-application/after-application-is-ready/implementations/setup-system-ca.injectable.ts similarity index 75% rename from src/main/start-main-application/before-application-is-ready/implementations/setup-system-ca.injectable.ts rename to src/main/start-main-application/after-application-is-ready/implementations/setup-system-ca.injectable.ts index b92f4b5b3e..18aa11cf2c 100644 --- a/src/main/start-main-application/before-application-is-ready/implementations/setup-system-ca.injectable.ts +++ b/src/main/start-main-application/after-application-is-ready/implementations/setup-system-ca.injectable.ts @@ -4,7 +4,7 @@ */ import { injectSystemCAs } from "../../../../common/system-ca"; import { getInjectable } from "@ogre-tools/injectable"; -import { beforeApplicationIsReadyInjectionToken } from "../before-application-is-ready-injection-token"; +import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; const setupSystemCaInjectable = getInjectable({ id: "setup-system-ca", @@ -17,7 +17,7 @@ const setupSystemCaInjectable = getInjectable({ causesSideEffects: true, - injectionToken: beforeApplicationIsReadyInjectionToken, + injectionToken: afterApplicationIsReadyInjectionToken, }); export default setupSystemCaInjectable; diff --git a/src/main/start-main-application/after-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts b/src/main/start-main-application/before-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts similarity index 85% rename from src/main/start-main-application/after-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts rename to src/main/start-main-application/before-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts index f256a7f6c5..e5230f5d50 100644 --- a/src/main/start-main-application/after-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts +++ b/src/main/start-main-application/before-application-is-ready/implementations/setup-hardware-acceleration.injectable.ts @@ -3,9 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { afterApplicationIsReadyInjectionToken } from "../after-application-is-ready-injection-token"; import environmentVariablesInjectable from "../../../../common/utils/environment-variables.injectable"; import disableHardwareAccelerationInjectable from "../../../electron-app/features/disable-hardware-acceleration.injectable"; +import { beforeApplicationIsReadyInjectionToken } from "../before-application-is-ready-injection-token"; const setupHardwareAccelerationInjectable = getInjectable({ id: "setup-hardware-acceleration", @@ -23,7 +23,7 @@ const setupHardwareAccelerationInjectable = getInjectable({ }; }, - injectionToken: afterApplicationIsReadyInjectionToken, + injectionToken: beforeApplicationIsReadyInjectionToken, }); export default setupHardwareAccelerationInjectable;