diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-05-01 08:59:38 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-01 08:59:38 -0400 |
commit | 94a148cdb6f7660518c75a3c20109bf64848f0f1 (patch) | |
tree | 65e7dbc195090fdbe74bfd3fb5e0ff9231d7a448 /cli/proc_state.rs | |
parent | 89160e7cd8647fdf2ebaec45259775be89aa69c7 (diff) |
refactor(cli): use CliMainWorker in standalone (#18880)
Uses `CliMainWorker` in all the cli code.
Diffstat (limited to 'cli/proc_state.rs')
-rw-r--r-- | cli/proc_state.rs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/cli/proc_state.rs b/cli/proc_state.rs index 321bf45c3..6c1a5e7c5 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -34,6 +34,7 @@ use crate::util::progress_bar::ProgressBar; use crate::util::progress_bar::ProgressBarStyle; use crate::worker::CliMainWorkerFactory; use crate::worker::CliMainWorkerOptions; +use crate::worker::HasNodeSpecifierChecker; use deno_core::error::AnyError; use deno_core::parking_lot::Mutex; @@ -334,9 +335,9 @@ impl ProcState { StorageKeyResolver::from_options(&self.options), self.npm_resolver.clone(), self.node_resolver.clone(), - self.graph_container.clone(), + Box::new(CliHasNodeSpecifierChecker(self.graph_container.clone())), self.blob_store.clone(), - CliModuleLoaderFactory::new( + Box::new(CliModuleLoaderFactory::new( &self.options, self.emitter.clone(), self.graph_container.clone(), @@ -348,7 +349,7 @@ impl ProcState { self.node_code_translator.clone(), self.node_resolver.clone(), ), - ), + )), self.root_cert_store.clone(), self.node_fs.clone(), self.maybe_inspector_server.clone(), @@ -383,7 +384,7 @@ impl ProcState { } maybe_binary_command_name }, - origin_data_folder_path: self.dir.origin_data_folder_path(), + origin_data_folder_path: Some(self.dir.origin_data_folder_path()), seed: self.options.seed(), unsafely_ignore_certificate_errors: self .options @@ -395,6 +396,14 @@ impl ProcState { } } +struct CliHasNodeSpecifierChecker(Arc<ModuleGraphContainer>); + +impl HasNodeSpecifierChecker for CliHasNodeSpecifierChecker { + fn has_node_specifier(&self) -> bool { + self.0.graph().has_node_specifier + } +} + /// Keeps track of what module specifiers were resolved as CJS. #[derive(Default)] pub struct CjsResolutionStore(Mutex<HashSet<ModuleSpecifier>>); |