diff --git a/src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts b/src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts index ad08af6331..60557de211 100644 --- a/src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts +++ b/src/common/application-update/discovered-update-version/discovered-update-version.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 createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable"; +import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable"; import type { UpdateChannel } from "../update-channels"; -import { syncBoxInjectionToken } from "../../sync-box/sync-box-injection-token"; +import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token"; const discoveredUpdateVersionInjectable = getInjectable({ id: "discovered-update-version", diff --git a/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts b/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts index 7e4104a112..26ecd1d618 100644 --- a/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts +++ b/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable"; -import { syncBoxInjectionToken } from "../../sync-box/sync-box-injection-token"; +import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable"; +import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token"; export interface ProgressOfDownload { percentage: number; diff --git a/src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts b/src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts index e80a77bdd3..e1701d7952 100644 --- a/src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts +++ b/src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable"; -import { syncBoxInjectionToken } from "../../sync-box/sync-box-injection-token"; +import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable"; +import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token"; const updateIsBeingDownloadedInjectable = getInjectable({ id: "update-is-being-downloaded", diff --git a/src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts b/src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts index 54bc58e44a..21f1c14bec 100644 --- a/src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts +++ b/src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable"; -import { syncBoxInjectionToken } from "../../sync-box/sync-box-injection-token"; +import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable"; +import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token"; const updatesAreBeingDiscoveredInjectable = getInjectable({ id: "updates-are-being-discovered", diff --git a/src/common/sync-box/create-sync-box.injectable.ts b/src/common/utils/sync-box/create-sync-box.injectable.ts similarity index 92% rename from src/common/sync-box/create-sync-box.injectable.ts rename to src/common/utils/sync-box/create-sync-box.injectable.ts index 2cf3de6a69..3e5ebbd827 100644 --- a/src/common/sync-box/create-sync-box.injectable.ts +++ b/src/common/utils/sync-box/create-sync-box.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import syncBoxChannelInjectable from "./sync-box-channel.injectable"; -import { messageToChannelInjectionToken } from "../channel/message-to-channel-injection-token"; +import { messageToChannelInjectionToken } from "../../channel/message-to-channel-injection-token"; import syncBoxStateInjectable from "./sync-box-state.injectable"; import type { SyncBox } from "./sync-box-injection-token"; diff --git a/src/common/sync-box/sync-box-channel-listener.injectable.ts b/src/common/utils/sync-box/sync-box-channel-listener.injectable.ts similarity index 82% rename from src/common/sync-box/sync-box-channel-listener.injectable.ts rename to src/common/utils/sync-box/sync-box-channel-listener.injectable.ts index b603c85997..8e7c11fc44 100644 --- a/src/common/sync-box/sync-box-channel-listener.injectable.ts +++ b/src/common/utils/sync-box/sync-box-channel-listener.injectable.ts @@ -6,8 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { SyncBoxChannel } from "./sync-box-channel.injectable"; import syncBoxChannelInjectable from "./sync-box-channel.injectable"; import syncBoxStateInjectable from "./sync-box-state.injectable"; -import type { MessageChannelListener } from "../channel/message-channel-listener-injection-token"; -import { messageChannelListenerInjectionToken } from "../channel/message-channel-listener-injection-token"; +import type { MessageChannelListener } from "../../channel/message-channel-listener-injection-token"; +import { messageChannelListenerInjectionToken } from "../../channel/message-channel-listener-injection-token"; const syncBoxChannelListenerInjectable = getInjectable({ id: "sync-box-channel-listener", diff --git a/src/common/sync-box/sync-box-channel.injectable.ts b/src/common/utils/sync-box/sync-box-channel.injectable.ts similarity index 74% rename from src/common/sync-box/sync-box-channel.injectable.ts rename to src/common/utils/sync-box/sync-box-channel.injectable.ts index 9389a99867..83bf8aaab7 100644 --- a/src/common/sync-box/sync-box-channel.injectable.ts +++ b/src/common/utils/sync-box/sync-box-channel.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { MessageChannel } from "../channel/message-channel-injection-token"; -import { messageChannelInjectionToken } from "../channel/message-channel-injection-token"; +import type { MessageChannel } from "../../channel/message-channel-injection-token"; +import { messageChannelInjectionToken } from "../../channel/message-channel-injection-token"; export type SyncBoxChannel = MessageChannel<{ id: string; value: any }>; diff --git a/src/common/sync-box/sync-box-initial-value-channel.injectable.ts b/src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts similarity index 77% rename from src/common/sync-box/sync-box-initial-value-channel.injectable.ts rename to src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts index 89374c3565..fa9c740d9d 100644 --- a/src/common/sync-box/sync-box-initial-value-channel.injectable.ts +++ b/src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { RequestChannel } from "../channel/request-channel-injection-token"; -import { requestChannelInjectionToken } from "../channel/request-channel-injection-token"; +import type { RequestChannel } from "../../channel/request-channel-injection-token"; +import { requestChannelInjectionToken } from "../../channel/request-channel-injection-token"; export type SyncBoxInitialValueChannel = RequestChannel< void, diff --git a/src/common/sync-box/sync-box-injection-token.ts b/src/common/utils/sync-box/sync-box-injection-token.ts similarity index 100% rename from src/common/sync-box/sync-box-injection-token.ts rename to src/common/utils/sync-box/sync-box-injection-token.ts diff --git a/src/common/sync-box/sync-box-state.injectable.ts b/src/common/utils/sync-box/sync-box-state.injectable.ts similarity index 100% rename from src/common/sync-box/sync-box-state.injectable.ts rename to src/common/utils/sync-box/sync-box-state.injectable.ts diff --git a/src/common/sync-box/sync-box.test.ts b/src/common/utils/sync-box/sync-box.test.ts similarity index 94% rename from src/common/sync-box/sync-box.test.ts rename to src/common/utils/sync-box/sync-box.test.ts index 5141db40a5..2dccbd87a5 100644 --- a/src/common/sync-box/sync-box.test.ts +++ b/src/common/utils/sync-box/sync-box.test.ts @@ -4,10 +4,10 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { observe, runInAction } from "mobx"; -import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; import createSyncBoxInjectable from "./create-sync-box.injectable"; -import { flushPromises } from "../test-utils/flush-promises"; +import { flushPromises } from "../../test-utils/flush-promises"; import type { SyncBox } from "./sync-box-injection-token"; describe("sync-box", () => { diff --git a/src/main/sync-box/sync-box-initial-value-channel-listener.injectable.ts b/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts similarity index 69% rename from src/main/sync-box/sync-box-initial-value-channel-listener.injectable.ts rename to src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts index aa3406f22d..7a1fb04cda 100644 --- a/src/main/sync-box/sync-box-initial-value-channel-listener.injectable.ts +++ b/src/main/utils/sync-box/sync-box-initial-value-channel-listener.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 syncBoxInitialValueChannelInjectable from "../../common/sync-box/sync-box-initial-value-channel.injectable"; -import { syncBoxInjectionToken } from "../../common/sync-box/sync-box-injection-token"; -import { requestChannelListenerInjectionToken } from "../../common/channel/request-channel-listener-injection-token"; +import syncBoxInitialValueChannelInjectable from "../../../common/utils/sync-box/sync-box-initial-value-channel.injectable"; +import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token"; +import { requestChannelListenerInjectionToken } from "../../../common/channel/request-channel-listener-injection-token"; const syncBoxInitialValueChannelListenerInjectable = getInjectable({ id: "sync-box-initial-value-channel-listener", diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index e3f96725a2..7135028391 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -42,7 +42,7 @@ import setupOnApiErrorListenersInjectable from "./api/setup-on-api-errors.inject import { observable } from "mobx"; import defaultShellInjectable from "./components/+preferences/default-shell.injectable"; import appVersionInjectable from "../common/get-configuration-file-model/app-version/app-version.injectable"; -import provideInitialValuesForSyncBoxesInjectable from "./sync-box/provide-initial-values-for-sync-boxes.injectable"; +import provideInitialValuesForSyncBoxesInjectable from "./utils/sync-box/provide-initial-values-for-sync-boxes.injectable"; import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable"; import getRandomIdInjectable from "../common/utils/get-random-id.injectable"; diff --git a/src/renderer/sync-box/provide-initial-values-for-sync-boxes.injectable.ts b/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts similarity index 68% rename from src/renderer/sync-box/provide-initial-values-for-sync-boxes.injectable.ts rename to src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts index 273be9a145..645ed961d5 100644 --- a/src/renderer/sync-box/provide-initial-values-for-sync-boxes.injectable.ts +++ b/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts @@ -3,10 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeFrameStartsInjectionToken } from "../before-frame-starts/before-frame-starts-injection-token"; -import syncBoxInitialValueChannelInjectable from "../../common/sync-box/sync-box-initial-value-channel.injectable"; -import syncBoxStateInjectable from "../../common/sync-box/sync-box-state.injectable"; -import { requestFromChannelInjectionToken } from "../../common/channel/request-from-channel-injection-token"; +import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token"; +import syncBoxInitialValueChannelInjectable from "../../../common/utils/sync-box/sync-box-initial-value-channel.injectable"; +import syncBoxStateInjectable from "../../../common/utils/sync-box/sync-box-state.injectable"; +import { requestFromChannelInjectionToken } from "../../../common/channel/request-from-channel-injection-token"; const provideInitialValuesForSyncBoxesInjectable = getInjectable({ id: "provide-initial-values-for-sync-boxes",