diff --git a/web/packages/gallery/services/files-db.ts b/web/packages/gallery/services/files-db.ts index 86f89e10d3..b04c2cd9a9 100644 --- a/web/packages/gallery/services/files-db.ts +++ b/web/packages/gallery/services/files-db.ts @@ -45,6 +45,7 @@ * albums app stores data in keys prefixed with "public-". */ +import { haveWindow } from "ente-base/env"; import log from "ente-base/log"; import { CollectionPrivateMagicMetadataData, @@ -66,10 +67,26 @@ import { FilePublicMagicMetadataData, } from "ente-media/file-metadata"; import type { MagicMetadata } from "ente-media/magic-metadata"; -import localForage from "ente-shared/storage/localForage"; import { nullishToEmpty, nullToUndefined } from "ente-utils/transform"; +import localForage from "localforage"; import { z } from "zod/v4"; +if (haveWindow()) { + localForage.config({ + name: "ente-files", + version: 1.0, + storeName: "files", + }); +} + +/** + * Reexport localForage for use by (and only by): + * - photos-fdb.ts + * - public-albums-fdb.ts + * - migration.ts + */ +export { localForage }; + /** * Return `true` if we can access IndexedDB. * diff --git a/web/packages/new/albums/services/public-albums-fdb.ts b/web/packages/new/albums/services/public-albums-fdb.ts index 5a20984e1b..5e940ced6a 100644 --- a/web/packages/new/albums/services/public-albums-fdb.ts +++ b/web/packages/new/albums/services/public-albums-fdb.ts @@ -5,12 +5,12 @@ import { LocalCollections, LocalEnteFiles, + localForage, LocalTimestamp, transformFilesIfNeeded, } from "ente-gallery/services/files-db"; import { type Collection } from "ente-media/collection"; import type { EnteFile } from "ente-media/file"; -import localForage from "ente-shared/storage/localForage"; import { nullToUndefined } from "ente-utils/transform"; import { z } from "zod/v4"; diff --git a/web/packages/new/photos/services/migration.ts b/web/packages/new/photos/services/migration.ts index ccce1376f5..0526e8200c 100644 --- a/web/packages/new/photos/services/migration.ts +++ b/web/packages/new/photos/services/migration.ts @@ -1,7 +1,7 @@ import { isDesktop } from "ente-base/app"; import { getKVN, removeKV, setKV } from "ente-base/kv"; import log from "ente-base/log"; -import localForage from "ente-shared/storage/localForage"; +import { localForage } from "ente-gallery/services/files-db"; import { deleteDB } from "idb"; import { retryIndexingFailuresIfNeeded } from "./ml"; diff --git a/web/packages/new/photos/services/photos-fdb.ts b/web/packages/new/photos/services/photos-fdb.ts index 4c5329d94e..357a30d909 100644 --- a/web/packages/new/photos/services/photos-fdb.ts +++ b/web/packages/new/photos/services/photos-fdb.ts @@ -5,12 +5,12 @@ import { LocalCollections, LocalEnteFile, + localForage, LocalTimestamp, transformFilesIfNeeded, } from "ente-gallery/services/files-db"; import { type Collection } from "ente-media/collection"; import { type EnteFile } from "ente-media/file"; -import localForage from "ente-shared/storage/localForage"; import { z } from "zod/v4"; import type { TrashItem } from "./trash"; diff --git a/web/packages/shared/storage/localForage.ts b/web/packages/shared/storage/localForage.ts deleted file mode 100644 index 9230ab3fbe..0000000000 --- a/web/packages/shared/storage/localForage.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { haveWindow } from "ente-base/env"; - -import localForage from "localforage"; - -if (haveWindow()) { - localForage.config({ - name: "ente-files", - version: 1.0, - storeName: "files", - }); -} - -export default localForage;