From 5f5ac4063142c6c411486581f2f26cf51a32d7e3 Mon Sep 17 00:00:00 2001
From: HasanAlrimawi <141642411+HasanAlrimawi@users.noreply.github.com>
Date: Wed, 30 Oct 2024 19:32:18 +0200
Subject: fix(serve): support serve hmr (#26078)

This PR addresses issue #25600

Changes:
Updated `fn has_hmr` to check `serve` subcommand and return its hmr
value if found, in order to run the worker in serve mode with
hmr_runner. Thus the hmr event can be dispatched upon changes on the
file served.
---
 cli/tools/serve.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'cli/tools/serve.rs')

diff --git a/cli/tools/serve.rs b/cli/tools/serve.rs
index 4ce1cad6f..e3f9e94f8 100644
--- a/cli/tools/serve.rs
+++ b/cli/tools/serve.rs
@@ -44,12 +44,15 @@ pub async fn serve(
   maybe_npm_install(&factory).await?;
 
   let worker_factory = factory.create_cli_main_worker_factory().await?;
-
+  let hmr = serve_flags
+    .watch
+    .map(|watch_flags| watch_flags.hmr)
+    .unwrap_or(false);
   do_serve(
     worker_factory,
     main_module.clone(),
     serve_flags.worker_count,
-    false,
+    hmr,
   )
   .await
 }
@@ -109,8 +112,6 @@ async fn do_serve(
     }
   }
   Ok(exit_code)
-
-  // main.await?
 }
 
 async fn run_worker(
@@ -119,7 +120,7 @@ async fn run_worker(
   main_module: ModuleSpecifier,
   hmr: bool,
 ) -> Result<i32, AnyError> {
-  let mut worker = worker_factory
+  let mut worker: crate::worker::CliMainWorker = worker_factory
     .create_main_worker(
       deno_runtime::WorkerExecutionMode::Serve {
         is_main: false,
-- 
cgit v1.2.3


From abf06eb87f10ebed93b39948213dccfe086bd0fa Mon Sep 17 00:00:00 2001
From: HasanAlrimawi <141642411+HasanAlrimawi@users.noreply.github.com>
Date: Sat, 16 Nov 2024 16:59:31 +0200
Subject: feat(watch): log which file changed on HMR or watch change (#25801)

Closes #25504
---
 cli/tools/serve.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cli/tools/serve.rs')

diff --git a/cli/tools/serve.rs b/cli/tools/serve.rs
index e3f9e94f8..d7989140a 100644
--- a/cli/tools/serve.rs
+++ b/cli/tools/serve.rs
@@ -151,7 +151,8 @@ async fn serve_with_watch(
       !watch_flags.no_clear_screen,
     ),
     WatcherRestartMode::Automatic,
-    move |flags, watcher_communicator, _changed_paths| {
+    move |flags, watcher_communicator, changed_paths| {
+      watcher_communicator.show_path_changed(changed_paths.clone());
       Ok(async move {
         let factory = CliFactory::from_flags_for_watcher(
           flags,
-- 
cgit v1.2.3