1 files changed, 12 insertions, 7 deletions
diff --git a/cli/main.rs b/cli/main.rs
index 02ac5891c..85942cbd8 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -6,6 +6,7 @@ mod cache;
 mod deno_std;
 mod emit;
 mod errors;
+mod factory;
 mod file_fetcher;
 mod graph_util;
 mod http_util;
@@ -16,19 +17,18 @@ mod napi;
 mod node;
 mod npm;
 mod ops;
-mod proc_state;
 mod resolver;
 mod standalone;
 mod tools;
 mod tsc;
 mod util;
 mod version;
+mod watcher;
 mod worker;
 
 use crate::args::flags_from_vec;
 use crate::args::DenoSubcommand;
 use crate::args::Flags;
-use crate::proc_state::ProcState;
 use crate::resolver::CliGraphResolver;
 use crate::util::display;
 use crate::util::v8::get_v8_flags_from_env;
@@ -41,6 +41,7 @@ use deno_core::error::JsError;
 use deno_runtime::colors;
 use deno_runtime::fmt_errors::format_js_error;
 use deno_runtime::tokio_util::run_local;
+use factory::CliFactory;
 use std::env;
 use std::env::current_exe;
 use std::path::PathBuf;
@@ -70,16 +71,20 @@ async fn run_subcommand(flags: Flags) -> Result<i32, AnyError> {
       tools::run::eval_command(flags, eval_flags).await
     }
     DenoSubcommand::Cache(cache_flags) => {
-      let ps = ProcState::from_flags(flags).await?;
-      ps.module_load_preparer
+      let factory = CliFactory::from_flags(flags).await?;
+      let module_load_preparer = factory.module_load_preparer().await?;
+      let emitter = factory.emitter()?;
+      let graph_container = factory.graph_container();
+      module_load_preparer
         .load_and_type_check_files(&cache_flags.files)
         .await?;
-      ps.emitter.cache_module_emits(&ps.graph_container.graph())?;
+      emitter.cache_module_emits(&graph_container.graph())?;
       Ok(0)
     }
     DenoSubcommand::Check(check_flags) => {
-      let ps = ProcState::from_flags(flags).await?;
-      ps.module_load_preparer
+      let factory = CliFactory::from_flags(flags).await?;
+      let module_load_preparer = factory.module_load_preparer().await?;
+      module_load_preparer
         .load_and_type_check_files(&check_flags.files)
         .await?;
       Ok(0)