Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-23 12:43:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: full & hot reload

Browse source
This commit is contained in:
Miles Murgaw 2023-07-12 02:09:13 -04:00
parent 5bc9e4556b
commit 120fccc53d
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/cli/src/server/mod.rs
View file

@ -103,7 +103,11 @@ pub async fn serve_default(
// WS Reload Watching // WS Reload Watching
let (reload_tx, _) = broadcast::channel(100); let (reload_tx, _) = broadcast::channel(100);
setup_file_watcher(&config, port, ip.clone(), reload_tx.clone()).await?;
// We got to own watcher so that it exists for the duration of serve
// Otherwise full reload won't work.
let _watcher = setup_file_watcher(&config, port, ip.clone(), reload_tx.clone()).await?;
let ws_reload_state = Arc::new(WsReloadState { let ws_reload_state = Arc::new(WsReloadState {
update: reload_tx.clone(), update: reload_tx.clone(),
}); });
@ -174,7 +178,9 @@ pub async fn serve_hot_reload(
}); });
// Setup file watcher // Setup file watcher
setup_file_watcher_hot_reload( // We got to own watcher so that it exists for the duration of serve
// Otherwise hot reload won't work.
let _watcher = setup_file_watcher_hot_reload(
&config, &config,
port, port,
ip.clone(), ip.clone(),
@ -235,7 +241,7 @@ async fn get_rustls(config: &CrateConfig) -> Result<Option<RustlsConfig>> {
// Create ssl directory if using defaults // Create ssl directory if using defaults
if key_path == DEFAULT_KEY_PATH && cert_path == DEFAULT_CERT_PATH { if key_path == DEFAULT_KEY_PATH && cert_path == DEFAULT_CERT_PATH {
fs::create_dir("ssl")?; _ = fs::create_dir("ssl");
} }
let cmd = Command::new("mkcert") let cmd = Command::new("mkcert")
@ -432,7 +438,7 @@ async fn setup_file_watcher(
port: u16, port: u16,
watcher_ip: String, watcher_ip: String,
reload_tx: Sender<()>, reload_tx: Sender<()>,
) -> Result<()> { ) -> Result<RecommendedWatcher> {
let build_manager = BuildManager { let build_manager = BuildManager {
config: config.clone(), config: config.clone(),
reload_tx, reload_tx,
@ -491,7 +497,7 @@ async fn setup_file_watcher(
) )
.unwrap(); .unwrap();
} }
Ok(()) Ok(watcher)
} }
// Todo: reduce duplication and merge with setup_file_watcher() // Todo: reduce duplication and merge with setup_file_watcher()
@ -503,7 +509,7 @@ async fn setup_file_watcher_hot_reload(
hot_reload_tx: Sender<Template<'static>>, hot_reload_tx: Sender<Template<'static>>,
file_map: Arc<Mutex<FileMap<HtmlCtx>>>, file_map: Arc<Mutex<FileMap<HtmlCtx>>>,
build_manager: Arc<BuildManager>, build_manager: Arc<BuildManager>,
) -> Result<()> { ) -> Result<RecommendedWatcher> {
// file watcher: check file change // file watcher: check file change
let allow_watch_path = config let allow_watch_path = config
.dioxus_config .dioxus_config
@ -598,7 +604,7 @@ async fn setup_file_watcher_hot_reload(
} }
} }
Ok(()) Ok(watcher)
} }
/// Get the network ip /// Get the network ip