summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/args/mod.rs6
-rw-r--r--cli/tools/serve.rs11
2 files changed, 12 insertions, 5 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index f5ecc0449..754cd38fa 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -1454,6 +1454,12 @@ impl CliOptions {
}) = &self.flags.subcommand
{
*hmr
+ } else if let DenoSubcommand::Serve(ServeFlags {
+ watch: Some(WatchFlagsWithPaths { hmr, .. }),
+ ..
+ }) = &self.flags.subcommand
+ {
+ *hmr
} else {
false
}
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,