diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-09-30 12:06:38 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-30 12:06:38 -0400 |
commit | 8d24be1a59714761665516e0d78d25059608c29b (patch) | |
tree | aed0140b63441008cb9b549d44948f7a36a4f5f1 /cli/factory.rs | |
parent | 1cda3840ff673512f7c6d58fa8402c35c760bc3b (diff) |
refactor(npm): create `cli::npm::managed` module (#20740)
Creates the `cli::npm::managed` module and starts moving more
functionality into it.
Diffstat (limited to 'cli/factory.rs')
-rw-r--r-- | cli/factory.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cli/factory.rs b/cli/factory.rs index c56f64139..8a58062c7 100644 --- a/cli/factory.rs +++ b/cli/factory.rs @@ -354,10 +354,12 @@ impl CliFactory { self.options.npm_system_info(), ); Ok(Arc::new(ManagedCliNpmResolver::new( + self.npm_api()?.clone(), fs.clone(), npm_resolution.clone(), npm_fs_resolver, self.maybe_lockfile().as_ref().cloned(), + self.package_json_deps_installer().await?.clone(), )) as Arc<dyn CliNpmResolver>) }) .await @@ -428,17 +430,18 @@ impl CliFactory { .resolver .get_or_try_init_async(async { Ok(Arc::new(CliGraphResolver::new( - self.npm_api()?.clone(), - self.npm_resolution().await?.clone(), + if self.options.no_npm() { + None + } else { + Some(self.npm_resolver().await?.clone()) + }, self.package_json_deps_provider().clone(), - self.package_json_deps_installer().await?.clone(), CliGraphResolverOptions { maybe_jsx_import_source_config: self .options .to_maybe_jsx_import_source_config()?, maybe_import_map: self.maybe_import_map().await?.clone(), maybe_vendor_dir: self.options.vendor_dir_path(), - no_npm: self.options.no_npm(), }, ))) }) |