update

Author: arvinxx

apps/desktop/README.md

@@ -1,34 +1,4 @@
-# electron-app
+构建路径：
 
-A minimal Electron application with TypeScript
-
-## Recommended IDE Setup
-
-- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
-
-## Project Setup
-
-### Install
-
-```bash
-$ pnpm install
-```
-
-### Development
-
-```bash
-$ pnpm dev
-```
-
-### Build
-
-```bash
-# For windows
-$ pnpm build:win
-
-# For macOS
-$ pnpm build:mac
-
-# For Linux
-$ pnpm build:linux
-```
+- dist: 构建产物路径
+- release: 发布产物路径

apps/desktop/electron-builder.yml

@@ -2,8 +2,10 @@ appId: com.electron.app
 productName: lobechat
 directories:
   buildResources: build
+  output: 'release',
+
 files:
-  - 'out'
+  - 'dist'
 
 asar: false
 extraResources:

apps/desktop/electron.vite.config.ts

@@ -2,10 +2,15 @@ import { defineConfig, externalizeDepsPlugin } from 'electron-vite';
 
 export default defineConfig({
   main: {
+    build: {
+      outDir: 'dist/main',
+    },
     plugins: [externalizeDepsPlugin({})],
   },
   preload: {
-    build: {},
+    build: {
+      outDir: 'dist/preload',
+    },
     plugins: [externalizeDepsPlugin({})],
   },
 });

apps/desktop/package.json

@@ -4,7 +4,7 @@
   "description": "A minimal Electron application with TypeScript",
   "homepage": "https://electron-vite.org",
   "author": "example.com",
-  "main": "./out/main/index.js",
+  "main": "./dist/main/index.js",
   "scripts": {
     "build": "npm run typecheck && electron-vite build",
     "build:linux": "npm run build && electron-builder --linux",

apps/desktop/src/main/index.ts

@@ -10,7 +10,7 @@ let mainWindow;
 let stopIntercept;
 
 // Next.js handler
-const standaloneDir = path.join(appPath, 'out', 'standalone');
+const standaloneDir = path.join(appPath, 'dist', 'next');
 const { createInterceptor } = createHandler({
   debug: true,
   localhostUrl,

next.config.ts

@@ -18,6 +18,8 @@ const isStandaloneMode = buildWithDocker || isDesktop;
 const nextConfig: NextConfig = {
   basePath,
   compress: isProd,
+  // 桌面端模式下，将输出路径改为桌面端目录下面
+  distDir: isDesktop && isProd ? 'apps/desktop/dist/next' : undefined,
   experimental: {
     optimizePackageImports: [
       'emoji-mart',

package.json

@@ -35,6 +35,7 @@
     "build-sitemap": "tsx ./scripts/buildSitemapIndex/index.ts",
     "build:analyze": "ANALYZE=true next build",
     "build:docker": "DOCKER=true next build && npm run build-sitemap",
+    "build:electron": "next build",
     "db:generate": "drizzle-kit generate && npm run db:generate-client && npm run workflow:dbml",
     "db:generate-client": "tsx ./scripts/migrateClientDB/compile-migrations.ts",
     "db:migrate": "MIGRATION_DB=1 tsx ./scripts/migrateServerDB/index.ts",

src/database/server/core/db.ts

@@ -13,7 +13,8 @@ import * as schema from '../../schemas';
 
 export const getPgliteInstance = () => {
   const client = new PGlite('lobechat-db');
-  return pgliteDrizzle({ client, schema });
+
+  return pgliteDrizzle({ client, schema }) as unknown as NeonDatabase<typeof schema>;
 };
 
 export const getDBInstance = (): NeonDatabase<typeof schema> => {

tsconfig.json

@@ -29,14 +29,16 @@
   },
   "exclude": ["node_modules", "public/sw.js", "apps/desktop"],
   "include": [
+    "**/*.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next-desktop/types/**/*.ts",
+    ".next/types/**/*.ts",
     "next-env.d.ts",
-    "vitest.config.ts",
     "src",
     "tests",
-    "**/*.ts",
-    "**/*.d.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts"
+    "vitest.config.ts",
+    "apps/desktop/out/types/**/*.ts"
   ],
   "ts-node": {
     "compilerOptions": {