From 35f184cdcca806bda72f65b73c774c53db132a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 23 Oct 2020 23:01:54 +0200 Subject: refactor: use of lock file in ModuleGraph2 (#8087) --- cli/program_state.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cli/program_state.rs') diff --git a/cli/program_state.rs b/cli/program_state.rs index 6e3a51663..a3dd65dc1 100644 --- a/cli/program_state.rs +++ b/cli/program_state.rs @@ -48,7 +48,7 @@ pub struct ProgramState { pub dir: deno_dir::DenoDir, pub file_fetcher: SourceFileFetcher, pub ts_compiler: TsCompiler, - pub lockfile: Option>, + pub lockfile: Option>>, pub maybe_import_map: Option, pub maybe_inspector_server: Option>, } @@ -78,7 +78,7 @@ impl ProgramState { let lockfile = if let Some(filename) = &flags.lock { let lockfile = Lockfile::new(filename.clone(), flags.lock_write)?; - Some(Mutex::new(lockfile)) + Some(Arc::new(Mutex::new(lockfile))) } else { None }; @@ -128,9 +128,10 @@ impl ProgramState { let specifier = specifier.clone(); let handler = Rc::new(RefCell::new(FetchHandler::new(self, dynamic_permissions)?)); - let mut builder = GraphBuilder2::new(handler, maybe_import_map); + let mut builder = + GraphBuilder2::new(handler, maybe_import_map, self.lockfile.clone()); builder.add(&specifier, is_dynamic).await?; - let mut graph = builder.get_graph(&self.lockfile); + let mut graph = builder.get_graph(); let debug = self.flags.log_level == Some(log::Level::Debug); let maybe_config_path = self.flags.config_path.clone(); -- cgit v1.2.3