diff --git a/deno b/deno index 3d5ff3c..bc74fad 160000 --- a/deno +++ b/deno @@ -1 +1 @@ -Subproject commit 3d5ff3cf1c4f4059a100be1d00956ff805d032c9 +Subproject commit bc74fadac57f7b690e6088296c8d2ded316b9dec diff --git a/src/rs_lib/Cargo.lock b/src/rs_lib/Cargo.lock index abbe834..9b0573e 100644 --- a/src/rs_lib/Cargo.lock +++ b/src/rs_lib/Cargo.lock @@ -497,8 +497,6 @@ dependencies = [ [[package]] name = "deno_config" version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cede8eaf636037d9f3d9206eeecb0bdcea042810da5eb00be74ecb0d17b95acc" dependencies = [ "boxed_error", "capacity_builder", @@ -695,8 +693,6 @@ dependencies = [ [[package]] name = "deno_package_json" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc681ccdd5319c96bdacdd6d6b1a1e1272829fa10687120eba1d2a0c336d77f7" dependencies = [ "boxed_error", "deno_error", diff --git a/src/rs_lib/Cargo.toml b/src/rs_lib/Cargo.toml index 436d119..f6ea9d0 100644 --- a/src/rs_lib/Cargo.toml +++ b/src/rs_lib/Cargo.toml @@ -31,7 +31,7 @@ version = "=0.22.2" features = ["sync"] [dependencies.deno_config] -version = "=0.57.0" +path = "../../deno/libs/config" features = ["workspace","sync"] [dependencies.deno_graph] @@ -40,14 +40,14 @@ features = ["swc"] default-features = false [dependencies.deno_npm_cache] -path = "../../deno/resolvers/npm_cache" +path = "../../deno/libs/npm_cache" [dependencies.deno_npm_installer] -path = "../../deno/resolvers/npm_installer" +path = "../../deno/libs/npm_installer" default-features = false [dependencies.deno_resolver] -path = "../../deno/resolvers/deno" +path = "../../deno/libs/resolver" features = ["deno_ast","graph","sync"] [dependencies.deno_unsync] @@ -55,7 +55,7 @@ version = "0.4.4" default-features = false [dependencies.node_resolver] -path = "../../deno/resolvers/node" +path = "../../deno/libs/node_resolver" features = ["sync"] [dependencies.sys_traits] diff --git a/src/rs_lib/lib.rs b/src/rs_lib/lib.rs index 5b2dd1d..ac78e64 100644 --- a/src/rs_lib/lib.rs +++ b/src/rs_lib/lib.rs @@ -38,6 +38,7 @@ use deno_resolver::file_fetcher::DenoGraphLoaderOptions; use deno_resolver::file_fetcher::PermissionedFileFetcher; use deno_resolver::file_fetcher::PermissionedFileFetcherOptions; use deno_resolver::graph::DefaultDenoResolverRc; +use deno_resolver::graph::ResolveWithGraphOptions; use deno_resolver::npm::DenoInNpmPackageChecker; use deno_resolver::workspace::ScopedJsxImportSourceConfig; use deno_semver::SmallStackString; @@ -456,8 +457,11 @@ impl DenoLoader { &specifier, &referrer, deno_graph::Position::zeroed(), - resolution_mode, - node_resolver::NodeResolutionKind::Execution, + ResolveWithGraphOptions { + mode: resolution_mode, + kind: node_resolver::NodeResolutionKind::Execution, + maintain_npm_specifiers: false, + }, )?; Ok(resolved.to_string()) }