From 2a7a50e9fe150796de5061b6584945e4a8c5e98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 14 Jun 2024 00:38:24 +0200 Subject: [PATCH 1/6] add a test that currently fails --- tests/integration/inspector_tests.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/integration/inspector_tests.rs b/tests/integration/inspector_tests.rs index 7e7bf9e4ed2167..57831ab46cbcc7 100644 --- a/tests/integration/inspector_tests.rs +++ b/tests/integration/inspector_tests.rs @@ -499,12 +499,14 @@ async fn inspector_does_not_hang() { .send_many(&[ json!({"id":1,"method":"Runtime.enable"}), json!({"id":2,"method":"Debugger.enable"}), + json!({"id":3,"method":"Debugger.setBlackboxPatterns","params":{"patterns":["/node_modules/|/bower_components/"]}}), ]) .await; tester.assert_received_messages( &[ r#"{"id":1,"result":{}}"#, - r#"{"id":2,"result":{"debuggerId":"# + r#"{"id":2,"result":{"debuggerId":"#, + r#"{"id":3,"result":"#, ], &[ r#"{"method":"Runtime.executionContextCreated","params":{"context":{"id":1,"# @@ -513,21 +515,21 @@ async fn inspector_does_not_hang() { .await; tester - .send(json!({"id":3,"method":"Runtime.runIfWaitingForDebugger"})) + .send(json!({"id":4,"method":"Runtime.runIfWaitingForDebugger"})) .await; tester .assert_received_messages( - &[r#"{"id":3,"result":{}}"#], + &[r#"{"id":4,"result":{}}"#], &[r#"{"method":"Debugger.paused","#], ) .await; tester - .send(json!({"id":4,"method":"Debugger.resume"})) + .send(json!({"id":5,"method":"Debugger.resume"})) .await; tester .assert_received_messages( - &[r#"{"id":4,"result":{}}"#], + &[r#"{"id":5,"result":{}}"#], &[r#"{"method":"Debugger.resumed","params":{}}"#], ) .await; From bdfecef7a0b0bc4ca05a26fb125034896348f448 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Fri, 14 Jun 2024 09:08:53 +0530 Subject: [PATCH 2/6] Update deno_core --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 1f188e5bdc4c41..2d1b78b1d6a9b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -368,3 +368,6 @@ opt-level = 3 opt-level = 3 [profile.release.package.base64-simd] opt-level = 3 + +[patch.crates-io] +deno_core = { git = "https://github.com/denoland/deno_core", branch = "v8_default_context" } From bee507425c2a7d85e1550f6fda0d8467d9933a23 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Fri, 14 Jun 2024 09:14:47 +0530 Subject: [PATCH 3/6] re run ci From 79e7d3311fa87cd27af2bc2ea7450259948859f7 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Fri, 14 Jun 2024 09:16:40 +0530 Subject: [PATCH 4/6] update Cargo.lock --- Cargo.lock | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12be389277560f..4d89908496e622 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1304,8 +1304,7 @@ dependencies = [ [[package]] name = "deno_core" version = "0.288.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e569b7a3e463a9f3b111a4279afa06b6909f6ecdc27aeedd3c310a57184ac217" +source = "git+https://github.com/denoland/deno_core?branch=v8_default_context#a7be1344e36659b20beebf1bb892907a90f0b081" dependencies = [ "anyhow", "bincode", @@ -1762,8 +1761,7 @@ dependencies = [ [[package]] name = "deno_ops" version = "0.164.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "748c200b559272ba65d98c25fc38e789901c847c41273e0232cc0df4cf6cad8b" +source = "git+https://github.com/denoland/deno_core?branch=v8_default_context#a7be1344e36659b20beebf1bb892907a90f0b081" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -5775,8 +5773,7 @@ dependencies = [ [[package]] name = "serde_v8" version = "0.197.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8b2ba47cda7f2941f66b4a0eec34b5f21d4ac3566fbc89598ff499a300f406" +source = "git+https://github.com/denoland/deno_core?branch=v8_default_context#a7be1344e36659b20beebf1bb892907a90f0b081" dependencies = [ "num-bigint", "serde", From 314a50804a0b53fa1fee19365edb2f1412aa1ec4 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Fri, 14 Jun 2024 20:01:02 +0530 Subject: [PATCH 5/6] fix --- Cargo.lock | 15 +++++++++------ Cargo.toml | 4 +--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d89908496e622..715423cabe59dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1303,8 +1303,9 @@ dependencies = [ [[package]] name = "deno_core" -version = "0.288.0" -source = "git+https://github.com/denoland/deno_core?branch=v8_default_context#a7be1344e36659b20beebf1bb892907a90f0b081" +version = "0.289.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e22f78a33feec9a7b211253b0aefbb8cb3b0081483ee8cec7bd954c76ac072a" dependencies = [ "anyhow", "bincode", @@ -1760,8 +1761,9 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.164.0" -source = "git+https://github.com/denoland/deno_core?branch=v8_default_context#a7be1344e36659b20beebf1bb892907a90f0b081" +version = "0.165.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063c6ab08f9275a958878ae54e470cc6ce16f81c1fef16129db0c99d46c5fd35" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -5772,8 +5774,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.197.0" -source = "git+https://github.com/denoland/deno_core?branch=v8_default_context#a7be1344e36659b20beebf1bb892907a90f0b081" +version = "0.198.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "491380c88077b81b2390e5f0cc10f64860819ba03369bb154bb9e4a587b31a01" dependencies = [ "num-bigint", "serde", diff --git a/Cargo.toml b/Cargo.toml index 2d1b78b1d6a9b3..7b0b930fa35d4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ repository = "https://github.com/denoland/deno" [workspace.dependencies] deno_ast = { version = "=0.39.1", features = ["transpiling"] } -deno_core = { version = "0.288.0" } +deno_core = { version = "0.289.0" } deno_bench_util = { version = "0.150.0", path = "./bench_util" } deno_lockfile = "0.20.0" @@ -369,5 +369,3 @@ opt-level = 3 [profile.release.package.base64-simd] opt-level = 3 -[patch.crates-io] -deno_core = { git = "https://github.com/denoland/deno_core", branch = "v8_default_context" } From 4f65fb6ea818003297be37dfe8ac1ac1f84f03a4 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Fri, 14 Jun 2024 20:02:14 +0530 Subject: [PATCH 6/6] x --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7b0b930fa35d4f..5123412e0b9382 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -368,4 +368,3 @@ opt-level = 3 opt-level = 3 [profile.release.package.base64-simd] opt-level = 3 -