Skip to content

feat: support unconfigured runtime in serve subcommand #29172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devsnek merged 1 commit into from
May 5, 2025
Merged

feat: support unconfigured runtime in serve subcommand #29172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ async fn run_subcommand(
}
}),
DenoSubcommand::Serve(serve_flags) => spawn_subcommand(async move {
tools::serve::serve(flags, serve_flags).await
tools::serve::serve(flags, serve_flags, unconfigured_runtime, roots).await
}),
DenoSubcommand::Task(task_flags) => spawn_subcommand(async {
tools::task::execute_script(flags, task_flags).await
Expand Down
18 changes: 14 additions & 4 deletions cli/tools/serve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ use deno_core::error::AnyError;
use deno_core::futures::FutureExt;
use deno_core::futures::TryFutureExt;
use deno_core::ModuleSpecifier;
use deno_lib::worker::LibWorkerFactoryRoots;
use deno_runtime::UnconfiguredRuntime;

use super::run::check_permission_before_script;
use super::run::maybe_npm_install;
Expand All @@ -20,6 +22,8 @@ use crate::worker::CliMainWorkerFactory;
pub async fn serve(
flags: Arc<Flags>,
serve_flags: ServeFlags,
unconfigured_runtime: Option<UnconfiguredRuntime>,
roots: LibWorkerFactoryRoots,
) -> Result<i32, AnyError> {
check_permission_before_script(&flags);

Expand All @@ -45,8 +49,11 @@ pub async fn serve(

maybe_npm_install(&factory).await?;

let worker_factory =
Arc::new(factory.create_cli_main_worker_factory().await?);
let worker_factory = Arc::new(
factory
.create_cli_main_worker_factory_with_roots(roots)
.await?,
);

if serve_flags.open_site {
let url = resolve_serve_url(serve_flags.host, serve_flags.port);
Expand All @@ -62,6 +69,7 @@ pub async fn serve(
main_module.clone(),
serve_flags.worker_count,
hmr,
unconfigured_runtime,
)
.await
}
Expand All @@ -71,14 +79,16 @@ async fn do_serve(
main_module: ModuleSpecifier,
worker_count: Option<usize>,
hmr: bool,
unconfigured_runtime: Option<UnconfiguredRuntime>,
) -> Result<i32, AnyError> {
let mut worker = worker_factory
.create_main_worker(
.create_main_worker_with_unconfigured_runtime(
deno_runtime::WorkerExecutionMode::Serve {
is_main: true,
worker_count,
},
main_module.clone(),
unconfigured_runtime,
)
.await?;
let worker_count = match worker_count {
Expand Down Expand Up @@ -176,7 +186,7 @@ async fn serve_with_watch(
let worker_factory =
Arc::new(factory.create_cli_main_worker_factory().await?);

do_serve(worker_factory, main_module.clone(), worker_count, hmr)
do_serve(worker_factory, main_module.clone(), worker_count, hmr, None)
.await?;

Ok(())
Expand Down
Loading