From 8d8e7edb8279af6eca2ea75e2ef1a26f8a52f64d Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 13 Mar 2024 14:36:56 -0700 Subject: [PATCH] Clean up reloader --- packages/cli/src/server/desktop/mod.rs | 2 +- packages/cli/src/server/mod.rs | 4 +--- packages/cli/src/server/web/server.rs | 19 ++++--------------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/packages/cli/src/server/desktop/mod.rs b/packages/cli/src/server/desktop/mod.rs index e6261eb43..d5b5c7b11 100644 --- a/packages/cli/src/server/desktop/mod.rs +++ b/packages/cli/src/server/desktop/mod.rs @@ -6,7 +6,7 @@ use crate::{ }, BuildResult, Result, }; -use dioxus_cli_config::{CrateConfig, ExecutableType}; +use dioxus_cli_config::CrateConfig; use dioxus_hot_reload::HotReloadMsg; use dioxus_html::HtmlCtx; use dioxus_rsx::hot_reload::*; diff --git a/packages/cli/src/server/mod.rs b/packages/cli/src/server/mod.rs index e2931d391..7dfb24ac0 100644 --- a/packages/cli/src/server/mod.rs +++ b/packages/cli/src/server/mod.rs @@ -207,8 +207,6 @@ fn hotreload_files( return; } - println!("Hot reloading: {:?}", messages); - for msg in messages { let _ = hot_reload.messages.send(msg); } @@ -237,7 +235,7 @@ fn hotreload_file( // If the extension is a backup file, or a hidden file, ignore it completely (no rebuilds) if is_backup_file(path) { - println!("Ignoring backup file: {:?}", path); + log::trace!("Ignoring backup file: {:?}", path); return None; } diff --git a/packages/cli/src/server/web/server.rs b/packages/cli/src/server/web/server.rs index efb277765..f70ce221c 100644 --- a/packages/cli/src/server/web/server.rs +++ b/packages/cli/src/server/web/server.rs @@ -1,16 +1,5 @@ -use std::{fs, io, process::Command, sync::Arc}; - -use crate::{ - builder, - serve::Serve, - server::{ - output::{print_console_info, PrettierOptions, WebServerInfo}, - setup_file_watcher, HotReloadState, - }, - BuildResult, Result, -}; -use tower::ServiceBuilder; - +use super::{hot_reload::*, WsReloadState}; +use crate::{server::HotReloadState, Result}; use axum::{ body::Body, extract::{ @@ -28,8 +17,8 @@ use axum::{ }; use axum_server::tls_rustls::RustlsConfig; use dioxus_cli_config::{CrateConfig, WebHttpsConfig}; - -use super::{hot_reload::*, WsReloadState}; +use std::{fs, io, process::Command, sync::Arc}; +use tower::ServiceBuilder; use tower_http::{ cors::{Any, CorsLayer}, services::fs::{ServeDir, ServeFileSystemResponseBody},