Merge pull request #122 from multica-ai/fix/ui-hmr-watch

fix(desktop): restructure to standard electron-vite layout for HMR
2026-07-26 12:35:35 +02:00 · 2026-02-10 22:08:09 +08:00
parent 98b8126c89 2269677ded
commit 22d0aca210
36 changed files with 5 additions and 12 deletions
--- a/apps/desktop/electron.vite.config.ts
+++ b/apps/desktop/electron.vite.config.ts
@@ -18,18 +18,10 @@ export default defineConfig({
    },
  },
  renderer: {
-    root: '.',
-    build: {
-      rollupOptions: {
-        input: {
-          index: path.resolve(__dirname, 'index.html'),
-        },
-      },
-    },
    plugins: [react(), tailwindcss()],
    resolve: {
      alias: {
-        '@': path.resolve(__dirname, 'src'),
+        '@': path.resolve(__dirname, 'src/renderer/src'),
      },
    },
  },
--- a/apps/desktop/src/main/index.ts
+++ b/apps/desktop/src/main/index.ts
@@ -55,7 +55,8 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
 // APP_ROOT points to apps/desktop (two levels up from out/main/)
 process.env.APP_ROOT = path.join(__dirname, '../..')

-export const VITE_DEV_SERVER_URL = process.env['VITE_DEV_SERVER_URL']
+// electron-vite uses ELECTRON_RENDERER_URL for dev server
+export const VITE_DEV_SERVER_URL = process.env['ELECTRON_RENDERER_URL']
 // electron-vite outputs to out/ directory
 export const MAIN_DIST = path.join(__dirname)
 export const RENDERER_DIST = path.join(__dirname, '../renderer')
--- a/apps/desktop/src/renderer/index.html
+++ b/apps/desktop/src/renderer/index.html
@@ -7,6 +7,6 @@
  </head>
  <body>
    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
+    <script type="module" src="./src/main.tsx"></script>
  </body>
 </html>
--- a/apps/desktop/src/renderer/src/App.tsx
+++ b/apps/desktop/src/renderer/src/App.tsx
--- a/apps/desktop/src/renderer/src/components/agent-settings-dialog.tsx
+++ b/apps/desktop/src/renderer/src/components/agent-settings-dialog.tsx
--- a/apps/desktop/src/renderer/src/components/api-key-dialog.tsx
+++ b/apps/desktop/src/renderer/src/components/api-key-dialog.tsx
--- a/apps/desktop/src/renderer/src/components/cron-job-list.tsx
+++ b/apps/desktop/src/renderer/src/components/cron-job-list.tsx
--- a/apps/desktop/src/renderer/src/components/device-confirm-dialog.tsx
+++ b/apps/desktop/src/renderer/src/components/device-confirm-dialog.tsx
--- a/apps/desktop/src/renderer/src/components/device-list.tsx
+++ b/apps/desktop/src/renderer/src/components/device-list.tsx
--- a/apps/desktop/src/renderer/src/components/local-chat.tsx
+++ b/apps/desktop/src/renderer/src/components/local-chat.tsx
--- a/apps/desktop/src/renderer/src/components/oauth-dialog.tsx
+++ b/apps/desktop/src/renderer/src/components/oauth-dialog.tsx
--- a/apps/desktop/src/renderer/src/components/qr-code.tsx
+++ b/apps/desktop/src/renderer/src/components/qr-code.tsx
--- a/apps/desktop/src/renderer/src/components/remote-chat.tsx
+++ b/apps/desktop/src/renderer/src/components/remote-chat.tsx
--- a/apps/desktop/src/renderer/src/components/skill-list.tsx
+++ b/apps/desktop/src/renderer/src/components/skill-list.tsx
--- a/apps/desktop/src/renderer/src/components/tool-list.tsx
+++ b/apps/desktop/src/renderer/src/components/tool-list.tsx
--- a/apps/desktop/src/renderer/src/hooks/use-channels.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-channels.ts
--- a/apps/desktop/src/renderer/src/hooks/use-cron-jobs.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-cron-jobs.ts
--- a/apps/desktop/src/renderer/src/hooks/use-devices.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-devices.ts
--- a/apps/desktop/src/renderer/src/hooks/use-heartbeat.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-heartbeat.ts
--- a/apps/desktop/src/renderer/src/hooks/use-hub.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-hub.ts
--- a/apps/desktop/src/renderer/src/hooks/use-local-chat.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-local-chat.ts
--- a/apps/desktop/src/renderer/src/hooks/use-provider.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-provider.ts
--- a/apps/desktop/src/renderer/src/hooks/use-skills.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-skills.ts
--- a/apps/desktop/src/renderer/src/hooks/use-tools.ts
+++ b/apps/desktop/src/renderer/src/hooks/use-tools.ts
--- a/apps/desktop/src/renderer/src/lib/parse-user-agent.ts
+++ b/apps/desktop/src/renderer/src/lib/parse-user-agent.ts
--- a/apps/desktop/src/renderer/src/main.tsx
+++ b/apps/desktop/src/renderer/src/main.tsx
--- a/apps/desktop/src/renderer/src/pages/channels.tsx
+++ b/apps/desktop/src/renderer/src/pages/channels.tsx
--- a/apps/desktop/src/renderer/src/pages/chat.tsx
+++ b/apps/desktop/src/renderer/src/pages/chat.tsx
--- a/apps/desktop/src/renderer/src/pages/crons.tsx
+++ b/apps/desktop/src/renderer/src/pages/crons.tsx
--- a/apps/desktop/src/renderer/src/pages/home.tsx
+++ b/apps/desktop/src/renderer/src/pages/home.tsx
--- a/apps/desktop/src/renderer/src/pages/layout.tsx
+++ b/apps/desktop/src/renderer/src/pages/layout.tsx
--- a/apps/desktop/src/renderer/src/pages/skills.tsx
+++ b/apps/desktop/src/renderer/src/pages/skills.tsx
--- a/apps/desktop/src/renderer/src/pages/tools.tsx
+++ b/apps/desktop/src/renderer/src/pages/tools.tsx
--- a/apps/desktop/src/renderer/src/stores/chat-mode.ts
+++ b/apps/desktop/src/renderer/src/stores/chat-mode.ts
--- a/apps/desktop/src/renderer/src/vite-env.d.ts
+++ b/apps/desktop/src/renderer/src/vite-env.d.ts
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -15,7 +15,7 @@
    "jsx": "react-jsx",
    "baseUrl": ".",
    "paths": {
-      "@/*": ["./src/*"],
+      "@/*": ["./src/renderer/src/*"],
      "@multica/ui/*": ["../../packages/ui/src/*"],
      "@multica/store/*": ["../../packages/store/src/*"]
    },