CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-05 10:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps) Update Tauri CLI (1.x) (#7641)

Browse Source 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
This commit is contained in:
renovate[bot]
2023-10-18 09:48:30 -03:00
committed by GitHub
parent 99865d9e9a
commit 94bef1c705
5 changed files with 194 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tooling/cli/src/helpers/web_dev_server.rs
View File

@@ -4,7 +4,7 @@
use axum::{
extract::{ws::WebSocket, WebSocketUpgrade},
http::{header::CONTENT_TYPE, Request, StatusCode},
http::{header::CONTENT_TYPE, StatusCode},
response::IntoResponse,
routing::get,
Router, Server,
@@ -67,17 +67,9 @@ pub fn start_dev_server<P: AsRef<Path>>(path: P, port: Option<u16>) -> crate::Re
});
let state = Arc::new(State { serve_dir, tx });
let state_ = state.clone();
let router = Router::new()
.fallback(
Router::new().nest(
"/",
get({
let state = state.clone();
move |req| handler(req, state)
})
.handle_error(|_error| async move { StatusCode::INTERNAL_SERVER_ERROR }),
),
)
.fallback(move |uri| handler(uri, state_))
.route(
"/_tauri-cli/ws",
get(move |ws: WebSocketUpgrade| async move {
@@ -130,8 +122,8 @@ pub fn start_dev_server<P: AsRef<Path>>(path: P, port: Option<u16>) -> crate::Re
server_url_rx.recv().unwrap()
}
async fn handler<T>(req: Request<T>, state: Arc<State>) -> impl IntoResponse {
let uri = req.uri().to_string();
async fn handler(uri: axum::http::Uri, state: Arc<State>) -> impl IntoResponse {
let uri = uri.to_string();
let uri = if uri == "/" {
&uri
} else {