diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-05-28 14:58:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 14:58:43 -0400 |
| commit | 448fe67b7a2142f62332b651f9d215534dceb1f5 (patch) | |
| tree | 3cfc763f39bf275a537e6228767b3e43866f5d0f /cli/npm/managed/mod.rs | |
| parent | cd8f5f53f7616e4c74de0f1ff5eadd6ef024118a (diff) | |
feat(vendor): support modifying remote files in vendor folder without checksum errors (#23979)
Includes:
* https://github.com/denoland/deno_graph/pull/486
* https://github.com/denoland/deno_graph/pull/488
* https://github.com/denoland/deno_lockfile/pull/25
* https://github.com/denoland/deno_lockfile/pull/22
* https://github.com/denoland/deno_graph/pull/483
* https://github.com/denoland/deno_graph/pull/470
Diffstat (limited to 'cli/npm/managed/mod.rs')
| -rw-r--r-- | cli/npm/managed/mod.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cli/npm/managed/mod.rs b/cli/npm/managed/mod.rs index 3a2657cfb..938c16d9a 100644 --- a/cli/npm/managed/mod.rs +++ b/cli/npm/managed/mod.rs @@ -370,9 +370,8 @@ impl ManagedCliNpmResolver { self.fs_resolver.cache_packages().await?; // If there's a lock file, update it with all discovered npm packages - if let Some(lockfile_mutex) = &self.maybe_lockfile { - let mut lockfile = lockfile_mutex.lock(); - self.lock(&mut lockfile)?; + if let Some(lockfile) = &self.maybe_lockfile { + self.lock(&mut lockfile.lock()); } Ok(()) @@ -401,7 +400,7 @@ impl ManagedCliNpmResolver { .serialized_valid_snapshot_for_system(system_info) } - pub fn lock(&self, lockfile: &mut Lockfile) -> Result<(), AnyError> { + pub fn lock(&self, lockfile: &mut Lockfile) { self.resolution.lock(lockfile) } |