From 637d626c633aceb3ff69e48c8a84c4edaf4874cc Mon Sep 17 00:00:00 2001 From: Jim Ehrismann Date: Tue, 30 May 2023 09:49:25 -0400 Subject: [PATCH] hard-code the migration version for now Signed-off-by: Jim Ehrismann --- .../storage-migration-version.injectable.ts | 4 ---- .../features/extensions/enabled/common/storage.injectable.ts | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/core/src/common/persistent-storage/storage-migration-version.injectable.ts b/packages/core/src/common/persistent-storage/storage-migration-version.injectable.ts index 7c5a662735..6568e8f983 100644 --- a/packages/core/src/common/persistent-storage/storage-migration-version.injectable.ts +++ b/packages/core/src/common/persistent-storage/storage-migration-version.injectable.ts @@ -16,10 +16,6 @@ const storageMigrationVersionInjectable = getInjectable({ instantiate: (di, token) => { const declarations = di.injectMany(token); - if (declarations.length === 0) { - return undefined; - } - return declarations.reduce((version, decl) => { if (semver.gte(decl.version, version)) { return decl.version; diff --git a/packages/core/src/features/extensions/enabled/common/storage.injectable.ts b/packages/core/src/features/extensions/enabled/common/storage.injectable.ts index 47a9930ccf..d2bd14ee15 100644 --- a/packages/core/src/features/extensions/enabled/common/storage.injectable.ts +++ b/packages/core/src/features/extensions/enabled/common/storage.injectable.ts @@ -7,7 +7,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { action, toJS } from "mobx"; import createPersistentStorageInjectable from "../../../../common/persistent-storage/create.injectable"; import persistentStorageMigrationsInjectable from "../../../../common/persistent-storage/migrations.injectable"; -import storageMigrationVersionInjectable from "../../../../common/persistent-storage/storage-migration-version.injectable"; import { enabledExtensionsMigrationDeclarationInjectionToken } from "./migrations"; import type { LensExtensionState } from "./state.injectable"; import enabledExtensionsStateInjectable from "./state.injectable"; @@ -30,7 +29,7 @@ const enabledExtensionsPersistentStorageInjectable = getInjectable({ toJSON: () => ({ extensions: [...toJS(state)], }), - projectVersion: di.inject(storageMigrationVersionInjectable, enabledExtensionsMigrationDeclarationInjectionToken), + projectVersion: "6.5.0", // temporary fix for #7784, otherwise calculated wrong on the renderer process migrations: di.inject(persistentStorageMigrationsInjectable, enabledExtensionsMigrationDeclarationInjectionToken), }); },