Skip to content

fix(desktop): sync release-pipeline fixes into main #38

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

Merged
huyplb merged 3 commits into from
Jul 6, 2026
Merged

fix(desktop): sync release-pipeline fixes into main #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7573a69
fix(desktop): update to rand 0.10's renamed API
huyplb Jul 6, 2026
96a3373
fix(desktop): make build:frontend Windows-compatible
huyplb Jul 6, 2026
61cfbc7
Merge branch 'main' into release/v0.1.0
huyplb Jul 6, 2026
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
3 changes: 2 additions & 1 deletion apps/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.1.4",
"type": "module",
"scripts": {
"build:frontend": "cd ../web && VITE_EDITION=community vite build --outDir ../desktop/src-tauri/frontendDist --emptyOutDir",
"build:frontend": "cd ../web && cross-env VITE_EDITION=community vite build --outDir ../desktop/src-tauri/frontendDist --emptyOutDir",
"build:sidecar": "node scripts/build-sidecar.mjs",
"dev:frontend": "cd ../web && vite",
"predev": "npm run build:sidecar",
Expand All @@ -15,6 +15,7 @@
},
"devDependencies": {
"@tauri-apps/cli": "^2",
"cross-env": "^7.0.3",
"esbuild": "^0.28.0"
}
}
4 changes: 2 additions & 2 deletions apps/desktop/src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::net::TcpListener;
use std::path::PathBuf;
use std::sync::Mutex;

use rand::RngCore;
use rand::RngExt;
use serde::{Deserialize, Serialize};
use tauri::{AppHandle, Manager, RunEvent, State};
use tauri_plugin_shell::process::{CommandChild, CommandEvent};
Expand Down Expand Up @@ -65,7 +65,7 @@ fn free_port() -> u16 {

fn random_key_hex() -> String {
let mut bytes = [0u8; 32];
rand::thread_rng().fill_bytes(&mut bytes);
rand::rng().fill(&mut bytes);
bytes.iter().map(|b| format!("{:02x}", b)).collect()
}

Expand Down
Loading