Merge branch 'denoland:main' into main

1 files changed, 12 insertions, 5 deletions

diff --git a/cli/tools/registry/pm/cache_deps.rs b/cli/tools/registry/pm/cache_deps.rs
index c8258e600..d3c8da868 100644
--- a/cli/tools/registry/pm/cache_deps.rs
+++ b/cli/tools/registry/pm/cache_deps.rs
@@ -44,7 +44,11 @@ pub async fn cache_top_level_deps(
 
     let mut seen_reqs = std::collections::HashSet::new();
 
-    for entry in import_map.imports().entries() {
+    for entry in import_map.imports().entries().chain(
+      import_map
+        .scopes()
+        .flat_map(|scope| scope.imports.entries()),
+    ) {
       let Some(specifier) = entry.value else {
         continue;
       };
@@ -75,6 +79,13 @@ pub async fn cache_top_level_deps(
           if entry.key.ends_with('/') && specifier.as_str().ends_with('/') {
             continue;
           }
+          if specifier.scheme() == "file" {
+            if let Ok(path) = specifier.to_file_path() {
+              if !path.is_file() {
+                continue;
+              }
+            }
+          }
           roots.push(specifier.clone());
         }
       }
@@ -82,10 +93,6 @@ pub async fn cache_top_level_deps(
 
     while let Some(info_future) = info_futures.next().await {
       if let Some((specifier, info)) = info_future {
-        if info.export(".").is_some() {
-          roots.push(specifier.clone());
-          continue;
-        }
         let exports = info.exports();
         for (k, _) in exports {
           if let Ok(spec) = specifier.join(k) {