diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-07-23 19:00:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-23 19:00:48 -0400 |
commit | 9114a2df69da9318c4e10887553b7daf77b0fa16 (patch) | |
tree | 2309817e74485f9fe8f7b79238afa026070b79df /cli/tools/doc.rs | |
parent | 6055629ee7f48a4e887392ccac13788aa4008249 (diff) |
fix(upgrade): do not error if config in cwd invalid (#24689)
```
> deno upgrade
error: Unsupported lockfile version 'invalid'. Try upgrading Deno or recreating the lockfile.
V:\scratch
> V:\deno\target\debug\deno upgrade
Looking up latest version
Local deno version 1.45.3 is the most recent release
```
Closes #24517
Closes #20729
Diffstat (limited to 'cli/tools/doc.rs')
-rw-r--r-- | cli/tools/doc.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs index 138e0a47d..824a3fc38 100644 --- a/cli/tools/doc.rs +++ b/cli/tools/doc.rs @@ -29,6 +29,7 @@ use doc::DocDiagnostic; use indexmap::IndexMap; use std::collections::BTreeMap; use std::rc::Rc; +use std::sync::Arc; async fn generate_doc_nodes_for_builtin_types( doc_flags: DocFlags, @@ -83,9 +84,12 @@ async fn generate_doc_nodes_for_builtin_types( Ok(IndexMap::from([(source_file_specifier, nodes)])) } -pub async fn doc(flags: Flags, doc_flags: DocFlags) -> Result<(), AnyError> { - let factory = CliFactory::from_flags(flags)?; - let cli_options = factory.cli_options(); +pub async fn doc( + flags: Arc<Flags>, + doc_flags: DocFlags, +) -> Result<(), AnyError> { + let factory = CliFactory::from_flags(flags); + let cli_options = factory.cli_options()?; let module_info_cache = factory.module_info_cache()?; let parsed_source_cache = factory.parsed_source_cache(); let capturing_parser = parsed_source_cache.as_capturing_parser(); @@ -102,7 +106,7 @@ pub async fn doc(flags: Flags, doc_flags: DocFlags) -> Result<(), AnyError> { } DocSourceFileFlag::Paths(ref source_files) => { let module_graph_creator = factory.module_graph_creator().await?; - let maybe_lockfile = factory.maybe_lockfile(); + let maybe_lockfile = cli_options.maybe_lockfile(); let module_specifiers = collect_specifiers( FilePatterns { |