diff --git a/src/migrations/utils.ts b/src/common/utils/generate-new-id-for.ts similarity index 100% rename from src/migrations/utils.ts rename to src/common/utils/generate-new-id-for.ts diff --git a/src/main/cluster/store-migrations/5.0.0-beta.13.injectable.ts b/src/main/cluster/store-migrations/5.0.0-beta.13.injectable.ts index 98cc147243..d8f0368df4 100644 --- a/src/main/cluster/store-migrations/5.0.0-beta.13.injectable.ts +++ b/src/main/cluster/store-migrations/5.0.0-beta.13.injectable.ts @@ -8,7 +8,6 @@ import { moveSync, removeSync } from "fs-extra"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import { isDefined } from "../../../common/utils"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; -import { generateNewIdFor } from "../../../migrations/utils"; function mergePrometheusPreferences(left: ClusterPrometheusPreferences, right: ClusterPrometheusPreferences): ClusterPrometheusPreferences { if (left.prometheus && left.prometheusProvider) { @@ -78,6 +77,7 @@ function mergeClusterModel(prev: ClusterModel, right: Omit): import { getInjectable } from "@ogre-tools/injectable"; import loggerInjectable from "../../../common/logger.injectable"; import { clusterStoreMigrationInjectionToken } from "../../../common/cluster-store/migration-token"; +import { generateNewIdFor } from "../../../common/utils/generate-new-id-for"; const v500Beta13ClusterStoreMigrationInjectable = getInjectable({ id: "v5.0.0-beta.13-cluster-store-migration", diff --git a/src/main/hotbar-store/migrations/5.0.0-beta.10.injectable.ts b/src/main/hotbar-store/migrations/5.0.0-beta.10.injectable.ts index e4696d81ee..ddbda706be 100644 --- a/src/main/hotbar-store/migrations/5.0.0-beta.10.injectable.ts +++ b/src/main/hotbar-store/migrations/5.0.0-beta.10.injectable.ts @@ -7,7 +7,6 @@ import * as uuid from "uuid"; import type { ClusterStoreModel } from "../../../common/cluster-store/cluster-store"; import type { Hotbar, HotbarItem } from "../../../common/hotbars/types"; import { defaultHotbarCells, getEmptyHotbar } from "../../../common/hotbars/types"; -import { generateNewIdFor } from "../../../migrations/utils"; import { getLegacyGlobalDiForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import catalogCatalogEntityInjectable from "../../../common/catalog-entities/general-catalog-entities/implementations/catalog-catalog-entity.injectable"; @@ -17,6 +16,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { hotbarStoreMigrationInjectionToken } from "../../../common/hotbars/migrations-token"; import readJsonSyncInjectable from "../../../common/fs/read-json-sync.injectable"; import loggerInjectable from "../../../common/logger.injectable"; +import { generateNewIdFor } from "../../../common/utils/generate-new-id-for"; interface Pre500WorkspaceStoreModel { workspaces: {