diff --git a/packages/desktop/src-tauri/src/lib.rs b/packages/desktop/src-tauri/src/lib.rs index 4012fe1a587..bfa5fb27509 100644 --- a/packages/desktop/src-tauri/src/lib.rs +++ b/packages/desktop/src-tauri/src/lib.rs @@ -265,8 +265,12 @@ pub fn run() { .map(|m| m.size().to_logical(m.scale_factor())) .unwrap_or(LogicalSize::new(1920, 1080)); - let mut window_builder = - WebviewWindow::builder(&app, "main", WebviewUrl::App("/".into())) + let dev_url = match app.config().build.dev_url.as_ref() { + Some(url) => url.clone(), + None => "http://localhost:1420".parse().unwrap(), + }; + let window_builder = + WebviewWindow::builder(&app, "main", WebviewUrl::External(dev_url)) .title("OpenCode") .inner_size(size.width as f64, size.height as f64) .decorations(true) diff --git a/packages/desktop/src-tauri/tauri.conf.json b/packages/desktop/src-tauri/tauri.conf.json index bcb067a3207..1d6f51cdc66 100644 --- a/packages/desktop/src-tauri/tauri.conf.json +++ b/packages/desktop/src-tauri/tauri.conf.json @@ -6,7 +6,6 @@ "version": "../package.json", "build": { "beforeDevCommand": "bun run dev", - "devUrl": "http://localhost:1420", "beforeBuildCommand": "bun run build", "frontendDist": "../dist" }, diff --git a/packages/desktop/vite.config.ts b/packages/desktop/vite.config.ts index 37bc633930e..2d4fdd7f9f1 100644 --- a/packages/desktop/vite.config.ts +++ b/packages/desktop/vite.config.ts @@ -17,10 +17,9 @@ export default defineConfig({ // build: { // sourcemap: true, // }, - // 2. tauri expects a fixed port, fail if that port is not available server: { port: 1420, - strictPort: true, + strictPort: false, host: host || false, hmr: host ? {