From 42ae46c28147b28e05465ed2806043f6e5dc8457 Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Mon, 26 Sep 2022 15:08:46 +0300 Subject: [PATCH] Replace local usages of "Runnable" with ones from shared NPM-module "injectable-utils" Signed-off-by: Iku-turso --- .../setup-runnables-after-window-is-opened.injectable.ts | 2 +- ...etup-runnables-before-closing-of-application.injectable.ts | 2 +- .../after-application-is-loaded-injection-token.ts | 2 +- .../after-root-frame-is-ready-injection-token.ts | 2 +- .../runnable-tokens/after-window-is-opened-injection-token.ts | 2 +- .../before-application-is-loading-injection-token.ts | 2 +- .../before-electron-is-ready-injection-token.ts | 2 +- .../before-quit-of-back-end-injection-token.ts | 2 +- .../before-quit-of-front-end-injection-token.ts | 2 +- .../runnable-tokens/on-load-of-application-injection-token.ts | 2 +- .../root-frame-rendered-channel-listener.injectable.ts | 2 +- .../start-main-application.injectable.ts | 4 +--- .../before-frame-starts-injection-token.ts | 2 +- src/renderer/start-frame/start-frame.injectable.ts | 2 +- 14 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts b/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts index 8e724fdf50..1b9b5bf7b2 100644 --- a/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts +++ b/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { beforeElectronIsReadyInjectionToken } from "../../start-main-application/runnable-tokens/before-electron-is-ready-injection-token"; import electronAppInjectable from "../electron-app.injectable"; -import { runManyFor } from "../../../common/runnable/run-many-for"; +import { runManyFor } from "@ogre-tools/injectable-utils"; import { afterWindowIsOpenedInjectionToken } from "../../start-main-application/runnable-tokens/after-window-is-opened-injection-token"; const setupRunnablesAfterWindowIsOpenedInjectable = getInjectable({ diff --git a/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts b/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts index bb2c8f8970..cb6e383ae9 100644 --- a/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts +++ b/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts @@ -9,7 +9,7 @@ import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/ import electronAppInjectable from "../electron-app.injectable"; import isIntegrationTestingInjectable from "../../../common/vars/is-integration-testing.injectable"; import autoUpdaterInjectable from "../features/auto-updater.injectable"; -import { runManySyncFor } from "../../../common/runnable/run-many-sync-for"; +import { runManySyncFor } from "@ogre-tools/injectable-utils"; const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({ id: "setup-closing-of-application", diff --git a/src/main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token.ts b/src/main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token.ts index f89f445ecf..923f6bc781 100644 --- a/src/main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "../../../common/runnable/run-many-for"; +import type { Runnable } from "@ogre-tools/injectable-utils"; export const afterApplicationIsLoadedInjectionToken = getInjectionToken({ id: "after-application-is-loaded", diff --git a/src/main/start-main-application/runnable-tokens/after-root-frame-is-ready-injection-token.ts b/src/main/start-main-application/runnable-tokens/after-root-frame-is-ready-injection-token.ts index f066c124ba..e39eabf794 100644 --- a/src/main/start-main-application/runnable-tokens/after-root-frame-is-ready-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/after-root-frame-is-ready-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "../../../common/runnable/run-many-for"; +import type { Runnable } from "@ogre-tools/injectable-utils"; export const afterRootFrameIsReadyInjectionToken = getInjectionToken({ id: "after-root-frame-is-ready", diff --git a/src/main/start-main-application/runnable-tokens/after-window-is-opened-injection-token.ts b/src/main/start-main-application/runnable-tokens/after-window-is-opened-injection-token.ts index d5f33bceff..e175ff8d44 100644 --- a/src/main/start-main-application/runnable-tokens/after-window-is-opened-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/after-window-is-opened-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "../../../common/runnable/run-many-for"; +import type { Runnable } from "@ogre-tools/injectable-utils"; export const afterWindowIsOpenedInjectionToken = getInjectionToken({ id: "after-window-is-opened", diff --git a/src/main/start-main-application/runnable-tokens/before-application-is-loading-injection-token.ts b/src/main/start-main-application/runnable-tokens/before-application-is-loading-injection-token.ts index 7cda9e6aee..10035fa22b 100644 --- a/src/main/start-main-application/runnable-tokens/before-application-is-loading-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/before-application-is-loading-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "../../../common/runnable/run-many-for"; +import type { Runnable } from "@ogre-tools/injectable-utils"; export const beforeApplicationIsLoadingInjectionToken = getInjectionToken({ id: "before-application-is-loading", diff --git a/src/main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token.ts b/src/main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token.ts index 08173ebef2..9a180a7499 100644 --- a/src/main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { RunnableSync } from "../../../common/runnable/run-many-sync-for"; +import type { RunnableSync } from "@ogre-tools/injectable-utils"; export const beforeElectronIsReadyInjectionToken = getInjectionToken({ diff --git a/src/main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token.ts b/src/main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token.ts index bdb1d1e1be..750e6d0b3d 100644 --- a/src/main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { RunnableSync } from "../../../common/runnable/run-many-sync-for"; +import type { RunnableSync } from "@ogre-tools/injectable-utils"; export const beforeQuitOfBackEndInjectionToken = getInjectionToken({ diff --git a/src/main/start-main-application/runnable-tokens/before-quit-of-front-end-injection-token.ts b/src/main/start-main-application/runnable-tokens/before-quit-of-front-end-injection-token.ts index 2327688cb3..86fe8a9c26 100644 --- a/src/main/start-main-application/runnable-tokens/before-quit-of-front-end-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/before-quit-of-front-end-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { RunnableSync } from "../../../common/runnable/run-many-sync-for"; +import type { RunnableSync } from "@ogre-tools/injectable-utils"; export const beforeQuitOfFrontEndInjectionToken = getInjectionToken({ diff --git a/src/main/start-main-application/runnable-tokens/on-load-of-application-injection-token.ts b/src/main/start-main-application/runnable-tokens/on-load-of-application-injection-token.ts index 35b7a6c0ff..6f80ba5b33 100644 --- a/src/main/start-main-application/runnable-tokens/on-load-of-application-injection-token.ts +++ b/src/main/start-main-application/runnable-tokens/on-load-of-application-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "../../../common/runnable/run-many-for"; +import type { Runnable } from "@ogre-tools/injectable-utils"; export const onLoadOfApplicationInjectionToken = getInjectionToken({ id: "on-load-of-application", diff --git a/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts b/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts index 83ebf7bf91..9055dbb06e 100644 --- a/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts +++ b/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import rootFrameRenderedChannelInjectable from "../../../../common/root-frame-rendered-channel/root-frame-rendered-channel.injectable"; -import { runManyFor } from "../../../../common/runnable/run-many-for"; +import { runManyFor } from "@ogre-tools/injectable-utils"; import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/after-root-frame-is-ready-injection-token"; import { messageChannelListenerInjectionToken } from "../../../../common/utils/channel/message-channel-listener-injection-token"; diff --git a/src/main/start-main-application/start-main-application.injectable.ts b/src/main/start-main-application/start-main-application.injectable.ts index fcd1851575..67f2bd54c6 100644 --- a/src/main/start-main-application/start-main-application.injectable.ts +++ b/src/main/start-main-application/start-main-application.injectable.ts @@ -4,8 +4,6 @@ */ import { getInjectable } from "@ogre-tools/injectable"; -import { runManyFor } from "../../common/runnable/run-many-for"; -import { runManySyncFor } from "../../common/runnable/run-many-sync-for"; import { beforeElectronIsReadyInjectionToken } from "./runnable-tokens/before-electron-is-ready-injection-token"; import { beforeApplicationIsLoadingInjectionToken } from "./runnable-tokens/before-application-is-loading-injection-token"; import { onLoadOfApplicationInjectionToken } from "./runnable-tokens/on-load-of-application-injection-token"; @@ -17,7 +15,7 @@ import { find, map, startsWith, toLower } from "lodash/fp"; import commandLineArgumentsInjectable from "../utils/command-line-arguments.injectable"; import waitForElectronToBeReadyInjectable from "../electron-app/features/wait-for-electron-to-be-ready.injectable"; import createFirstApplicationWindowInjectable from "./lens-window/application-window/create-first-application-window.injectable"; - +import { runManyFor, runManySyncFor } from "@ogre-tools/injectable-utils"; const startMainApplicationInjectable = getInjectable({ id: "start-main-application", diff --git a/src/renderer/before-frame-starts/before-frame-starts-injection-token.ts b/src/renderer/before-frame-starts/before-frame-starts-injection-token.ts index e494508329..edf7da30a5 100644 --- a/src/renderer/before-frame-starts/before-frame-starts-injection-token.ts +++ b/src/renderer/before-frame-starts/before-frame-starts-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "../../common/runnable/run-many-for"; +import type { Runnable } from "@ogre-tools/injectable-utils"; export const beforeFrameStartsInjectionToken = getInjectionToken({ id: "before-frame-starts", diff --git a/src/renderer/start-frame/start-frame.injectable.ts b/src/renderer/start-frame/start-frame.injectable.ts index fc38cc7d5e..73b1f5fe91 100644 --- a/src/renderer/start-frame/start-frame.injectable.ts +++ b/src/renderer/start-frame/start-frame.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 { runManyFor } from "../../common/runnable/run-many-for"; +import { runManyFor } from "@ogre-tools/injectable-utils"; import { beforeFrameStartsInjectionToken } from "../before-frame-starts/before-frame-starts-injection-token"; const startFrameInjectable = getInjectable({