diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-04-17 15:36:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 15:36:23 -0400 |
| commit | d2d62b6312f9c09f91e26acd0b4d88b3ddcf94cf (patch) | |
| tree | f2f5f0eb14e76e38876b3c219c859405fa664aef /cli/proc_state.rs | |
| parent | 559a61b879366c01fbbc078c03743cd836189ae7 (diff) | |
refactor(npm): add CliNodeResolver (#18742)
Diffstat (limited to 'cli/proc_state.rs')
| -rw-r--r-- | cli/proc_state.rs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cli/proc_state.rs b/cli/proc_state.rs index 728363bc2..75466e5fe 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -17,6 +17,7 @@ use crate::graph_util::ModuleGraphBuilder; use crate::graph_util::ModuleGraphContainer; use crate::http_util::HttpClient; use crate::module_loader::ModuleLoadPreparer; +use crate::node::CliNodeResolver; use crate::node::NodeCodeTranslator; use crate::npm::create_npm_fs_resolver; use crate::npm::CliNpmRegistryApi; @@ -75,6 +76,7 @@ pub struct Inner { pub module_graph_builder: Arc<ModuleGraphBuilder>, pub module_load_preparer: Arc<ModuleLoadPreparer>, pub node_code_translator: Arc<NodeCodeTranslator>, + pub node_resolver: Arc<CliNodeResolver>, pub npm_api: Arc<CliNpmRegistryApi>, pub npm_cache: Arc<NpmCache>, pub npm_resolver: Arc<NpmPackageResolver>, @@ -145,6 +147,7 @@ impl ProcState { module_graph_builder: self.module_graph_builder.clone(), module_load_preparer: self.module_load_preparer.clone(), node_code_translator: self.node_code_translator.clone(), + node_resolver: self.node_resolver.clone(), npm_api: self.npm_api.clone(), npm_cache: self.npm_cache.clone(), npm_resolver: self.npm_resolver.clone(), @@ -306,10 +309,15 @@ impl ProcState { file_fetcher.clone(), npm_resolver.clone(), )); + let node_resolver = Arc::new(CliNodeResolver::new( + npm_resolution.clone(), + npm_resolver.clone(), + )); let type_checker = Arc::new(TypeChecker::new( dir.clone(), caches.clone(), cli_options.clone(), + node_resolver.clone(), npm_resolver.clone(), )); let module_graph_builder = Arc::new(ModuleGraphBuilder::new( @@ -357,6 +365,7 @@ impl ProcState { maybe_file_watcher_reporter, module_graph_builder, node_code_translator, + node_resolver, npm_api, npm_cache, npm_resolver, |