diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-02-21 12:03:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-21 12:03:48 -0500 |
| commit | 3479bc76613761cf31f7557d482e691274c365f1 (patch) | |
| tree | cd608c4206d61cde4141ea3ecfe5f4ef285b1d80 /cli/lsp/language_server.rs | |
| parent | 608c855f1166e0ed76762fd9afd00bb52cc65032 (diff) | |
fix(npm): improve peer dependency resolution (#17835)
This PR fixes peer dependency resolution to only resolve peers based on
the current graph traversal path. Previously, it would resolve a peers
by looking at a graph node's ancestors, which is not correct because
graph nodes are shared by different resolutions.
It also stores more information about peer dependency resolution in the
lockfile.
Diffstat (limited to 'cli/lsp/language_server.rs')
| -rw-r--r-- | cli/lsp/language_server.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 1bde85d8f..33b3379a2 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -73,7 +73,7 @@ use crate::graph_util; use crate::http_util::HttpClient; use crate::npm::NpmCache; use crate::npm::NpmPackageResolver; -use crate::npm::RealNpmRegistryApi; +use crate::npm::NpmRegistryApi; use crate::proc_state::ProcState; use crate::tools::fmt::format_file; use crate::tools::fmt::format_parsed_source; @@ -304,7 +304,7 @@ fn create_lsp_npm_resolver( dir: &DenoDir, http_client: HttpClient, ) -> NpmPackageResolver { - let registry_url = RealNpmRegistryApi::default_url(); + let registry_url = NpmRegistryApi::default_url(); let progress_bar = ProgressBar::new(ProgressBarStyle::TextOnly); let npm_cache = NpmCache::from_deno_dir( dir, @@ -316,8 +316,8 @@ fn create_lsp_npm_resolver( http_client.clone(), progress_bar.clone(), ); - let api = RealNpmRegistryApi::new( - registry_url, + let api = NpmRegistryApi::new( + registry_url.clone(), npm_cache.clone(), http_client, progress_bar, |