Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/denoland/deno into feature/…
Browse files Browse the repository at this point in the history
…use-native-certs-for-tls
  • Loading branch information
justinmchase committed Jul 26, 2021
2 parents bb30583 + dfba7a2 commit 7d0744a
Show file tree
Hide file tree
Showing 51 changed files with 729 additions and 303 deletions.
34 changes: 17 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions Releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,25 @@ https://github.com/denoland/deno/releases
We also have one-line install commands at:
https://github.com/denoland/deno_install

### 1.12.2 / 2021.07.26

- feat(lsp, unstable): add workspace config to status page (#11459)
- fix: panic for non-WS connections to inspector (#11466)
- fix: support --cert flag for TLS connect APIs (#11484)
- fix(cli): info now displays type reference deps (#11478)
- fix(cli): normalize test command errors (#11375)
- fix(cli): rebuild when environment variables change (#11471)
- fix(cli): side-load test modules (#11515)
- fix(extensions/fetch): close fetch response body on GC (#11467)
- fix(extensions/http): support multiple options in connection header for
websocket (#11505)
- fix(extensions/websocket): case insensitive connection header (#11489)
- fix(lsp): do not populate maybe_type slot with import type dep (#11477)
- fix(lsp): handle importmaps properly (#11496)

Release notes for std version 0.103.0:
https://github.com/denoland/deno_std/releases/tag/0.103.0

### 1.12.1 / 2021.07.19

- fix: Big{U|}Int64Array in crypto.getRandomValues (#11447)
Expand All @@ -16,6 +35,9 @@ https://github.com/denoland/deno_install
- fix(tsc): add .at() types manually to tsc (#11443)
- fix(workers): silently ignore non-existent worker IDs (#11417)

Release notes for std version 0.102.0:
https://github.com/denoland/deno_std/releases/tag/0.102.0

### 1.12.0 / 2021.07.13

- feat: Add `MessageChannel` and `MessagePort` APIs (#11051)
Expand Down
4 changes: 2 additions & 2 deletions bench_util/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
[package]
name = "deno_bench_util"
version = "0.6.0"
version = "0.7.0"
authors = ["the Deno authors"]
edition = "2018"
description = "Bench and profiling utilities for deno crates"
Expand All @@ -14,7 +14,7 @@ publish = true

[dependencies]
bencher = "0.1"
deno_core = { version = "0.94.0", path = "../core" }
deno_core = { version = "0.95.0", path = "../core" }
tokio = { version = "1.8.0", features = ["full"] }

[[bench]]
Expand Down
34 changes: 17 additions & 17 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[package]
name = "deno"
version = "1.12.1"
version = "1.12.2"
license = "MIT"
authors = ["the Deno authors"]
edition = "2018"
Expand All @@ -20,20 +20,20 @@ harness = false
path = "./bench/main.rs"

[build-dependencies]
deno_broadcast_channel = { version = "0.6.0", path = "../extensions/broadcast_channel" }
deno_console = { version = "0.12.0", path = "../extensions/console" }
deno_core = { version = "0.94.0", path = "../core" }
deno_crypto = { version = "0.26.0", path = "../extensions/crypto" }
deno_fetch = { version = "0.34.0", path = "../extensions/fetch" }
deno_http = { version = "0.3.0", path = "../extensions/http" }
deno_net = { version = "0.3.0", path = "../extensions/net" }
deno_timers = { version = "0.10.0", path = "../extensions/timers" }
deno_url = { version = "0.12.0", path = "../extensions/url" }
deno_web = { version = "0.43.0", path = "../extensions/web" }
deno_webgpu = { version = "0.13.0", path = "../extensions/webgpu" }
deno_webidl = { version = "0.12.0", path = "../extensions/webidl" }
deno_websocket = { version = "0.17.0", path = "../extensions/websocket" }
deno_webstorage = { version = "0.7.0", path = "../extensions/webstorage" }
deno_broadcast_channel = { version = "0.7.0", path = "../extensions/broadcast_channel" }
deno_console = { version = "0.13.0", path = "../extensions/console" }
deno_core = { version = "0.95.0", path = "../core" }
deno_crypto = { version = "0.27.0", path = "../extensions/crypto" }
deno_fetch = { version = "0.35.0", path = "../extensions/fetch" }
deno_http = { version = "0.4.0", path = "../extensions/http" }
deno_net = { version = "0.4.0", path = "../extensions/net" }
deno_timers = { version = "0.11.0", path = "../extensions/timers" }
deno_url = { version = "0.13.0", path = "../extensions/url" }
deno_web = { version = "0.44.0", path = "../extensions/web" }
deno_webgpu = { version = "0.14.0", path = "../extensions/webgpu" }
deno_webidl = { version = "0.13.0", path = "../extensions/webidl" }
deno_websocket = { version = "0.18.0", path = "../extensions/websocket" }
deno_webstorage = { version = "0.8.0", path = "../extensions/webstorage" }
regex = "1.4.3"
serde = { version = "1.0.125", features = ["derive"] }

Expand All @@ -42,10 +42,10 @@ winapi = "0.3.9"
winres = "0.1.11"

[dependencies]
deno_core = { version = "0.94.0", path = "../core" }
deno_core = { version = "0.95.0", path = "../core" }
deno_doc = "0.9.0"
deno_lint = "0.11.0"
deno_runtime = { version = "0.20.0", path = "../runtime" }
deno_runtime = { version = "0.21.0", path = "../runtime" }

atty = "0.2.14"
base64 = "0.13.0"
Expand Down
75 changes: 70 additions & 5 deletions cli/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,23 +137,24 @@ pub struct Flags {
pub allow_read: Option<Vec<PathBuf>>,
pub allow_run: Option<Vec<String>>,
pub allow_write: Option<Vec<PathBuf>>,
pub location: Option<Url>,
pub cache_blocklist: Vec<String>,
pub ca_stores: Option<Vec<String>>,
pub ca_file: Option<String>,
pub cache_blocklist: Vec<String>,
pub cached_only: bool,
pub config_path: Option<String>,
pub coverage_dir: Option<String>,
pub enable_testing_features: bool,
pub ignore: Vec<PathBuf>,
pub import_map_path: Option<String>,
pub inspect: Option<SocketAddr>,
pub inspect_brk: Option<SocketAddr>,
pub lock: Option<PathBuf>,
pub inspect: Option<SocketAddr>,
pub location: Option<Url>,
pub lock_write: bool,
pub lock: Option<PathBuf>,
pub log_level: Option<Level>,
pub no_check: bool,
pub prompt: bool,
pub no_remote: bool,
pub prompt: bool,
pub reload: bool,
pub repl: bool,
pub seed: Option<u64>,
Expand Down Expand Up @@ -1271,6 +1272,7 @@ fn runtime_args<'a, 'b>(
.arg(location_arg())
.arg(v8_flags_arg())
.arg(seed_arg())
.arg(enable_testing_features_arg())
}

fn inspect_args<'a, 'b>(app: App<'a, 'b>) -> App<'a, 'b> {
Expand Down Expand Up @@ -1372,6 +1374,13 @@ fn location_arg<'a, 'b>() -> Arg<'a, 'b> {
.help("Value of 'globalThis.location' used by some web APIs")
}

fn enable_testing_features_arg<'a, 'b>() -> Arg<'a, 'b> {
Arg::with_name("enable-testing-features-do-not-use")
.long("enable-testing-features-do-not-use")
.help("INTERNAL: Enable internal features used during integration testing")
.hidden(true)
}

fn v8_flags_arg<'a, 'b>() -> Arg<'a, 'b> {
Arg::with_name("v8-flags")
.long("v8-flags")
Expand Down Expand Up @@ -1906,6 +1915,7 @@ fn runtime_args_parse(
v8_flags_arg_parse(flags, matches);
seed_arg_parse(flags, matches);
inspect_arg_parse(flags, matches);
enable_testing_features_arg_parse(flags, matches);
}

fn inspect_arg_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
Expand Down Expand Up @@ -1952,6 +1962,15 @@ fn ca_file_arg_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
flags.ca_file = matches.value_of("cert").map(ToOwned::to_owned);
}

fn enable_testing_features_arg_parse(
flags: &mut Flags,
matches: &clap::ArgMatches,
) {
if matches.is_present("enable-testing-features-do-not-use") {
flags.enable_testing_features = true
}
}

fn cached_only_arg_parse(flags: &mut Flags, matches: &ArgMatches) {
if matches.is_present("cached-only") {
flags.cached_only = true;
Expand Down Expand Up @@ -3456,6 +3475,26 @@ mod tests {
);
}

#[test]
fn run_with_enable_testing_features() {
let r = flags_from_vec(svec![
"deno",
"run",
"--enable-testing-features-do-not-use",
"script.ts"
]);
assert_eq!(
r.unwrap(),
Flags {
subcommand: DenoSubcommand::Run {
script: "script.ts".to_string(),
},
enable_testing_features: true,
..Flags::default()
}
);
}

#[test]
fn test_with_fail_fast() {
let r = flags_from_vec(svec!["deno", "test", "--fail-fast=3"]);
Expand All @@ -3478,6 +3517,32 @@ mod tests {
);
}

#[test]
fn test_with_enable_testing_features() {
let r = flags_from_vec(svec![
"deno",
"test",
"--enable-testing-features-do-not-use"
]);
assert_eq!(
r.unwrap(),
Flags {
subcommand: DenoSubcommand::Test {
no_run: false,
doc: false,
fail_fast: None,
filter: None,
allow_none: false,
quiet: false,
shuffle: None,
include: None,
concurrent_jobs: 1,
},
enable_testing_features: true,
..Flags::default()
}
);
}
#[test]
fn test_watch() {
let r = flags_from_vec(svec!["deno", "test", "--watch"]);
Expand Down
Loading

0 comments on commit 7d0744a

Please sign in to comment.