diff --git a/deno b/deno index 00353e7..2b0f277 160000 --- a/deno +++ b/deno @@ -1 +1 @@ -Subproject commit 00353e7494b093f9ffd82c11e922718a302806e6 +Subproject commit 2b0f277e96768ba345c99c80563b1ba739b90d4f diff --git a/src/rs_lib/Cargo.lock b/src/rs_lib/Cargo.lock index 39680ab..b1ba85f 100644 --- a/src/rs_lib/Cargo.lock +++ b/src/rs_lib/Cargo.lock @@ -491,6 +491,7 @@ version = "0.69.0" dependencies = [ "boxed_error", "capacity_builder", + "chrono", "deno_error", "deno_maybe_sync", "deno_package_json", @@ -536,9 +537,9 @@ dependencies = [ [[package]] name = "deno_graph" -version = "0.102.2" +version = "0.103.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8118059b8501bc4726ece51f3a130e6f8b6877e911f659474e8c32949043e1c1" +checksum = "293db685464cf8a18785e32d6fdcfffb78a864465d8e9017bfb005ccacc560a8" dependencies = [ "async-trait", "boxed_error", @@ -602,9 +603,9 @@ dependencies = [ [[package]] name = "deno_npm" -version = "0.41.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529cc385f0ca2f93163b68ae4d3dbb760e147c7dbcbba0615e48c4e95e5da0fc" +checksum = "ae246f5c39baf58dfbb8250068ec35223f4c4c19889bfad732d92a035bf74fe6" dependencies = [ "async-trait", "capacity_builder", @@ -710,9 +711,9 @@ dependencies = [ [[package]] name = "deno_path_util" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe02936964b2910719bd488841f6e884349360113c7abf6f4c6b28ca9cd7a19" +checksum = "a4f70f7cbc884556f08781aaa75aef177d15bfee99e4fc40c25fa74514c678c0" dependencies = [ "deno_error", "percent-encoding", diff --git a/src/rs_lib/Cargo.toml b/src/rs_lib/Cargo.toml index 6eb5627..32cc173 100644 --- a/src/rs_lib/Cargo.toml +++ b/src/rs_lib/Cargo.toml @@ -19,7 +19,7 @@ wasm-bindgen = "=0.2.100" wasm-bindgen-futures = "=0.4.50" async-trait = "0.1.73" deno_error = "=0.7.0" -deno_path_util = "=0.6.1" +deno_path_util = "=0.6.3" deno_semver = "=0.9.0" url = "2.5" @@ -45,7 +45,7 @@ path = "../../deno/libs/config" features = ["workspace","sync"] [dependencies.deno_graph] -version = "=0.102.2" +version = "=0.103.1" features = ["swc"] default-features = false diff --git a/src/rs_lib/lib.rs b/src/rs_lib/lib.rs index b023675..92c40ff 100644 --- a/src/rs_lib/lib.rs +++ b/src/rs_lib/lib.rs @@ -14,6 +14,7 @@ use anyhow::bail; use deno_ast::ModuleKind; use deno_cache_dir::file_fetcher::CacheSetting; use deno_cache_dir::file_fetcher::NullBlobStore; +use deno_config::deno_json::NewestDependencyDate; use deno_error::JsErrorBox; use deno_graph::CheckJsOption; use deno_graph::GraphKind; @@ -305,7 +306,9 @@ impl DenoWorkspace { package_json_dep_resolution: None, specified_import_map: None, bare_node_builtins: true, - newest_dependency_date: options.newest_dependency_date, + newest_dependency_date: options + .newest_dependency_date + .map(NewestDependencyDate::Enabled), // todo: report these on_mapped_resolution_diagnostic: None, types_node_version_req: None, @@ -933,7 +936,10 @@ fn resolve_with_graph_error_code( err: &ResolveWithGraphError, ) -> Option { match err.as_kind() { - ResolveWithGraphErrorKind::CouldNotResolveNpmNv(err) => Some(err.code()), + ResolveWithGraphErrorKind::CouldNotResolveNpmReqRef(err) => { + Some(err.code()) + } + ResolveWithGraphErrorKind::ManagedResolvePkgFolderFromDenoReq(_) => None, ResolveWithGraphErrorKind::ResolvePkgFolderFromDenoModule(_) => None, ResolveWithGraphErrorKind::ResolveNpmReqRef(err) => err.err.maybe_code(), ResolveWithGraphErrorKind::Resolution(err) => err