diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-10-03 19:05:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-03 19:05:06 -0400 |
| commit | 8c1677ecbcbb474fc6a5ac9b5f73b562677bb829 (patch) | |
| tree | 885a45a67e6aed7dc70307df718b176a729c8655 /cli/tsc | |
| parent | 494822175fd69f8c20a2e21ddcedcb3287064cce (diff) | |
refactor(npm): break up `NpmModuleLoader` and move more methods into the managed `CliNpmResolver` (#20777)
Part of https://github.com/denoland/deno/issues/18967
Diffstat (limited to 'cli/tsc')
| -rw-r--r-- | cli/tsc/mod.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs index cd3d9ecae..c7371e0c5 100644 --- a/cli/tsc/mod.rs +++ b/cli/tsc/mod.rs @@ -657,9 +657,11 @@ fn resolve_graph_specifier_types( Ok(Some((module.specifier.clone(), module.media_type))) } Some(Module::Npm(module)) => { - if let Some(npm) = &state.maybe_npm { + if let Some(npm) = &state.maybe_npm.as_ref() { let package_folder = npm .npm_resolver + .as_managed() + .unwrap() // should never be byonm because it won't create Module::Npm .resolve_pkg_folder_from_deno_module(module.nv_reference.nv())?; let maybe_resolution = npm.node_resolver.resolve_npm_reference( &package_folder, @@ -718,7 +720,7 @@ fn resolve_non_graph_specifier_types( // injected and not part of the graph let package_folder = npm .npm_resolver - .resolve_pkg_folder_from_deno_module_req(npm_req_ref.req())?; + .resolve_pkg_folder_from_deno_module_req(npm_req_ref.req(), referrer)?; let maybe_resolution = node_resolver.resolve_npm_reference( &package_folder, npm_req_ref.sub_path(), |