2 files changed, 7 insertions, 11 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)
   }
 
diff --git a/cli/npm/managed/resolution.rs b/cli/npm/managed/resolution.rs
index 1903d339b..9cea5d305 100644
--- a/cli/npm/managed/resolution.rs
+++ b/cli/npm/managed/resolution.rs
@@ -292,7 +292,7 @@ impl NpmResolution {
       .as_valid_serialized_for_system(system_info)
   }
 
-  pub fn lock(&self, lockfile: &mut Lockfile) -> Result<(), AnyError> {
+  pub fn lock(&self, lockfile: &mut Lockfile) {
     let snapshot = self.snapshot.read();
     populate_lockfile_from_snapshot(lockfile, &snapshot)
   }
@@ -345,7 +345,7 @@ async fn add_package_reqs_to_snapshot(
 
   if let Some(lockfile_mutex) = maybe_lockfile {
     let mut lockfile = lockfile_mutex.lock();
-    populate_lockfile_from_snapshot(&mut lockfile, &snapshot)?;
+    populate_lockfile_from_snapshot(&mut lockfile, &snapshot);
   }
 
   Ok(snapshot)
@@ -369,7 +369,7 @@ fn get_npm_pending_resolver(
 fn populate_lockfile_from_snapshot(
   lockfile: &mut Lockfile,
   snapshot: &NpmResolutionSnapshot,
-) -> Result<(), AnyError> {
+) {
   for (package_req, nv) in snapshot.package_reqs() {
     lockfile.insert_package_specifier(
       format!("npm:{}", package_req),
@@ -384,10 +384,8 @@ fn populate_lockfile_from_snapshot(
     );
   }
   for package in snapshot.all_packages_for_every_system() {
-    lockfile
-      .check_or_insert_npm_package(npm_package_to_lockfile_info(package))?;
+    lockfile.insert_npm_package(npm_package_to_lockfile_info(package));
   }
-  Ok(())
 }
 
 fn npm_package_to_lockfile_info(
@@ -403,7 +401,6 @@ fn npm_package_to_lockfile_info(
     .collect();
 
   NpmPackageLockfileInfo {
-    display_id: pkg.id.nv.to_string(),
     serialized_id: pkg.id.as_serialized(),
     integrity: pkg.dist.integrity().for_lockfile(),
     dependencies,