summaryrefslogtreecommitdiff
path: root/cli/npm/managed/resolvers/local.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-12-06 14:24:00 -0500
committerGitHub <noreply@github.com>2023-12-06 14:24:00 -0500
commit9bdc9e4ecb7227c80384206f6d7f869f183e4525 (patch)
tree8160f7388a7aca3710ef6546653a8f130ca28851 /cli/npm/managed/resolvers/local.rs
parentf75eb12801134dadb63327a18ea718af3f06b4eb (diff)
fix(npm): do not create symlink for non-system optional dep in node_modules directory (#21478)
Closes https://github.com/denoland/deno/issues/21476
Diffstat (limited to 'cli/npm/managed/resolvers/local.rs')
-rw-r--r--cli/npm/managed/resolvers/local.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/cli/npm/managed/resolvers/local.rs b/cli/npm/managed/resolvers/local.rs
index 4051c9c31..84fd488f4 100644
--- a/cli/npm/managed/resolvers/local.rs
+++ b/cli/npm/managed/resolvers/local.rs
@@ -388,10 +388,13 @@ async fn sync_resolution_with_fs(
.join("node_modules");
let mut dep_setup_cache = setup_cache.with_dep(&package_folder_name);
for (name, dep_id) in &package.dependencies {
- let dep_cache_folder_id = snapshot
- .package_from_id(dep_id)
- .unwrap()
- .get_package_cache_folder_id();
+ let dep = snapshot.package_from_id(dep_id).unwrap();
+ if package.optional_dependencies.contains(name)
+ && !dep.system.matches_system(system_info)
+ {
+ continue; // this isn't a dependency for the current system
+ }
+ let dep_cache_folder_id = dep.get_package_cache_folder_id();
let dep_folder_name =
get_package_folder_id_folder_name(&dep_cache_folder_id);
if dep_setup_cache.insert(name, &dep_folder_name) {