diff --git a/apps/desktop/forge.config.ts b/apps/desktop/forge.config.ts index 2d60acfd..271e08e8 100644 --- a/apps/desktop/forge.config.ts +++ b/apps/desktop/forge.config.ts @@ -15,36 +15,29 @@ const config: ForgeConfig = { appBundleId: 'com.colanode.desktop', ...(process.platform === 'win32' && { certificateFile: process.env.CERTIFICATE_PATH, - certificatePassword: process.env.CERTIFICATE_PASSWORD + certificatePassword: process.env.CERTIFICATE_PASSWORD, }), asar: true, - ignore: [ - /^\/src/, - /^\/test/, - /^\/tools/, - /^\/release/, - /^\/docs/, - /^\/dist/, - /^\/assets/, - /\.git/, - /\.vscode/, - /\.idea/, - /^\/\.env/, - // Config files - /\.eslintrc\.json$/, - /components\.json$/, - /postcss\.config\.js$/, - /tailwind\.config\.js$/, - /tsconfig\.json$/, - /forge\.config\.ts$/, - /forge\.env\.d\.ts$/, - /vite\.base\.config\.ts$/, - /vite\.main\.config\.ts$/, - /vite\.renderer\.config\.ts$/, - /vite\.preload\.config\.ts$/, - // Don't ignore node_modules - // /^\/node_modules/, - ], + prune: true, + ignore: (path) => { + if (!path) { + return false; + } + + if (path === '/package.json') { + return false; + } + + if (path.startsWith('/node_modules')) { + return false; + } + + if (path.startsWith('/.vite')) { + return false; + } + + return true; + }, extraResource: ['assets'], }, rebuildConfig: {}, @@ -53,8 +46,8 @@ const config: ForgeConfig = { name: 'Colanode', ...(process.platform === 'win32' && { certificateFile: process.env.CERTIFICATE_PATH, - certificatePassword: process.env.CERTIFICATE_PASSWORD - }) + certificatePassword: process.env.CERTIFICATE_PASSWORD, + }), }), new MakerDMG({ name: 'Colanode', diff --git a/apps/desktop/src/main/services/metadata-service.ts b/apps/desktop/src/main/services/metadata-service.ts index a52f9d1b..eae9cf3c 100644 --- a/apps/desktop/src/main/services/metadata-service.ts +++ b/apps/desktop/src/main/services/metadata-service.ts @@ -1,4 +1,4 @@ -import { databaseService } from '../data/database-service'; +import { databaseService } from '@/main/data/database-service'; class MetadataService { public async get(key: string): Promise { diff --git a/apps/desktop/src/main/services/sync-consumer.ts b/apps/desktop/src/main/services/sync-consumer.ts index aca41d89..a9ccd20d 100644 --- a/apps/desktop/src/main/services/sync-consumer.ts +++ b/apps/desktop/src/main/services/sync-consumer.ts @@ -7,8 +7,7 @@ import { TransactionsBatchMessage, } from '@colanode/core'; -import { interactionService } from './interaction-service'; - +import { interactionService } from '@/main/services/interaction-service'; import { nodeService } from '@/main/services/node-service'; import { collaborationService } from '@/main/services/collaboration-service'; import { socketService } from '@/main/services/socket-service'; diff --git a/package-lock.json b/package-lock.json index ad348106..0f6ecd0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9044,9 +9044,9 @@ } }, "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -13164,9 +13164,9 @@ } }, "node_modules/kysely": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.27.4.tgz", - "integrity": "sha512-dyNKv2KRvYOQPLCAOCjjQuCk4YFd33BvGdf/o5bC7FiW+BB6snA81Zt+2wT9QDFzKqxKa5rrOmvlK/anehCcgA==", + "version": "0.27.5", + "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.27.5.tgz", + "integrity": "sha512-s7hZHcQeSNKpzCkHRm8yA+0JPLjncSWnjb+2TIElwS2JAqYr+Kv3Ess+9KFfJS0C1xcQ1i9NkNHpWwCYpHMWsA==", "license": "MIT", "engines": { "node": ">=14.0.0"