From 0e97fa4d5f056e12d3c0704bfb7bcdc56316ef94 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 24 Apr 2023 17:08:11 -0400 Subject: fix(npm): only include top level packages in top level node_modules directory (#18824) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were indeterministically including packages in the top level `node_modules/` folder when using a local node_modules directory. This change aligns with pnpm and only includes top level packages in this folder. This should be faster for initializing the folder, but may expose issues in packages that reference other packages not defined in their dependencies. That said, the behaviour previously was previously broken. This has exposed a bug in the require implementation where it doesn't find a package (which is the main underlying issue here). There is a failing test already for this in the test suite after this change. Closes #18822 --------- Co-authored-by: Bartek Iwańczuk --- cli/npm/resolvers/local.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'cli/npm/resolvers') diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs index d4085f345..a44afc935 100644 --- a/cli/npm/resolvers/local.rs +++ b/cli/npm/resolvers/local.rs @@ -4,7 +4,6 @@ use std::borrow::Cow; use std::collections::HashSet; -use std::collections::VecDeque; use std::fs; use std::path::Path; use std::path::PathBuf; @@ -365,18 +364,16 @@ async fn sync_resolution_with_fs( } } - // 4. Create all the packages in the node_modules folder, which are symlinks. + // 4. Create all the top level packages in the node_modules folder, which are symlinks. // // Symlink node_modules/ to // node_modules/.deno//node_modules/ let mut found_names = HashSet::new(); - let mut pending_packages = VecDeque::new(); - pending_packages.extend(snapshot.top_level_packages().map(|id| (id, true))); - while let Some((id, is_top_level)) = pending_packages.pop_front() { + let mut ids = snapshot.top_level_packages().collect::>(); + ids.sort_by(|a, b| b.cmp(a)); // create determinism and only include the latest version + for id in ids { let root_folder_name = if found_names.insert(id.nv.name.clone()) { id.nv.name.clone() - } else if is_top_level { - id.nv.to_string() } else { continue; // skip, already handled }; @@ -394,9 +391,6 @@ async fn sync_resolution_with_fs( &local_registry_package_path, &join_package_name(root_node_modules_dir_path, &root_folder_name), )?; - for id in package.dependencies.values() { - pending_packages.push_back((id, false)); - } } drop(single_process_lock); -- cgit v1.2.3