refactor: update to deno_config 0.25 (#24645)

- Gets rid of WorkspaceMemberContext. It's now `Workspace` and `WorkspaceDirectory` - Uses the workspace cache in the lsp * denoland/deno_config#95 * denoland/deno_config#96
denoland · Jul 19, 2024 · afcae36 · afcae36
1 parent a4c76ad
commit afcae36
Show file tree

Hide file tree

Showing 25 changed files with 362 additions and 334 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -101,7 +101,7 @@ console_static_text = "=0.8.1"
 data-encoding = "2.3.3"
 data-url = "=0.3.0"
 deno_cache_dir = "=0.10.0"
-deno_config = { version = "=0.24.0", default-features = false }
+deno_config = { version = "=0.25.0", default-features = false }
 dlopen2 = "0.6.1"
 ecb = "=0.1.2"
 elliptic-curve = { version = "0.13.4", features = ["alloc", "arithmetic", "ecdh", "std", "pem"] }

diff --git a/cli/args/deno_json.rs b/cli/args/deno_json.rs
@@ -8,7 +8,7 @@ use deno_semver::jsr::JsrPackageReqReference;
 use deno_semver::npm::NpmPackageReqReference;
 
 pub fn deno_json_deps(
-  config: &deno_config::ConfigFile,
+  config: &deno_config::deno_json::ConfigFile,
 ) -> HashSet<JsrDepPackageReq> {
   let values = imports_values(config.json.imports.as_ref())
     .into_iter()

diff --git a/cli/args/flags.rs b/cli/args/flags.rs
@@ -11,7 +11,6 @@ use clap::Command;
 use clap::ValueHint;
 use deno_config::glob::FilePatterns;
 use deno_config::glob::PathOrPatternSet;
-use deno_config::ConfigFlag;
 use deno_core::anyhow::bail;
 use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
@@ -42,6 +41,14 @@ use crate::util::fs::canonicalize_path;
 use super::flags_net;
 use super::DENO_FUTURE;
 
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub enum ConfigFlag {
+  #[default]
+  Discover,
+  Path(String),
+  Disabled,
+}
+
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
 pub struct FileFlags {
   pub ignore: Vec<String>,