Merge branch 'main' into exp/ext-node/buffer-optimisation

denoland · Feb 18, 2023 · 0762e00 · 0762e00
2 parents e2ca43b + a01af06
commit 0762e00
Show file tree

Hide file tree

Showing 43 changed files with 1,826 additions and 424 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -112,7 +112,7 @@ sha2 = { version = "0.10.6", features = ["oid"] }
 smallvec = "1.8"
 socket2 = "0.4.7"
 tar = "=0.4.38"
-tokio = { version = "=1.24.2", features = ["full"] }
+tokio = { version = "=1.25.0", features = ["full"] }
 tokio-rustls = "0.23.3"
 tokio-tungstenite = "0.16.1"
 tokio-util = "=0.7.4"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -99,6 +99,7 @@ shell-escape = "=0.1.5"
 tar.workspace = true
 text-size = "=1.1.0"
 text_lines = "=0.6.0"
+thiserror = "=1.0.38"
 tokio.workspace = true
 tokio-util.workspace = true
 tower-lsp = { version = "=0.17.0", features = ["proposed"] }

diff --git a/cli/npm/mod.rs b/cli/npm/mod.rs
@@ -12,6 +12,7 @@ pub use registry::NpmPackageVersionDistInfo;
 pub use registry::NpmRegistryApi;
 pub use registry::RealNpmRegistryApi;
 pub use resolution::resolve_graph_npm_info;
+pub use resolution::NpmPackageNodeId;
 pub use resolution::NpmResolutionPackage;
 pub use resolution::NpmResolutionSnapshot;
 pub use resolvers::NpmPackageResolver;