Skip to content

fix(desktop): make dev server port configuration more flexible #6947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aspiers wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −5
Open

fix(desktop): make dev server port configuration more flexible #6947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/desktop/src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion packages/desktop/src-tauri/tauri.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"version": "../package.json",
"build": {
"beforeDevCommand": "bun run dev",
"devUrl": "http://localhost:1420",
"beforeBuildCommand": "bun run build",
"frontendDist": "../dist"
},
Expand Down
3 changes: 1 addition & 2 deletions packages/desktop/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
? {
Expand Down