diff --git a/apps/desktop/electron.vite.config.ts b/apps/desktop/electron.vite.config.ts index 350708fb1..2c3d00a88 100644 --- a/apps/desktop/electron.vite.config.ts +++ b/apps/desktop/electron.vite.config.ts @@ -1,41 +1,26 @@ import { resolve } from "path"; import { defineConfig, externalizeDepsPlugin } from "electron-vite"; -import { loadEnv } from "vite"; import react from "@vitejs/plugin-react"; import tailwindcss from "@tailwindcss/vite"; -export default defineConfig(({ mode }) => { - const env = loadEnv(mode, process.cwd(), ""); - const remoteApi = env.VITE_REMOTE_API; - const remoteWs = remoteApi?.replace(/^https/, "wss").replace(/^http/, "ws"); - - return { - main: { - plugins: [externalizeDepsPlugin()], +export default defineConfig({ + main: { + plugins: [externalizeDepsPlugin()], + }, + preload: { + plugins: [externalizeDepsPlugin()], + }, + renderer: { + server: { + port: 5173, + strictPort: true, }, - preload: { - plugins: [externalizeDepsPlugin()], - }, - renderer: { - server: { - port: 5173, - strictPort: true, - ...(remoteApi && { - proxy: { - "/api": { target: remoteApi, changeOrigin: true }, - "/auth": { target: remoteApi, changeOrigin: true }, - "/uploads": { target: remoteApi, changeOrigin: true }, - "/ws": { target: remoteWs, changeOrigin: true, ws: true }, - }, - }), - }, - plugins: [react(), tailwindcss()], - resolve: { - alias: { - "@": resolve("src/renderer/src"), - }, - dedupe: ["react", "react-dom"], + plugins: [react(), tailwindcss()], + resolve: { + alias: { + "@": resolve("src/renderer/src"), }, + dedupe: ["react", "react-dom"], }, - }; + }, }); diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 71c88a4e4..ad00504aa 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -6,7 +6,6 @@ "scripts": { "bundle-cli": "node scripts/bundle-cli.mjs", "dev": "pnpm run bundle-cli && electron-vite dev", - "dev:remote": "pnpm run bundle-cli && electron-vite dev --mode remote", "build": "pnpm run bundle-cli && electron-vite build", "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false", "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false", diff --git a/apps/desktop/src/renderer/src/App.tsx b/apps/desktop/src/renderer/src/App.tsx index bcc4dbd37..b7e1c7766 100644 --- a/apps/desktop/src/renderer/src/App.tsx +++ b/apps/desktop/src/renderer/src/App.tsx @@ -120,15 +120,9 @@ function AppContent() { return ; } -const remoteProxy = Boolean(import.meta.env.VITE_REMOTE_API); -// Backend the daemon should connect to. In remote-proxy mode the renderer -// talks through a local Vite proxy, but the daemon needs the real upstream -// URL — which is what VITE_REMOTE_API holds. Fall back to VITE_API_URL -// (direct mode) and finally localhost:8080 (local dev default). +// Backend the daemon should connect to — same URL the renderer talks to. const DAEMON_TARGET_API_URL = - import.meta.env.VITE_REMOTE_API || - import.meta.env.VITE_API_URL || - "http://localhost:8080"; + import.meta.env.VITE_API_URL || "http://localhost:8080"; // On logout, clear any cached PAT and stop the daemon so that a subsequent // login as a different user never inherits the previous user's credentials. @@ -149,8 +143,8 @@ export default function App() { return ( diff --git a/package.json b/package.json index e8aaa1338..3b6e4272e 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,6 @@ "scripts": { "dev:web": "turbo dev --filter=@multica/web", "dev:desktop": "turbo dev --filter=@multica/desktop", - "dev:desktop:remote": "pnpm --filter @multica/desktop dev:remote", "build": "turbo build", "typecheck": "turbo typecheck", "test": "turbo test",