A local-first personal finance app
[AI] Add electron conditions to loot-core platform/server exports (#7383)
Matiss Janis Aboltins2295e6d4643f
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.jsonindex dc92789cf3..7fa5d87b0f 100644--- a/packages/api/tsconfig.json+++ b/packages/api/tsconfig.json@@ -7,6 +7,7 @@"target": "ES2021","module": "es2022","moduleResolution": "bundler",+ "customConditions": ["api"],"noEmit": false,"declaration": true,"declarationMap": true,diff --git a/packages/api/vite.config.ts b/packages/api/vite.config.tsindex aaa6c27536..761af1812b 100644--- a/packages/api/vite.config.ts+++ b/packages/api/vite.config.ts@@ -55,7 +55,11 @@ function copyMigrationsAndDefaultDb() {}export default defineConfig({- ssr: { noExternal: true, external: ['better-sqlite3'] },+ ssr: {+ noExternal: true,+ external: ['better-sqlite3'],+ resolve: { conditions: ['api'] },+ },build: {ssr: true,target: 'node20',@@ -80,6 +84,7 @@ export default defineConfig({visualizer({ template: 'raw-data', filename: 'app/stats.json' }),],resolve: {+ conditions: ['api'],extensions: ['.api.ts', '.js', '.ts', '.tsx', '.json'],},test: {diff --git a/packages/loot-core/package.json b/packages/loot-core/package.jsonindex 6e15b9e080..47624d40f8 100644--- a/packages/loot-core/package.json+++ b/packages/loot-core/package.json@@ -11,6 +11,49 @@}},"imports": {+ "#platform/server/asyncStorage": {+ "electron": "./src/platform/server/asyncStorage/index.electron.ts",+ "api": "./src/platform/server/asyncStorage/index.api.ts",+ "default": "./src/platform/server/asyncStorage/index.ts"+ },+ "#platform/server/connection": {+ "electron": "./src/platform/server/connection/index.electron.ts",+ "api": "./src/platform/server/connection/index.api.ts",+ "default": "./src/platform/server/connection/index.ts"+ },+ "#platform/server/fetch": {+ "electron": "./src/platform/server/fetch/index.electron.ts",+ "api": "./src/platform/server/fetch/index.api.ts",+ "default": "./src/platform/server/fetch/index.ts"+ },+ "#platform/server/fs": {+ "electron": "./src/platform/server/fs/index.electron.ts",+ "api": "./src/platform/server/fs/index.api.ts",+ "default": "./src/platform/server/fs/index.ts"+ },+ "#platform/server/fs/path-join": {+ "electron": "./src/platform/server/fs/path-join.electron.ts",+ "api": "./src/platform/server/fs/path-join.api.ts",+ "default": "./src/platform/server/fs/path-join.ts"+ },+ "#platform/server/sqlite": {+ "electron": "./src/platform/server/sqlite/index.electron.ts",+ "api": "./src/platform/server/sqlite/index.api.ts",+ "default": "./src/platform/server/sqlite/index.ts"+ },+ "#platform/server/log": "./src/platform/server/log/index.ts",+ "#platform/server/indexeddb": "./src/platform/server/indexeddb/index.ts",+ "#platform/exceptions": "./src/platform/exceptions/index.ts",+ "#server/encryption/encryption-internals": {+ "electron": "./src/server/encryption/encryption-internals.electron.ts",+ "api": "./src/server/encryption/encryption-internals.api.ts",+ "default": "./src/server/encryption/encryption-internals.ts"+ },+ "#shared/platform": {+ "electron": "./src/shared/platform.electron.ts",+ "api": "./src/shared/platform.api.ts",+ "default": "./src/shared/platform.ts"+ },"#*": ["./src/*.ts","./src/*.tsx",@@ -32,10 +75,6 @@"./client/store": "./src/client/store/index.ts","./client/store/mock": "./src/client/store/mock.ts","./client/users/*": "./src/client/users/*.ts",- "./client/platform": {- "node": "./src/client/platform.electron.ts",- "default": "./src/client/platform.web.ts"- },"./client/queries": "./src/client/queries.ts","./client/query-helpers": "./src/client/query-helpers.ts","./client/query-hooks": "./src/client/query-hooks.ts",@@ -51,14 +90,39 @@},"./platform/client/undo": "./src/platform/client/undo/index.ts","./platform/exceptions": "./src/platform/exceptions/index.ts",- "./platform/server/asyncStorage": "./src/platform/server/asyncStorage/index.ts",- "./platform/server/connection": "./src/platform/server/connection/index.ts",- "./platform/server/fetch": "./src/platform/server/fetch/index.ts",- "./platform/server/fs": "./src/platform/server/fs/index.ts",+ "./platform/server/asyncStorage": {+ "electron": "./src/platform/server/asyncStorage/index.electron.ts",+ "api": "./src/platform/server/asyncStorage/index.api.ts",+ "default": "./src/platform/server/asyncStorage/index.ts"+ },+ "./platform/server/connection": {+ "electron": "./src/platform/server/connection/index.electron.ts",+ "api": "./src/platform/server/connection/index.api.ts",+ "default": "./src/platform/server/connection/index.ts"+ },+ "./platform/server/fetch": {+ "electron": "./src/platform/server/fetch/index.electron.ts",+ "api": "./src/platform/server/fetch/index.api.ts",+ "default": "./src/platform/server/fetch/index.ts"+ },+ "./platform/server/fs": {+ "electron": "./src/platform/server/fs/index.electron.ts",+ "api": "./src/platform/server/fs/index.api.ts",+ "default": "./src/platform/server/fs/index.ts"+ },"./platform/server/log": "./src/platform/server/log/index.ts",- "./platform/server/sqlite": "./src/platform/server/sqlite/index.ts",+ "./platform/server/sqlite": {+ "electron": "./src/platform/server/sqlite/index.electron.ts",+ "api": "./src/platform/server/sqlite/index.api.ts",+ "default": "./src/platform/server/sqlite/index.ts"+ },"./server/budget/types/*": "./src/server/budget/types/*.d.ts","./server/*": "./src/server/*.ts",+ "./shared/platform": {+ "electron": "./src/shared/platform.electron.ts",+ "api": "./src/shared/platform.api.ts",+ "default": "./src/shared/platform.ts"+ },"./shared/*": "./src/shared/*.ts","./types/models": "./src/types/models/index.ts","./types/*": "./src/types/*.ts",diff --git a/packages/loot-core/src/mocks/random.ts b/packages/loot-core/src/mocks/random.tsindex 8c29fc7161..50a8855b2f 100644--- a/packages/loot-core/src/mocks/random.ts+++ b/packages/loot-core/src/mocks/random.ts@@ -1,4 +1,4 @@-import * as Platform from '../shared/platform';+import * as Platform from '#shared/platform';// Fake "random" function used to have stable data structures for// e2e and visual regression testsdiff --git a/packages/loot-core/src/mocks/setup.ts b/packages/loot-core/src/mocks/setup.tsindex de1aedcdd5..4baea864bd 100644--- a/packages/loot-core/src/mocks/setup.ts+++ b/packages/loot-core/src/mocks/setup.ts@@ -1,8 +1,8 @@// @ts-strict-ignoreimport * as nativeFs from 'fs';+import * as sqlite from '#platform/server/sqlite';import * as fetchClient from '../platform/client/connection';-import * as sqlite from '../platform/server/sqlite';import * as db from '../server/db';import type * as MigrationsType from '../server/migrate/migrations';import {@@ -18,8 +18,8 @@ import { resetTracer, tracer } from '../shared/test-helpers';vi.mock('../platform/client/connection');vi.mock('../platform/exceptions');-vi.mock('../platform/server/asyncStorage');-vi.mock('../platform/server/connection');+vi.mock('#platform/server/asyncStorage');+vi.mock('#platform/server/connection');vi.mock('../server/post');// By default, syncing is disableddiff --git a/packages/loot-core/src/platform/exceptions/index.ts b/packages/loot-core/src/platform/exceptions/index.tsindex 280c98fd8c..e59720de24 100644--- a/packages/loot-core/src/platform/exceptions/index.ts+++ b/packages/loot-core/src/platform/exceptions/index.ts@@ -1,4 +1,4 @@-import { logger } from '../server/log';+import { logger } from '#platform/server/log';export const captureException = function (exc: Error) {logger.error('[Exception]', exc);diff --git a/packages/loot-core/src/platform/server/asyncStorage/index.electron.ts b/packages/loot-core/src/platform/server/asyncStorage/index.electron.tsindex 576c66d9ef..abca071ad7 100644--- a/packages/loot-core/src/platform/server/asyncStorage/index.electron.ts+++ b/packages/loot-core/src/platform/server/asyncStorage/index.electron.ts@@ -2,8 +2,8 @@import * as fs from 'fs';import { join } from 'path';-import type { GlobalPrefsJson } from '../../../types/prefs';-import * as lootFs from '../fs';+import * as lootFs from '#platform/server/fs';+import type { GlobalPrefsJson } from '#types/prefs';import type * as T from './index-types';diff --git a/packages/loot-core/src/platform/server/connection/index.electron.ts b/packages/loot-core/src/platform/server/connection/index.electron.tsindex 8d9b4f9c62..2eeef3252f 100644--- a/packages/loot-core/src/platform/server/connection/index.electron.ts+++ b/packages/loot-core/src/platform/server/connection/index.electron.ts@@ -1,8 +1,8 @@// @ts-strict-ignore-import { APIError } from '../../../server/errors';-import { isMutating, runHandler } from '../../../server/mutators';-import { captureException } from '../../exceptions';-import { logger } from '../log';+import { captureException } from '#platform/exceptions';+import { logger } from '#platform/server/log';+import { APIError } from '#server/errors';+import { isMutating, runHandler } from '#server/mutators';import type * as T from './index-types';diff --git a/packages/loot-core/src/platform/server/fetch/index.ts b/packages/loot-core/src/platform/server/fetch/index.tsindex f357473b69..e855ef7eb2 100644--- a/packages/loot-core/src/platform/server/fetch/index.ts+++ b/packages/loot-core/src/platform/server/fetch/index.ts@@ -1,4 +1,4 @@-import * as connection from '../connection';+import * as connection from '#platform/server/connection';export const fetch = async (input: RequestInfo | URL,diff --git a/packages/loot-core/src/platform/server/fs/index.test.ts b/packages/loot-core/src/platform/server/fs/index.test.tsindex d901e2c401..32111b89ea 100644--- a/packages/loot-core/src/platform/server/fs/index.test.ts+++ b/packages/loot-core/src/platform/server/fs/index.test.ts@@ -1,9 +1,9 @@import 'fake-indexeddb/auto';import { IDBFactory } from 'fake-indexeddb';+import * as idb from '#platform/server/indexeddb';+import * as sqlite from '#platform/server/sqlite';import { patchFetchForSqlJS } from '../../../mocks/util';-import * as idb from '../indexeddb';-import * as sqlite from '../sqlite';import { exists, init, join, pathToId, readFile, writeFile } from './index';diff --git a/packages/loot-core/src/platform/server/fs/index.ts b/packages/loot-core/src/platform/server/fs/index.tsindex 79cd74ec77..dcddfbfd93 100644--- a/packages/loot-core/src/platform/server/fs/index.ts+++ b/packages/loot-core/src/platform/server/fs/index.ts@@ -2,13 +2,12 @@import { SQLiteFS } from 'absurd-sql';import IndexedDBBackend from 'absurd-sql/dist/indexeddb-backend';-import * as connection from '../connection';-import * as idb from '../indexeddb';-import { logger } from '../log';-import { _getModule } from '../sqlite';-import type { SqlJsModule } from '../sqlite';--import { join } from './path-join';+import * as connection from '#platform/server/connection';+import { join } from '#platform/server/fs/path-join';+import * as idb from '#platform/server/indexeddb';+import { logger } from '#platform/server/log';+import { _getModule } from '#platform/server/sqlite';+import type { SqlJsModule } from '#platform/server/sqlite';let FS: SqlJsModule['FS'] = null;let BFS = null;diff --git a/packages/loot-core/src/platform/server/fs/shared.ts b/packages/loot-core/src/platform/server/fs/shared.tsindex 4ed9363348..01e15e26e3 100644--- a/packages/loot-core/src/platform/server/fs/shared.ts+++ b/packages/loot-core/src/platform/server/fs/shared.ts@@ -1,5 +1,5 @@// @ts-strict-ignore-import { join } from './path-join';+import { join } from '#platform/server/fs/path-join';let documentDir;export const _setDocumentDir = dir => (documentDir = dir);diff --git a/packages/loot-core/src/platform/server/sqlite/index.electron.ts b/packages/loot-core/src/platform/server/sqlite/index.electron.tsindex fe13c7c371..a9664318c0 100644--- a/packages/loot-core/src/platform/server/sqlite/index.electron.ts+++ b/packages/loot-core/src/platform/server/sqlite/index.electron.ts@@ -2,8 +2,8 @@import SQL from 'better-sqlite3';import { v4 as uuidv4 } from 'uuid';-import { readFile, removeFile } from '../fs';-import { logger } from '../log';+import { readFile, removeFile } from '#platform/server/fs';+import { logger } from '#platform/server/log';import { normalise } from './normalise';import { unicodeLike } from './unicodeLike';diff --git a/packages/loot-core/src/server/accounts/app.ts b/packages/loot-core/src/server/accounts/app.tsindex 3e2e831004..53a04f1613 100644--- a/packages/loot-core/src/server/accounts/app.ts+++ b/packages/loot-core/src/server/accounts/app.ts@@ -1,11 +1,11 @@import { t } from 'i18next';import { v4 as uuidv4 } from 'uuid';+import * as asyncStorage from '#platform/server/asyncStorage';+import * as connection from '#platform/server/connection';+import { logger } from '#platform/server/log';import type { ImportTransactionsOpts } from '#types/api-handlers';import { captureException } from '../../platform/exceptions';-import * as asyncStorage from '../../platform/server/asyncStorage';-import * as connection from '../../platform/server/connection';-import { logger } from '../../platform/server/log';import { isNonProductionEnvironment } from '../../shared/environment';import { dayFromDate } from '../../shared/months';import * as monthUtils from '../../shared/months';diff --git a/packages/loot-core/src/server/accounts/sync.test.ts b/packages/loot-core/src/server/accounts/sync.test.tsindex 4787f50e6f..bab4949456 100644--- a/packages/loot-core/src/server/accounts/sync.test.ts+++ b/packages/loot-core/src/server/accounts/sync.test.ts@@ -1,5 +1,5 @@// @ts-strict-ignore-import * as asyncStorage from '../../platform/server/asyncStorage';+import * as asyncStorage from '#platform/server/asyncStorage';import * as monthUtils from '../../shared/months';import type { SyncedPrefs } from '../../types/prefs';import * as db from '../db';diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.tsindex 3f4d3a79ad..065d615443 100644--- a/packages/loot-core/src/server/accounts/sync.ts+++ b/packages/loot-core/src/server/accounts/sync.ts@@ -2,7 +2,7 @@import * as dateFns from 'date-fns';import { v4 as uuidv4 } from 'uuid';-import * as asyncStorage from '../../platform/server/asyncStorage';+import * as asyncStorage from '#platform/server/asyncStorage';import { logger } from '../../platform/server/log';import * as monthUtils from '../../shared/months';import { q } from '../../shared/query';diff --git a/packages/loot-core/src/server/admin/app.ts b/packages/loot-core/src/server/admin/app.tsindex 488896be6f..cf94724816 100644--- a/packages/loot-core/src/server/admin/app.ts+++ b/packages/loot-core/src/server/admin/app.ts@@ -1,5 +1,5 @@// @ts-strict-ignore-import * as asyncStorage from '../../platform/server/asyncStorage';+import * as asyncStorage from '#platform/server/asyncStorage';import type {NewUserAccessEntity,UserAvailable,diff --git a/packages/loot-core/src/server/api.ts b/packages/loot-core/src/server/api.tsindex fbb94dcbab..7475ef05a6 100644--- a/packages/loot-core/src/server/api.ts+++ b/packages/loot-core/src/server/api.ts@@ -1,8 +1,8 @@// @ts-strict-ignoreimport { getClock } from '@actual-app/crdt';-import * as connection from '../platform/server/connection';-import { logger } from '../platform/server/log';+import * as connection from '#platform/server/connection';+import { logger } from '#platform/server/log';import {getBankSyncError,getDownloadError,diff --git a/packages/loot-core/src/server/auth/app.ts b/packages/loot-core/src/server/auth/app.tsindex fe4604432e..3b73d0c6fd 100644--- a/packages/loot-core/src/server/auth/app.ts+++ b/packages/loot-core/src/server/auth/app.ts@@ -1,4 +1,4 @@-import * as asyncStorage from '../../platform/server/asyncStorage';+import * as asyncStorage from '#platform/server/asyncStorage';import { logger } from '../../platform/server/log';import type { OpenIdConfig } from '../../types/models';import { createApp } from '../app';diff --git a/packages/loot-core/src/server/budget/actions.ts b/packages/loot-core/src/server/budget/actions.tsindex 2b9c956823..e3db14d071 100644--- a/packages/loot-core/src/server/budget/actions.ts+++ b/packages/loot-core/src/server/budget/actions.ts@@ -1,7 +1,7 @@// @ts-strict-ignore+import * as asyncStorage from '#platform/server/asyncStorage';import { getCurrency } from '#shared/currencies';-import * as asyncStorage from '../../platform/server/asyncStorage';import { getLocale } from '../../shared/locale';import * as monthUtils from '../../shared/months';import { integerToCurrency, safeNumber } from '../../shared/util';diff --git a/packages/loot-core/src/server/budgetfiles/app.ts b/packages/loot-core/src/server/budgetfiles/app.tsindex b3f9b313db..68d1617536 100644--- a/packages/loot-core/src/server/budgetfiles/app.ts+++ b/packages/loot-core/src/server/budgetfiles/app.ts@@ -1,13 +1,13 @@// @ts-strict-ignoreimport * as CRDT from '@actual-app/crdt';+import * as asyncStorage from '#platform/server/asyncStorage';+import * as connection from '#platform/server/connection';+import * as fs from '#platform/server/fs';+import { logger } from '#platform/server/log';+import * as Platform from '#shared/platform';import { createTestBudget } from '../../mocks/budget';import { captureBreadcrumb, captureException } from '../../platform/exceptions';-import * as asyncStorage from '../../platform/server/asyncStorage';-import * as connection from '../../platform/server/connection';-import * as fs from '../../platform/server/fs';-import { logger } from '../../platform/server/log';-import * as Platform from '../../shared/platform';import type { Budget } from '../../types/budget';import { createApp } from '../app';import * as budget from '../budget/base';diff --git a/packages/loot-core/src/server/budgetfiles/backups.ts b/packages/loot-core/src/server/budgetfiles/backups.tsindex 441f146ead..d53efb5229 100644--- a/packages/loot-core/src/server/budgetfiles/backups.ts+++ b/packages/loot-core/src/server/budgetfiles/backups.ts@@ -3,10 +3,10 @@ import type { Database } from '@jlongster/sql.js';import AdmZip from 'adm-zip';import * as dateFns from 'date-fns';-import * as connection from '../../platform/server/connection';-import * as fs from '../../platform/server/fs';-import { logger } from '../../platform/server/log';-import * as sqlite from '../../platform/server/sqlite';+import * as connection from '#platform/server/connection';+import * as fs from '#platform/server/fs';+import { logger } from '#platform/server/log';+import * as sqlite from '#platform/server/sqlite';import * as monthUtils from '../../shared/months';import * as cloudStorage from '../cloud-storage';import * as prefs from '../prefs';diff --git a/packages/loot-core/src/server/cloud-storage.ts b/packages/loot-core/src/server/cloud-storage.tsindex d9c667e5db..f445c7c763 100644--- a/packages/loot-core/src/server/cloud-storage.ts+++ b/packages/loot-core/src/server/cloud-storage.ts@@ -2,11 +2,11 @@import AdmZip from 'adm-zip';import { v4 as uuidv4 } from 'uuid';-import * as asyncStorage from '../platform/server/asyncStorage';-import { fetch } from '../platform/server/fetch';-import * as fs from '../platform/server/fs';-import { logger } from '../platform/server/log';-import * as sqlite from '../platform/server/sqlite';+import * as asyncStorage from '#platform/server/asyncStorage';+import { fetch } from '#platform/server/fetch';+import * as fs from '#platform/server/fs';+import { logger } from '#platform/server/log';+import * as sqlite from '#platform/server/sqlite';import * as monthUtils from '../shared/months';import * as encryption from './encryption';diff --git a/packages/loot-core/src/server/dashboard/app.ts b/packages/loot-core/src/server/dashboard/app.tsindex 6bb450c63b..698b895985 100644--- a/packages/loot-core/src/server/dashboard/app.ts+++ b/packages/loot-core/src/server/dashboard/app.ts@@ -1,8 +1,8 @@import isMatch from 'lodash/isMatch';import { v4 as uuidv4 } from 'uuid';+import * as fs from '#platform/server/fs';import { captureException } from '../../platform/exceptions';-import * as fs from '../../platform/server/fs';import { DEFAULT_DASHBOARD_STATE } from '../../shared/dashboard';import { q } from '../../shared/query';import type {diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.tsindex d4c36b024c..c6f65d7d8c 100644--- a/packages/loot-core/src/server/db/index.ts+++ b/packages/loot-core/src/server/db/index.ts@@ -11,8 +11,8 @@ import type { Database, Statement } from '@jlongster/sql.js';import { LRUCache } from 'lru-cache';import { v4 as uuidv4 } from 'uuid';-import * as fs from '../../platform/server/fs';-import * as sqlite from '../../platform/server/sqlite';+import * as fs from '#platform/server/fs';+import * as sqlite from '#platform/server/sqlite';import * as monthUtils from '../../shared/months';import { groupById } from '../../shared/util';import type { TransactionEntity } from '../../types/models';diff --git a/packages/loot-core/src/server/encryption/app.ts b/packages/loot-core/src/server/encryption/app.tsindex daa7a2e12f..21bc32578f 100644--- a/packages/loot-core/src/server/encryption/app.ts+++ b/packages/loot-core/src/server/encryption/app.ts@@ -1,6 +1,6 @@import { v4 as uuidv4 } from 'uuid';-import * as asyncStorage from '../../platform/server/asyncStorage';+import * as asyncStorage from '#platform/server/asyncStorage';import { logger } from '../../platform/server/log';import type { Budget } from '../../types/budget';import { createApp } from '../app';diff --git a/packages/loot-core/src/server/encryption/index.ts b/packages/loot-core/src/server/encryption/index.tsindex c38b9c1b30..4841aadd5e 100644--- a/packages/loot-core/src/server/encryption/index.ts+++ b/packages/loot-core/src/server/encryption/index.ts@@ -1,7 +1,7 @@// @ts-strict-ignoreimport { v4 as uuidv4 } from 'uuid';-import * as internals from './encryption-internals';+import * as internals from '#server/encryption/encryption-internals';// A map of all possible master encryption keys to use, keyed by// unique iddiff --git a/packages/loot-core/src/server/importers/actual.ts b/packages/loot-core/src/server/importers/actual.tsindex 28554be528..27b70ee134 100644--- a/packages/loot-core/src/server/importers/actual.ts+++ b/packages/loot-core/src/server/importers/actual.ts@@ -1,6 +1,6 @@// @ts-strict-ignore-import * as fs from '../../platform/server/fs';-import * as sqlite from '../../platform/server/sqlite';+import * as fs from '#platform/server/fs';+import * as sqlite from '#platform/server/sqlite';import * as cloudStorage from '../cloud-storage';import { handlers } from '../main';import { waitOnSpreadsheet } from '../sheet';diff --git a/packages/loot-core/src/server/main-app.ts b/packages/loot-core/src/server/main-app.tsindex d51bd57c6c..541b129eb1 100644--- a/packages/loot-core/src/server/main-app.ts+++ b/packages/loot-core/src/server/main-app.ts@@ -1,4 +1,4 @@-import * as connection from '../platform/server/connection';+import * as connection from '#platform/server/connection';import type { Handlers } from '../types/handlers';import { createApp } from './app';diff --git a/packages/loot-core/src/server/main.test.ts b/packages/loot-core/src/server/main.test.tsindex 4db6031934..db15354569 100644--- a/packages/loot-core/src/server/main.test.ts+++ b/packages/loot-core/src/server/main.test.ts@@ -2,9 +2,9 @@import { deserializeClock, getClock } from '@actual-app/crdt';import { v4 as uuidv4 } from 'uuid';+import * as connection from '#platform/server/connection';+import * as fs from '#platform/server/fs';import { expectSnapshotWithDiffer } from '../mocks/util';-import * as connection from '../platform/server/connection';-import * as fs from '../platform/server/fs';import * as monthUtils from '../shared/months';import * as budgetActions from './budget/actions';diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.tsindex 201c37ac2f..012746286b 100644--- a/packages/loot-core/src/server/main.ts+++ b/packages/loot-core/src/server/main.ts@@ -1,10 +1,10 @@// @ts-strict-ignoreimport './polyfills';-import * as asyncStorage from '../platform/server/asyncStorage';-import * as connection from '../platform/server/connection';-import * as fs from '../platform/server/fs';-import { logger, setVerboseMode } from '../platform/server/log';-import * as sqlite from '../platform/server/sqlite';+import * as asyncStorage from '#platform/server/asyncStorage';+import * as connection from '#platform/server/connection';+import * as fs from '#platform/server/fs';+import { logger, setVerboseMode } from '#platform/server/log';+import * as sqlite from '#platform/server/sqlite';import { q } from '../shared/query';import { amountToInteger, integerToAmount } from '../shared/util';import type { Handlers } from '../types/handlers';diff --git a/packages/loot-core/src/server/migrate/cli.ts b/packages/loot-core/src/server/migrate/cli.tsindex ecdd247378..c3e405b989 100755--- a/packages/loot-core/src/server/migrate/cli.ts+++ b/packages/loot-core/src/server/migrate/cli.ts@@ -5,8 +5,8 @@ import * as path from 'path';import yargs from 'yargs';-import { logger } from '../../platform/server/log';-import * as sqlite from '../../platform/server/sqlite';+import { logger } from '#platform/server/log';+import * as sqlite from '#platform/server/sqlite';import {getAppliedMigrations,diff --git a/packages/loot-core/src/server/migrate/migrations.ts b/packages/loot-core/src/server/migrate/migrations.tsindex fdd6fc1671..d47f045f97 100644--- a/packages/loot-core/src/server/migrate/migrations.ts+++ b/packages/loot-core/src/server/migrate/migrations.ts@@ -4,14 +4,14 @@// we can remove this migration.import type { Database } from '@jlongster/sql.js';+import * as fs from '#platform/server/fs';+import { logger } from '#platform/server/log';+import * as sqlite from '#platform/server/sqlite';import m1632571489012 from '../../../migrations/1632571489012_remove_cache';import m1722717601000 from '../../../migrations/1722717601000_reports_move_selected_categories';import m1722804019000 from '../../../migrations/1722804019000_create_dashboard_table';import m1723665565000 from '../../../migrations/1723665565000_prefs';import m1765518577215 from '../../../migrations/1765518577215_multiple_dashboards';-import * as fs from '../../platform/server/fs';-import { logger } from '../../platform/server/log';-import * as sqlite from '../../platform/server/sqlite';import * as prefs from '../prefs';let MIGRATIONS_DIR = fs.migrationsPath;diff --git a/packages/loot-core/src/server/post.ts b/packages/loot-core/src/server/post.tsindex 60c690d16c..d9a4ced481 100644--- a/packages/loot-core/src/server/post.ts+++ b/packages/loot-core/src/server/post.ts@@ -1,7 +1,7 @@// @ts-strict-ignore-import { fetch } from '../platform/server/fetch';-import { logger } from '../platform/server/log';-import * as Platform from '../shared/platform';+import { fetch } from '#platform/server/fetch';+import { logger } from '#platform/server/log';+import * as Platform from '#shared/platform';import { PostError } from './errors';diff --git a/packages/loot-core/src/server/preferences/app.ts b/packages/loot-core/src/server/preferences/app.tsindex 7b4d7f9f1f..8b02b26199 100644--- a/packages/loot-core/src/server/preferences/app.ts+++ b/packages/loot-core/src/server/preferences/app.ts@@ -1,5 +1,5 @@-import * as asyncStorage from '../../platform/server/asyncStorage';-import * as fs from '../../platform/server/fs';+import * as asyncStorage from '#platform/server/asyncStorage';+import * as fs from '#platform/server/fs';import { stringToInteger } from '../../shared/util';import type {GlobalPrefs,diff --git a/packages/loot-core/src/server/prefs.ts b/packages/loot-core/src/server/prefs.tsindex 2c2b8db5ba..3a9280052f 100644--- a/packages/loot-core/src/server/prefs.ts+++ b/packages/loot-core/src/server/prefs.ts@@ -1,7 +1,7 @@// @ts-strict-ignoreimport { Timestamp } from '@actual-app/crdt';-import * as fs from '../platform/server/fs';+import * as fs from '#platform/server/fs';import type { MetadataPrefs } from '../types/prefs';import { sendMessages } from './sync';diff --git a/packages/loot-core/src/server/schedules/app.ts b/packages/loot-core/src/server/schedules/app.tsindex e33e48fc15..a8eaf118bf 100644--- a/packages/loot-core/src/server/schedules/app.ts+++ b/packages/loot-core/src/server/schedules/app.ts@@ -2,9 +2,9 @@import * as d from 'date-fns';import { v4 as uuidv4 } from 'uuid';+import * as connection from '#platform/server/connection';+import { logger } from '#platform/server/log';import { captureBreadcrumb } from '../../platform/exceptions';-import * as connection from '../../platform/server/connection';-import { logger } from '../../platform/server/log';import { currentDay, dayFromDate, parseDate } from '../../shared/months';import { q } from '../../shared/query';import {diff --git a/packages/loot-core/src/server/server-config.ts b/packages/loot-core/src/server/server-config.tsindex 25714c7425..7f0c3f379e 100644--- a/packages/loot-core/src/server/server-config.ts+++ b/packages/loot-core/src/server/server-config.ts@@ -1,4 +1,4 @@-import * as fs from '../platform/server/fs';+import * as fs from '#platform/server/fs';import { logger } from '../platform/server/log';type ServerConfig = {diff --git a/packages/loot-core/src/server/sheet.ts b/packages/loot-core/src/server/sheet.tsindex a910db2319..f67f4ea8ea 100644--- a/packages/loot-core/src/server/sheet.ts+++ b/packages/loot-core/src/server/sheet.ts@@ -1,11 +1,11 @@// @ts-strict-ignoreimport type { Database } from '@jlongster/sql.js';+import { logger } from '#platform/server/log';+import * as sqlite from '#platform/server/sqlite';+import * as Platform from '#shared/platform';import { captureBreadcrumb } from '../platform/exceptions';-import { logger } from '../platform/server/log';-import * as sqlite from '../platform/server/sqlite';import { sheetForMonth } from '../shared/months';-import * as Platform from '../shared/platform';import type * as DbModule from './db';import type {diff --git a/packages/loot-core/src/server/sync/index.ts b/packages/loot-core/src/server/sync/index.tsindex 6cd3ce1c12..6a7a1a8baf 100644--- a/packages/loot-core/src/server/sync/index.ts+++ b/packages/loot-core/src/server/sync/index.ts@@ -7,10 +7,10 @@ import {Timestamp,} from '@actual-app/crdt';+import * as asyncStorage from '#platform/server/asyncStorage';+import * as connection from '#platform/server/connection';+import { logger } from '#platform/server/log';import { captureException } from '../../platform/exceptions';-import * as asyncStorage from '../../platform/server/asyncStorage';-import * as connection from '../../platform/server/connection';-import { logger } from '../../platform/server/log';import { once, sequential } from '../../shared/async';import { getIn, setIn } from '../../shared/util';import type { MetadataPrefs } from '../../types/prefs';diff --git a/packages/loot-core/src/server/sync/reset.ts b/packages/loot-core/src/server/sync/reset.tsindex 5bfa645995..96a01afa69 100644--- a/packages/loot-core/src/server/sync/reset.ts+++ b/packages/loot-core/src/server/sync/reset.ts@@ -1,7 +1,7 @@// @ts-strict-ignore+import * as asyncStorage from '#platform/server/asyncStorage';+import * as connection from '#platform/server/connection';import { captureException } from '../../platform/exceptions';-import * as asyncStorage from '../../platform/server/asyncStorage';-import * as connection from '../../platform/server/connection';import * as cloudStorage from '../cloud-storage';import * as db from '../db';import { runMutator } from '../mutators';diff --git a/packages/loot-core/src/server/transactions/import/parse-file.ts b/packages/loot-core/src/server/transactions/import/parse-file.tsindex 6793e5751a..200598c01c 100644--- a/packages/loot-core/src/server/transactions/import/parse-file.ts+++ b/packages/loot-core/src/server/transactions/import/parse-file.ts@@ -1,7 +1,7 @@// @ts-strict-ignoreimport { parse as csv2json } from 'csv-parse/sync';-import * as fs from '../../../platform/server/fs';+import * as fs from '#platform/server/fs';import { logger } from '../../../platform/server/log';import { looselyParseAmount } from '../../../shared/util';diff --git a/packages/loot-core/src/server/transactions/index.ts b/packages/loot-core/src/server/transactions/index.tsindex 3cc184fe3f..c3185d4421 100644--- a/packages/loot-core/src/server/transactions/index.ts+++ b/packages/loot-core/src/server/transactions/index.ts@@ -1,6 +1,6 @@// @ts-strict-ignore-import * as connection from '../../platform/server/connection';+import * as connection from '#platform/server/connection';import type { Diff } from '../../shared/util';import type { PayeeEntity, TransactionEntity } from '../../types/models';import * as db from '../db';diff --git a/packages/loot-core/src/server/undo.ts b/packages/loot-core/src/server/undo.tsindex d2c3972a78..c69b39ecf8 100644--- a/packages/loot-core/src/server/undo.ts+++ b/packages/loot-core/src/server/undo.ts@@ -1,7 +1,7 @@// @ts-strict-ignoreimport { Timestamp } from '@actual-app/crdt';-import * as connection from '../platform/server/connection';+import * as connection from '#platform/server/connection';import { getIn } from '../shared/util';import type { HandlerFunctions } from '../types/handlers';diff --git a/packages/loot-core/src/server/util/budget-name.ts b/packages/loot-core/src/server/util/budget-name.tsindex 4ae75c4d18..d6932313dc 100644--- a/packages/loot-core/src/server/util/budget-name.ts+++ b/packages/loot-core/src/server/util/budget-name.ts@@ -1,6 +1,6 @@import { v4 as uuidv4 } from 'uuid';-import * as fs from '../../platform/server/fs';+import * as fs from '#platform/server/fs';import { handlers } from '../main';export async function uniqueBudgetName(diff --git a/packages/loot-core/vite.desktop.config.ts b/packages/loot-core/vite.desktop.config.tsindex d4aa03c4ec..b8cf37d3c6 100644--- a/packages/loot-core/vite.desktop.config.ts+++ b/packages/loot-core/vite.desktop.config.ts@@ -9,7 +9,11 @@ export default defineConfig(({ mode }) => {return {mode,- ssr: { noExternal: true, external: ['better-sqlite3'] },+ ssr: {+ noExternal: true,+ external: ['better-sqlite3'],+ resolve: { conditions: ['electron'] },+ },build: {target: 'node18',outDir,@@ -29,6 +33,7 @@ export default defineConfig(({ mode }) => {},},resolve: {+ conditions: ['electron'],extensions: ['.electron.js','.electron.ts',diff --git a/packages/loot-core/vitest.config.ts b/packages/loot-core/vitest.config.tsindex 109b213520..77543499cc 100644--- a/packages/loot-core/vitest.config.ts+++ b/packages/loot-core/vitest.config.ts@@ -2,8 +2,6 @@ import peggyLoader from 'vite-plugin-peggy-loader';import { defineConfig } from 'vitest/config';const resolveExtensions = [- '.testing.ts',- '.electron.ts','.mjs','.js','.mts',@@ -28,8 +26,12 @@ export default defineConfig({},maxWorkers: 2,},+ ssr: {+ resolve: { conditions: ['electron', 'module', 'node', 'development'] },+ },resolve: {extensions: resolveExtensions,+ conditions: ['electron', 'module', 'browser', 'development'],},plugins: [peggyLoader()],});diff --git a/upcoming-release-notes/7383.md b/upcoming-release-notes/7383.mdnew file mode 100644index 0000000000..1125e4d47f--- /dev/null+++ b/upcoming-release-notes/7383.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++Improved module resolution for better platform compatibility.