1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00

fix(npm): improve peer dependency resolution with circular dependencies (#18069)

This improves peer dependency resolution yet again. We did not handle
scenarios like the following:

```
// a -> b -> c -> d -> c -> b (peer)
```

...which would maybe work ok the first time its run in some cases, but
then lead to a lockfile that would error on load.

This now keeps track of circular dependencies and updates nodes
accordingly. That said, there is still a lurking bug in this code
somewhere that I've added a comment for (there is a mitigation on the
tail end that seems to work well). The current state is much better than
before and I can look into it later. I think it's something small that's
incorrect.
This commit is contained in:
David Sherret 2023-03-08 12:22:08 -05:00 committed by GitHub
parent 0cce9c2bcc
commit 23e1ba7e2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1257 additions and 1197 deletions

1
.gitignore vendored
View file

@ -5,6 +5,7 @@
/.cargo_home/ /.cargo_home/
/.idea/ /.idea/
/.vs/
/.vscode/ /.vscode/
gclient_config.py_entries gclient_config.py_entries
/gh-pages/ /gh-pages/

View file

@ -15,6 +15,7 @@ use deno_core::parking_lot::Mutex;
use deno_core::url::Url; use deno_core::url::Url;
use deno_graph::npm::NpmPackageNv; use deno_graph::npm::NpmPackageNv;
use deno_graph::semver::Version; use deno_graph::semver::Version;
use once_cell::sync::Lazy;
use crate::args::CacheSetting; use crate::args::CacheSetting;
use crate::cache::DenoDir; use crate::cache::DenoDir;
@ -27,10 +28,15 @@ use crate::util::progress_bar::ProgressBar;
use super::registry::NpmPackageVersionDistInfo; use super::registry::NpmPackageVersionDistInfo;
use super::tarball::verify_and_extract_tarball; use super::tarball::verify_and_extract_tarball;
static SHOULD_SYNC_DOWNLOAD: Lazy<bool> =
Lazy::new(|| std::env::var("DENO_UNSTABLE_NPM_SYNC_DOWNLOAD").is_ok());
/// For some of the tests, we want downloading of packages /// For some of the tests, we want downloading of packages
/// to be deterministic so that the output is always the same /// to be deterministic so that the output is always the same
pub fn should_sync_download() -> bool { pub fn should_sync_download() -> bool {
std::env::var("DENO_UNSTABLE_NPM_SYNC_DOWNLOAD").is_ok() // this gets called a lot when doing npm resolution and was taking
// a significant amount of time, so cache it in a lazy
*SHOULD_SYNC_DOWNLOAD
} }
const NPM_PACKAGE_SYNC_LOCK_FILENAME: &str = ".deno_sync_lock"; const NPM_PACKAGE_SYNC_LOCK_FILENAME: &str = ".deno_sync_lock";

File diff suppressed because it is too large Load diff