fix(serve): actually wire up resolving main module with import map for deno serve (#29974)
Some checks are pending
ci / test debug macos-x86_64 (push) Blocked by required conditions
ci / test release macos-x86_64 (push) Blocked by required conditions
ci / test debug windows-x86_64 (push) Blocked by required conditions
ci / test release windows-x86_64 (push) Blocked by required conditions
ci / build libs (push) Blocked by required conditions
ci / pre-build (push) Waiting to run
ci / test debug linux-aarch64 (push) Blocked by required conditions
ci / test release linux-aarch64 (push) Blocked by required conditions
ci / test debug macos-aarch64 (push) Blocked by required conditions
ci / test release macos-aarch64 (push) Blocked by required conditions
ci / bench release linux-x86_64 (push) Blocked by required conditions
ci / lint debug linux-x86_64 (push) Blocked by required conditions
ci / lint debug macos-x86_64 (push) Blocked by required conditions
ci / lint debug windows-x86_64 (push) Blocked by required conditions
ci / test debug linux-x86_64 (push) Blocked by required conditions
ci / test release linux-x86_64 (push) Blocked by required conditions
ci / publish canary (push) Blocked by required conditions

Closes https://github.com/denoland/deno/issues/29897
This commit is contained in:
Nathan Whitaker 2025-07-02 11:29:23 -07:00 committed by GitHub
parent 3a94adf956
commit 0470cb3ada
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 30 additions and 1 deletions

View file

@ -17,6 +17,7 @@ use crate::args::parallelism_count;
use crate::args::Flags;
use crate::args::ServeFlags;
use crate::args::WatchFlagsWithPaths;
use crate::args::WorkspaceMainModuleResolver;
use crate::factory::CliFactory;
use crate::util::file_watcher::WatcherRestartMode;
use crate::worker::CliMainWorkerFactory;
@ -51,7 +52,12 @@ pub async fn serve(
deno_dir.upgrade_check_file_path(),
);
let main_module = cli_options.resolve_main_module()?;
let workspace_resolver = factory.workspace_resolver().await?.clone();
let node_resolver = factory.node_resolver().await?.clone();
let main_module = cli_options.resolve_main_module_with_resolver(Some(
&WorkspaceMainModuleResolver::new(workspace_resolver, node_resolver),
))?;
maybe_npm_install(&factory).await?;