From ec968aa5aec068e92fb554fc7192d912bcddb82c Mon Sep 17 00:00:00 2001
From: Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:19:03 -0700
Subject: fix(install): cache json exports of JSR packages (#26552)

Fixes https://github.com/denoland/deno/issues/26509.

Ended up being a `deno_graph` bug causing the error to surface. This PR
updates `deno_graph` to pick up the fix and reverts the temporary
workaround that skipped JSON exports.
---
 cli/Cargo.toml                      | 2 +-
 cli/tools/registry/pm/cache_deps.rs | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'cli')

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index db0248d84..0065a2cbd 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -73,7 +73,7 @@ deno_cache_dir = { workspace = true }
 deno_config = { version = "=0.37.2", features = ["workspace", "sync"] }
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_doc = { version = "0.154.0", default-features = false, features = ["rust", "html", "syntect"] }
-deno_graph = { version = "=0.83.3" }
+deno_graph = { version = "=0.83.4" }
 deno_lint = { version = "=0.67.0", features = ["docs"] }
 deno_lockfile.workspace = true
 deno_npm.workspace = true
diff --git a/cli/tools/registry/pm/cache_deps.rs b/cli/tools/registry/pm/cache_deps.rs
index 9883deb1d..365622d11 100644
--- a/cli/tools/registry/pm/cache_deps.rs
+++ b/cli/tools/registry/pm/cache_deps.rs
@@ -90,13 +90,8 @@ pub async fn cache_top_level_deps(
     while let Some(info_future) = info_futures.next().await {
       if let Some((specifier, info)) = info_future {
         let exports = info.exports();
-        for (k, v) in exports {
+        for (k, _) in exports {
           if let Ok(spec) = specifier.join(k) {
-            if v.ends_with(".json") {
-              // TODO(nathanwhit): this should work, there's a bug with
-              // json roots in deno_graph. skip it for now
-              continue;
-            }
             roots.push(spec);
           }
         }
-- 
cgit v1.2.3