support new manifest format during code load

Author: IanButterworth

base/loading.jl

@@ -485,12 +485,17 @@ function explicit_project_deps_get(project_file::String, name::String)::Union{No
     return nothing
 end
 
+# handles returning deps list for both old and new manifest formats
+# if no `deps` field, then its either the older flat format or empty, so return self
+get_deps(d) = get(d, "deps", d)
+
 # find `where` stanza and return the PkgId for `name`
 # return `nothing` if it did not find `where` (indicating caller should continue searching)
 function explicit_manifest_deps_get(project_file::String, where::UUID, name::String)::Union{Nothing,PkgId}
     manifest_file = project_file_manifest_path(project_file)
     manifest_file === nothing && return nothing # manifest not found--keep searching LOAD_PATH
-    d = parsed_toml(manifest_file)
+    d = get_deps(parsed_toml(manifest_file))
+    d === nothing && return nothing
     found_where = false
     found_name = false
     for (dep_name, entries) in d
@@ -538,7 +543,8 @@ function explicit_manifest_uuid_path(project_file::String, pkg::PkgId)::Union{No
     manifest_file = project_file_manifest_path(project_file)
     manifest_file === nothing && return nothing # no manifest, skip env
 
-    d = parsed_toml(manifest_file)
+    d = get_deps(parsed_toml(manifest_file))
+    d === nothing && return nothing
     entries = get(d, pkg.name, nothing)::Union{Nothing, Vector{Any}}
     entries === nothing && return nothing # TODO: allow name to mismatch?
     for entry in entries