Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade deps #15914

Merged
merged 24 commits into from
Sep 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,057 changes: 496 additions & 561 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bench_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ path = "lib.rs"
bencher = "0.1"
deno_core = { version = "0.151.0", path = "../core" }
once_cell = "1.10.0"
tokio = { version = "1.19", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }

[[bench]]
name = "op_baseline"
Expand Down
48 changes: 24 additions & 24 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ deno_websocket = { version = "0.74.0", path = "../ext/websocket" }
deno_webstorage = { version = "0.64.0", path = "../ext/webstorage" }
regex = "=1.6.0"
serde = { version = "=1.0.144", features = ["derive"] }
zstd = '=0.11.1'
zstd = '=0.11.2'

[target.'cfg(windows)'.build-dependencies]
winapi = "=0.3.9"
Expand All @@ -59,31 +59,31 @@ deno_task_shell = "0.5.2"
atty = "=0.2.14"
base64 = "=0.13.0"
cache_control = "=0.2.0"
chrono = "=0.4.19"
chrono = { version = "=0.4.22", default-features = false, features = ["clock"] }
clap = "=3.1.12"
clap_complete = "=3.1.2"
clap_complete_fig = "=3.1.5"
data-url = "=0.1.1"
dissimilar = "=1.0.3"
dissimilar = "=1.0.4"
dprint-plugin-json = "=0.15.6"
dprint-plugin-markdown = "=0.14.1"
dprint-plugin-typescript = "=0.73.1"
encoding_rs = "=0.8.31"
env_logger = "=0.9.0"
eszip = "=0.27.0"
eszip = "=0.28.0"
fancy-regex = "=0.10.0"
flate2 = "=1.0.24"
http = "=0.2.6"
http = "=0.2.8"
import_map = "=0.12.1"
indexmap = "1.8.1"
indicatif = "=0.17.0"
indexmap = "=1.9.1"
indicatif = "=0.17.1"
jsonc-parser = { version = "=0.21.0", features = ["serde"] }
libc = "=0.2.126"
log = { version = "=0.4.17", features = ["serde"] }
mitata = "=0.0.7"
monch = "=0.2.0"
notify = "=5.0.0-pre.15"
once_cell = "=1.12.0"
notify = "=5.0.0"
once_cell = "=1.14.0"
os_pipe = "=1.0.1"
path-clean = "=0.1.0"
percent-encoding = "=2.2.0"
Expand All @@ -94,38 +94,38 @@ ring = "=0.16.20"
rustyline = { version = "=10.0.0", default-features = false, features = ["custom-bindings"] }
rustyline-derive = "=0.7.0"
secure_tempfile = { version = "=3.3.0", package = "tempfile" } # different name to discourage use in tests
semver = "=1.0.13"
semver = "=1.0.14"
serde = { version = "=1.0.144", features = ["derive"] }
serde_repr = "=0.1.8"
serde_repr = "=0.1.9"
shell-escape = "=0.1.5"
tar = "=0.4.38"
text-size = "=1.1.0"
text_lines = "=0.6.0"
tokio = { version = "=1.19", features = ["full"] }
tokio-util = "=0.7.2"
tokio = { version = "=1.21.1", features = ["full"] }
tokio-util = "=0.7.4"
tower-lsp = "=0.17.0"
twox-hash = "=1.6.2"
typed-arena = "2.0.1"
uuid = { version = "=1.0.0", features = ["v4", "serde"] }
twox-hash = "=1.6.3"
typed-arena = "=2.0.1"
uuid = { version = "=1.1.2", features = ["v4", "serde"] }
walkdir = "=2.3.2"
zstd = '=0.11.1'
zstd = '=0.11.2'

[target.'cfg(windows)'.dependencies]
fwdansi = "=1.1.0"
winapi = { version = "=0.3.9", features = ["knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] }

[dev-dependencies]
csv = "1.1.6"
csv = "=1.1.6"
deno_bench_util = { version = "0.63.0", path = "../bench_util" }
dotenv = "0.15.0"
dotenv = "=0.15.0"
flaky_test = "=0.1.0"
google-storage1 = "3.1.0"
once_cell = "=1.12.0"
google-storage1 = "=3.1.0"
once_cell = "=1.14.0"
os_pipe = "=1.0.1"
pretty_assertions = "=1.2.1"
pretty_assertions = "=1.3.0"
test_util = { path = "../test_util" }
trust-dns-client = "=0.21.2"
trust-dns-server = "=0.21.2"
trust-dns-client = "=0.22.0"
trust-dns-server = "=0.22.0"

[target.'cfg(unix)'.dev-dependencies]
nix = "=0.24.2"
Expand Down
11 changes: 5 additions & 6 deletions cli/file_watcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use deno_runtime::fmt_errors::format_js_error;
use log::info;
use notify::event::Event as NotifyEvent;
use notify::event::EventKind;
use notify::Config;
use notify::Error as NotifyError;
use notify::RecommendedWatcher;
use notify::RecursiveMode;
Expand Down Expand Up @@ -344,8 +343,8 @@ where
fn new_watcher(
sender: Arc<mpsc::UnboundedSender<Vec<PathBuf>>>,
) -> Result<RecommendedWatcher, AnyError> {
let mut watcher: RecommendedWatcher =
Watcher::new(move |res: Result<NotifyEvent, NotifyError>| {
let watcher = Watcher::new(
ry marked this conversation as resolved.
Show resolved Hide resolved
move |res: Result<NotifyEvent, NotifyError>| {
if let Ok(event) = res {
if matches!(
event.kind,
Expand All @@ -359,9 +358,9 @@ fn new_watcher(
sender.send(paths).unwrap();
}
}
})?;

watcher.configure(Config::PreciseEvents(true)).unwrap();
},
Default::default(),
)?;

Ok(watcher)
}
Expand Down
4 changes: 2 additions & 2 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pin-project = "1.0.11"
serde = { version = "1.0.136", features = ["derive"] }
serde_json = { version = "1.0.79", features = ["preserve_order"] }
serde_v8 = { version = "0.62.0", path = "../serde_v8" }
sourcemap = "=6.0.1"
sourcemap = "6.1"
url = { version = "2.3.1", features = ["serde", "expose_internals"] }
v8 = { version = "0.49.0", default-features = false }

Expand All @@ -42,4 +42,4 @@ path = "examples/http_bench_json_ops.rs"
# These dependencies are only used for the 'http_bench_*_ops' examples.
[dev-dependencies]
deno_ast = { version = "0.19.0", features = ["transpiling"] }
tokio = { version = "1.19", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
2 changes: 1 addition & 1 deletion ext/broadcast_channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ path = "lib.rs"
[dependencies]
async-trait = "0.1"
deno_core = { version = "0.151.0", path = "../../core" }
tokio = { version = "1.17", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
uuid = { version = "1.0.0", features = ["v4"] }
8 changes: 3 additions & 5 deletions ext/crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ path = "lib.rs"

[dependencies]
aes = "0.8.1"
# TODO(@littledivy): Move to stable release
# https://github.com/RustCrypto/AEADs/issues/411
aes-gcm = "=0.10.0-pre"
aes-gcm = "0.10"
aes-kw = { version = "0.2.1", features = ["alloc"] }
base64 = "0.13.0"
block-modes = "0.9.1"
Expand All @@ -33,12 +31,12 @@ p256 = { version = "0.11.1", features = ["ecdh"] }
p384 = "0.11.1"
rand = "0.8.4"
ring = { version = "0.16.20", features = ["std"] }
rsa = { version = "0.7.0-pre", default-features = false, features = ["std"] }
rsa = { version = "=0.7.0-pre", default-features = false, features = ["std"] }
sec1 = "0.3.0"
serde = { version = "1.0.129", features = ["derive"] }
serde_bytes = "0.11"
sha-1 = "0.10.0"
sha2 = "0.10.2"
spki = "0.6.0"
tokio = { version = "1.17", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
uuid = { version = "1.0.0", features = ["v4"] }
2 changes: 1 addition & 1 deletion ext/crypto/decrypt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use aes_gcm::aes::Aes128;
use aes_gcm::aes::Aes192;
use aes_gcm::aes::Aes256;
use aes_gcm::AeadInPlace;
use aes_gcm::NewAead;
use aes_gcm::KeyInit;
use aes_gcm::Nonce;
use ctr::cipher::StreamCipher;
use ctr::Ctr128BE;
Expand Down
2 changes: 1 addition & 1 deletion ext/crypto/encrypt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use aes_gcm::aes::Aes128;
use aes_gcm::aes::Aes192;
use aes_gcm::aes::Aes256;
use aes_gcm::AeadInPlace;
use aes_gcm::NewAead;
use aes_gcm::KeyInit;
use aes_gcm::Nonce;
use ctr::Ctr128BE;
use ctr::Ctr32BE;
Expand Down
4 changes: 2 additions & 2 deletions ext/fetch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ dyn-clone = "1"
http = "0.2.6"
reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks"] }
serde = { version = "1.0.136", features = ["derive"] }
tokio = { version = "1.17", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
tokio-stream = "0.1.8"
tokio-util = { version = "0.7.1", features = ["io"] }
tokio-util = { version = "0.7", features = ["io"] }
2 changes: 1 addition & 1 deletion ext/ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dlopen = "0.1.8"
dynasmrt = "1.2.3"
libffi = "3.0.0"
serde = { version = "1.0.129", features = ["derive"] }
tokio = { version = "1.17", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.9", features = ["errhandlingapi", "minwindef", "ntdef", "winbase", "winnt"] }
4 changes: 2 additions & 2 deletions ext/flash/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ libc = "0.2"
log = "0.4.17"
mio = { version = "0.8.1", features = ["os-poll", "net"] }
rustls = { version = "0.20" }
rustls-pemfile = { version = "0.2.1" }
rustls-pemfile = "1.0"
serde = { version = "1.0.136", features = ["derive"] }
tokio = { version = "1.19", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
4 changes: 2 additions & 2 deletions ext/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ percent-encoding = "2.2.0"
phf = { version = "0.10", features = ["macros"] }
ring = "0.16.20"
serde = { version = "1.0.136", features = ["derive"] }
tokio = { version = "1.17", features = ["full"] }
tokio-util = { version = "0.7.1", features = ["io"] }
tokio = { version = "1.21", features = ["full"] }
tokio-util = { version = "0.7", features = ["io"] }

[dev-dependencies]
bencher = "0.1"
6 changes: 3 additions & 3 deletions ext/net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ deno_tls = { version = "0.56.0", path = "../tls" }
log = "0.4.16"
serde = { version = "1.0.136", features = ["derive"] }
socket2 = "0.4.4"
tokio = { version = "1.17", features = ["full"] }
trust-dns-proto = "=0.21.2"
trust-dns-resolver = { version = "=0.21.2", features = ["tokio-runtime", "serde-config"] }
tokio = { version = "1.21", features = ["full"] }
trust-dns-proto = "0.22"
trust-dns-resolver = { version = "0.22", features = ["tokio-runtime", "serde-config"] }
2 changes: 1 addition & 1 deletion ext/net/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ where
let resolver = AsyncResolver::tokio(config, opts)?;

let results = resolver
.lookup(query, record_type, Default::default())
.lookup(query, record_type)
.await
.map_err(|e| {
let message = format!("{}", e);
Expand Down
4 changes: 2 additions & 2 deletions ext/web/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ path = "lib.rs"

[dependencies]
async-trait = "0.1.51"
base64-simd = "0.6.2"
base64-simd = "0.7"
deno_core = { version = "0.151.0", path = "../../core" }
encoding_rs = "0.8.31"
flate2 = "1"
serde = "1.0.136"
tokio = { version = "1.17", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
uuid = { version = "1.0.0", features = ["v4", "serde"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion ext/webgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ description = "WebGPU implementation for Deno"
[dependencies]
deno_core = { version = "0.151.0", path = "../../core" }
serde = { version = "1.0", features = ["derive"] }
tokio = { version = "1.17", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
wgpu-core = { version = "0.13", features = ["trace", "replay", "serde"] }
wgpu-types = { version = "0.13", features = ["trace", "replay", "serde"] }
2 changes: 1 addition & 1 deletion ext/websocket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ deno_tls = { version = "0.56.0", path = "../tls" }
http = "0.2.6"
hyper = { version = "0.14.18" }
serde = { version = "1.0.136", features = ["derive"] }
tokio = { version = "1.17", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
tokio-rustls = "0.23.3"
tokio-tungstenite = { version = "0.16.1", features = ["rustls-tls-webpki-roots"] }
4 changes: 2 additions & 2 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ libc = "0.2.126"
log = "0.4.16"
lzzzz = '1.0'
netif = "0.1.3"
notify = "=5.0.0-pre.15"
notify = "5.0"
once_cell = "1.10.0"
regex = "1.6.0"
ring = "0.16.20"
serde = { version = "1.0.136", features = ["derive"] }
signal-hook-registry = "1.4.0"
sys-info = "0.9.1"
termcolor = "1.1.3"
tokio = { version = "1.19", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
uuid = { version = "1.0.0", features = ["v4"] }

[target.'cfg(windows)'.dependencies]
Expand Down
8 changes: 5 additions & 3 deletions runtime/ops/fs_events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,16 @@ fn op_fs_events_open(
) -> Result<ResourceId, AnyError> {
let (sender, receiver) = mpsc::channel::<Result<FsEvent, AnyError>>(16);
let sender = Mutex::new(sender);
let mut watcher: RecommendedWatcher =
Watcher::new(move |res: Result<NotifyEvent, NotifyError>| {
let mut watcher: RecommendedWatcher = Watcher::new(
move |res: Result<NotifyEvent, NotifyError>| {
let res2 = res.map(FsEvent::from).map_err(AnyError::from);
let sender = sender.lock();
// Ignore result, if send failed it means that watcher was already closed,
// but not all messages have been flushed.
let _ = sender.try_send(res2);
})?;
},
Default::default(),
)?;
let recursive_mode = if args.recursive {
RecursiveMode::Recursive
} else {
Expand Down
6 changes: 3 additions & 3 deletions test_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ lazy_static = "1.4.0"
once_cell = "1.10.0"
os_pipe = "1.0.1"
parking_lot = "0.12.0"
pretty_assertions = "=1.2.1"
pretty_assertions = "1.3"
regex = "1.6.0"
reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks"] }
ring = "0.16.20"
rustls-pemfile = "1.0.0"
semver = "1.0.13"
semver = "1.0"
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.79"
tar = "0.4.38"
tokio = { version = "1.19", features = ["full"] }
tokio = { version = "1.21", features = ["full"] }
tokio-rustls = "0.23"
tokio-tungstenite = "0.16"

Expand Down