refactor: bump deno_graph to 0.79 (denoland#24337)

No fixes in this to my knowledge. Just an upgrade. The functionality here will be used in a different PR.
zebreus · Jul 8, 2024 · f9a2a91 · f9a2a91
1 parent b027b45
commit f9a2a91
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -67,17 +67,17 @@ deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "proposa
 deno_cache_dir = { workspace = true }
 deno_config = "=0.16.4"
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
-deno_doc = { version = "=0.139.0", features = ["html", "syntect"] }
-deno_emit = "=0.42.0"
-deno_graph = { version = "=0.78.1", features = ["tokio_executor"] }
+deno_doc = { version = "=0.140.0", features = ["html", "syntect"] }
+deno_emit = "=0.43.0"
+deno_graph = { version = "=0.79.0", features = ["tokio_executor"] }
 deno_lint = { version = "=0.60.0", features = ["docs"] }
 deno_lockfile.workspace = true
 deno_npm = "=0.21.4"
 deno_runtime = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_semver = "=0.5.6"
 deno_task_shell = "=0.17.0"
 deno_terminal.workspace = true
-eszip = "=0.71.0"
+eszip = "=0.72.1"
 napi_sym.workspace = true
 
 async-trait.workspace = true
@@ -108,7 +108,7 @@ flate2.workspace = true
 fs3.workspace = true
 glob = "0.3.1"
 ignore = "0.4"
-import_map = { version = "=0.19.0", features = ["ext"] }
+import_map = { version = "=0.20.0", features = ["ext"] }
 indexmap.workspace = true
 jsonc-parser.workspace = true
 jupyter_runtime = { package = "runtimelib", version = "=0.11.0" }

diff --git a/cli/graph_util.rs b/cli/graph_util.rs
@@ -843,7 +843,7 @@ fn get_resolution_error_bare_specifier(
   error: &ResolutionError,
 ) -> Option<&str> {
   if let ResolutionError::InvalidSpecifier {
-    error: SpecifierError::ImportPrefixMissing(specifier, _),
+    error: SpecifierError::ImportPrefixMissing { specifier, .. },
     ..
   } = error
   {
@@ -1065,7 +1065,10 @@ mod test {
           start: Position::zeroed(),
           end: Position::zeroed(),
         },
-        error: SpecifierError::ImportPrefixMissing(input.to_string(), None),
+        error: SpecifierError::ImportPrefixMissing {
+          specifier: input.to_string(),
+          referrer: None,
+        },
       };
       assert_eq!(get_resolution_error_bare_node_specifier(&err), output,);
     }

diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs
@@ -1033,7 +1033,7 @@ impl DenoDiagnostic {
               "invalid-local-import"
             }
             ResolutionError::InvalidSpecifier { error, .. } => match error {
-              SpecifierError::ImportPrefixMissing(_, _) => {
+              SpecifierError::ImportPrefixMissing { .. } => {
                 "import-prefix-missing"
               }
               SpecifierError::InvalidUrl(_) => "invalid-url",

diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
@@ -472,7 +472,7 @@ pub async fn run(
     npm_resolver.clone().into_npm_resolver(),
   ));
   let maybe_import_map = metadata.maybe_import_map.map(|(base, source)| {
-    Arc::new(parse_from_json(&base, &source).unwrap().import_map)
+    Arc::new(parse_from_json(base, &source).unwrap().import_map)
   });
   let cli_node_resolver = Arc::new(CliNodeResolver::new(
     Some(cjs_resolutions.clone()),

diff --git a/cli/tools/compile.rs b/cli/tools/compile.rs
@@ -81,12 +81,13 @@ pub async fn compile(
       ts_config_for_emit.ts_config,
     )?;
   let parser = parsed_source_cache.as_capturing_parser();
-  let eszip = eszip::EszipV2::from_graph(
+  let eszip = eszip::EszipV2::from_graph(eszip::FromGraphOptions {
     graph,
-    &parser,
+    parser,
     transpile_options,
     emit_options,
-  )?;
+    relative_file_base: None,
+  })?;
 
   log::info!(
     "{} {} to {}",