From 136dce67cec749dce5989ea29e88359ef79a0045 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Fri, 14 Apr 2023 16:22:33 -0400 Subject: refactor: break up `ProcState` (#18707) 1. Breaks up functionality within `ProcState` into several other structs to break out the responsibilities (`ProcState` is only a data struct now). 2. Moves towards being able to inject dependencies more easily and have functionality only require what it needs. 3. Exposes `Arc` around the "service structs" instead of it being embedded within them. The idea behind embedding them was to reduce the verbosity of needing to pass around `Arc<...>`, but I don't think it was exactly working and as we move more of these structs to be more injectable I don't think the extra verbosity will be a big deal. --- cli/tools/bundle.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cli/tools/bundle.rs') diff --git a/cli/tools/bundle.rs b/cli/tools/bundle.rs index 77b4f8a46..26d170d7e 100644 --- a/cli/tools/bundle.rs +++ b/cli/tools/bundle.rs @@ -13,7 +13,6 @@ use crate::args::CliOptions; use crate::args::Flags; use crate::args::TsConfigType; use crate::args::TypeCheckMode; -use crate::graph_util::create_graph_and_maybe_check; use crate::graph_util::error_for_any_npm_specifier; use crate::proc_state::ProcState; use crate::util; @@ -42,9 +41,10 @@ pub async fn bundle( async move { log::debug!(">>>>> bundle START"); let ps = ProcState::from_cli_options(cli_options).await?; - let graph = - create_graph_and_maybe_check(vec![module_specifier.clone()], &ps) - .await?; + let graph = ps + .module_graph_builder + .create_graph_and_maybe_check(vec![module_specifier.clone()]) + .await?; let mut paths_to_watch: Vec = graph .specifiers() -- cgit v1.2.3