chore: Fix snapshots, Clean up cargo.toml

Author: andreespirela

Cargo.lock

@@ -17,6 +17,7 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
+url = { version = "2.3.1" }
 eszip = "0.56.0"
 log = "0.4.20"
 anyhow = { version = "1.0.57" }
@@ -34,9 +35,9 @@ deno_graph = "=0.62.2"
 deno_http =  { version = "0.127.0" }
 deno_media_type = { version = "0.1.1", features = ["module_specifier"] }
 deno_net = { version = "0.122.0" }
-deno_npm = "0.15.1"
+deno_npm = "0.15.3"
 deno_url = { version = "0.130.0" }
-deno_semver = "0.5.0"
+deno_semver = "0.5.1"
 deno_tls = { version = "0.117.0"}
 deno_webidl = { version = "0.130.0" }
 deno_web = { version = "0.161.0" }
@@ -49,7 +50,7 @@ tokio = { version = "1.28.1", features = ["full"] }
 bytes = { version = "1.4.0" }
 once_cell = "1.17.1"
 thiserror = "1.0.40"
-deno_lockfile = "0.17.1"
+deno_lockfile = "0.17.2"
 async-trait = "0.1.73"
 indexmap = { version = "2.0.0", features = ["serde"] }
 flate2 = "=1.0.26"
@@ -59,7 +60,7 @@ fs3 = "0.5.0"
 tokio-util = "0.7.4"
 uuid = { version = "1.3.0", features = ["v4"] }
 rsa = { version = "0.9.3", default-features = false, features = ["std", "pem", "hazmat"] } # hazmat needed for PrehashSigner in ext/node
-monch = "=0.4.3"
+monch = "=0.5.0"
 reqwest = { version = "0.11.20", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks", "json"] }
 ring = "^0.17.0"
 urlencoding = { version = "2.1.2" }
@@ -70,5 +71,9 @@ futures-util = { version = "0.3.28" }
 ctor = { version = "0.2.6" }
 percent-encoding = "=2.3.0"
 
+# DEBUG
+#[patch.crates-io]
+#deno_core = { path = "/your/path/to/deno_core/core" }
+
 [profile.release]
 lto = true

Cargo.toml

@@ -14,12 +14,12 @@ deno_semver.workspace = true
 deno_npm.workspace = true
 cpu_timer = { version = "0.1.0", path = "../cpu_timer" }
 anyhow = { workspace = true }
-bytes = { version = "1.2.1" }
+bytes = { workspace = true }
 cityhash = { version = "0.1.1" }
 deno_ast = { workspace = true }
 deno_fs.workspace = true
 deno_io = { workspace = true }
-deno_core = { workspace = true }
+deno_core.workspace = true
 deno_console = { workspace = true }
 deno_crypto =  { workspace = true }
 deno_fetch = { workspace = true }
@@ -31,16 +31,16 @@ deno_webidl = { workspace = true }
 deno_web = { workspace = true }
 deno_websocket = { workspace = true }
 httparse = { version = "1.8.0" }
-hyper = { version = "0.14.26", features = ["full"] }
+hyper = { workspace = true, features = ["full"] }
 http = { version = "0.2" }
 import_map.workspace = true
 log = { workspace = true }
 reqwest.workspace = true
-serde = { version = "1.0.149", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 tokio = { workspace = true }
 tokio-util = { workspace = true, features = ["rt"] }
 futures-util = { workspace = true }
-url = { version = "2.3.1" }
+url.workspace = true
 event_worker ={ version = "0.1.0", path = "../event_worker" }
 sb_workers = { version = "0.1.0", path = "../sb_workers" }
 sb_env = { version = "0.1.0", path = "../sb_env" }
@@ -74,11 +74,10 @@ sb_env = { version = "0.1.0", path = "../sb_env" }
 sb_os = { version = "0.1.0", path = "../sb_os" }
 sb_node = { version = "0.1.0", path = "../node" }
 anyhow = { workspace = true }
-bytes = { version = "1.2.1" }
+bytes = { workspace = true }
 deno_ast = { workspace = true }
 deno_fs.workspace = true
 deno_io = { workspace = true }
-deno_core = { workspace = true }
 deno_console = { workspace = true }
 deno_crypto =  { workspace = true }
 deno_fetch = { workspace = true }
@@ -90,12 +89,13 @@ deno_webidl = { workspace = true }
 deno_web = { workspace = true }
 deno_websocket = { workspace = true }
 httparse = { version = "1.8.0" }
-hyper = { version = "0.14.26", features = ["full"] }
+hyper = { workspace = true, features = ["full"] }
 http = { version = "0.2" }
 log = { workspace = true }
 reqwest.workspace = true
-serde = { version = "1.0.149", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 tokio.workspace = true
-url = { version = "2.3.1" }
+url.workspace = true
 event_worker ={ version = "0.1.0", path = "../event_worker" }
 deno_broadcast_channel.workspace = true
+deno_core.workspace = true

crates/base/Cargo.toml

@@ -6,7 +6,10 @@ use cpu_timer::get_thread_time;
 use ctor::ctor;
 use deno_core::error::AnyError;
 use deno_core::url::Url;
-use deno_core::{located_script_name, serde_v8, JsRuntime, ModuleCode, ModuleId, RuntimeOptions};
+use deno_core::{
+    located_script_name, serde_v8, JsRuntime, ModuleCode, ModuleId, PollEventLoopOptions,
+    RuntimeOptions,
+};
 use deno_http::DefaultHttpPropertyExtractor;
 use deno_tls::deno_native_certs::load_native_certs;
 use deno_tls::rustls;
@@ -435,7 +438,13 @@ impl DenoRuntime {
                 Err(err) => return Poll::Ready(Err(err)),
             };
 
-            let poll_result = js_runtime.poll_event_loop(cx, false);
+            let poll_result = js_runtime.poll_event_loop(
+                cx,
+                PollEventLoopOptions {
+                    wait_for_inspector: false,
+                    pump_v8_message_loop: false,
+                },
+            );
 
             let cpu_time_after_poll_ns = match get_current_cpu_time_ns_fn() {
                 Ok(value) => value,
@@ -467,11 +476,11 @@ impl DenoRuntime {
             Err(err) => Err(anyhow!("event loop error: {}", err)),
             Ok(_) => match mod_result_rx.await {
                 Err(_) => Err(anyhow!("mod result sender dropped")),
-                Ok(Err(err)) => {
-                    error!("{}", err.to_string());
-                    Err(err)
-                }
-                Ok(Ok(_)) => Ok(()),
+                // Ok(Err(err)) => {
+                //     error!("{}", err.to_string());
+                //     Err(err)
+                // }
+                Ok(_) => Ok(()),
             },
         };
 
@@ -514,7 +523,7 @@ fn set_v8_flags() {
 #[cfg(test)]
 mod test {
     use crate::deno_runtime::DenoRuntime;
-    use deno_core::{FastString, ModuleCode};
+    use deno_core::{FastString, ModuleCode, PollEventLoopOptions};
     use sb_core::conn_sync::ConnSync;
     use sb_graph::emitter::EmitterFactory;
     use sb_graph::{generate_binary_eszip, EszipPayloadKind};
@@ -599,7 +608,13 @@ mod test {
         }
 
         let main_mod_ev = rt.js_runtime.mod_evaluate(rt.main_module_id);
-        let _ = rt.js_runtime.run_event_loop(false).await;
+        let _ = rt
+            .js_runtime
+            .run_event_loop(PollEventLoopOptions {
+                wait_for_inspector: false,
+                pump_v8_message_loop: false,
+            })
+            .await;
 
         let read_is_even_global = rt
             .js_runtime
@@ -654,7 +669,13 @@ mod test {
         }
 
         let main_mod_ev = rt.js_runtime.mod_evaluate(rt.main_module_id);
-        let _ = rt.js_runtime.run_event_loop(false).await;
+        let _ = rt
+            .js_runtime
+            .run_event_loop(PollEventLoopOptions {
+                wait_for_inspector: false,
+                pump_v8_message_loop: false,
+            })
+            .await;
 
         let read_is_even_global = rt
             .js_runtime

crates/base/src/deno_runtime.rs

@@ -1,6 +1,5 @@
-const primordials = globalThis.__bootstrap.primordials;
+import { primordials, core } from "ext:core/mod.js";
 const { SymbolAsyncIterator } = primordials;
-const core = globalThis.Deno.core;
 
 class SupabaseEventListener {
 	async nextEvent() {

crates/event_worker/event_worker.js

@@ -60,14 +60,14 @@ ring.workspace = true
 ripemd = "0.1.3"
 rsa.workspace = true
 scrypt = "0.11.0"
-serde = "1.0.149"
+serde.workspace = true
 sha-1 = "0.10.0"
 sha2 = { version = "0.10.8", features = ["oid"] }
 signature = "2.1"
 simd-json = "0.13.4"
 tokio.workspace = true
 typenum = "1.15.0"
-url = { version = "2.3.1", features = ["serde", "expose_internals"] }
+url = { workspace = true, features = ["serde", "expose_internals"] }
 winapi = "=0.3.9"
 x25519-dalek = "2.0.0"
 x509-parser = "0.15.0"

crates/node/Cargo.toml

@@ -26,7 +26,7 @@ flate2.workspace = true
 ring.workspace = true
 sb_node = { version = "0.1.0", path = "../node" }
 serde.workspace = true
-percent-encoding = "=2.3.0"
+percent-encoding.workspace = true
 hex = "0.4"
 base64.workspace = true
 bincode = "=1.3.3"

crates/npm/Cargo.toml

@@ -11,7 +11,6 @@ license = "MIT"
 path = "lib.rs"
 
 [dependencies]
-walkdir = "=2.3.2"
 deno_ast = { workspace = true, features = ["transpiling", "bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
 deno_net.workspace = true
 deno_web.workspace = true
@@ -29,7 +28,7 @@ deno_tls.workspace = true
 thiserror.workspace = true
 sb_node = { version = "0.1.0", path = "../node" }
 deno_crypto.workspace = true
-fs3 = "0.5.0"
+fs3.workspace = true
 log.workspace = true
 tokio-util.workspace = true
 ring.workspace = true
@@ -39,7 +38,7 @@ import_map.workspace = true
 data-url = { version= "=0.3.0" }
 cache_control = { version = "=0.2.0" }
 chrono = { version = "=0.4.22", default-features = false, features = ["clock"] }
-deno_cache_dir = "=0.6.0"
+deno_cache_dir = "=0.6.1"
 libc = { workspace = true }
 twox-hash = { version = "=1.6.3" }
 deno_webstorage.workspace = true

crates/sb_core/Cargo.toml

@@ -42,9 +42,10 @@ import * as messagePort from 'ext:deno_web/13_message_port.js';
 import { SupabaseEventListener } from 'ext:sb_user_event_worker/event_worker.js';
 import * as MainWorker from 'ext:sb_core_main_js/js/main_worker.js';
 import * as DenoWebCompression from 'ext:deno_web/14_compression.js';
+import * as imageData from "ext:deno_web/16_image_data.js";
 import * as DenoWSStream from 'ext:deno_websocket/02_websocketstream.js';
-
-const core = globalThis.Deno.core;
+import * as eventSource from "ext:deno_fetch/27_eventsource.js";
+import { primordials, core } from "ext:core/mod.js";
 const ops = core.ops;
 
 const {
@@ -54,7 +55,7 @@ const {
 	ObjectSetPrototypeOf,
 	ObjectFreeze,
 	StringPrototypeSplit,
-} = globalThis.__bootstrap.primordials;
+} = primordials;
 
 const globalScope = {
 	console: nonEnumerable(
@@ -71,6 +72,7 @@ const globalScope = {
 	Request: nonEnumerable(request.Request),
 	Response: nonEnumerable(response.Response),
 	Headers: nonEnumerable(headers.Headers),
+	ImageData: nonEnumerable(imageData.ImageData),
 	fetch: writable(fetch.fetch),
 
 	// base64
@@ -214,16 +216,16 @@ function runtimeStart(runtimeOptions, source) {
 // This is because v8 sets a console that can't be easily overriden
 // and collides with globalScope.console
 delete globalThis.console;
-ObjectDefineProperties(globalThis, globalScope);
+// ObjectDefineProperties(globalThis, globalScope);
 
 const globalProperties = {
-	Window: globalInterfaces.windowConstructorDescriptor,
-	window: getterOnly(() => globalThis),
-	Navigator: nonEnumerable(Navigator),
-	navigator: getterOnly(() => navigator),
-	self: getterOnly(() => globalThis),
+	// Window: globalInterfaces.windowConstructorDescriptor,
+	// window: getterOnly(() => globalThis),
+	// Navigator: nonEnumerable(Navigator),
+	// navigator: getterOnly(() => navigator),
+	// self: getterOnly(() => globalThis),
 };
-ObjectDefineProperties(globalThis, globalProperties);
+// ObjectDefineProperties(globalThis, globalProperties);
 
 const deleteDenoApis = (apis) => {
 	apis.forEach((key) => {

crates/sb_core/js/bootstrap.js

@@ -1,6 +1,5 @@
 import { DOMException } from "ext:deno_web/01_dom_exception.js";
-
-const core = globalThis.Deno.core;
+import { core } from "ext:core/mod.js";
 
 const knownErrors = {
     Interrupted: core.Interrupted,