feat: Deno 1.43 upgrade

feat: Deno 1.43 upgrade

Author: andreespirela

Cargo.lock

@@ -18,41 +18,41 @@ resolver = "2"
 
 [workspace.dependencies]
 url = { version = "2.3.1" }
-eszip = "0.60.0"
+eszip = "=0.68.2"
 log = "0.4.20"
 anyhow = { version = "1.0.57" }
 libc = { version = "0.2.144" }
-deno_ast = { version = "0.32.0", features = ["transpiling"] }
-deno_broadcast_channel = { version = "0.130.0" }
-deno_core = { version = "0.256.0" }
-deno_console = { version = "0.136.0" }
-deno_crypto =  { version = "0.150.0" }
-deno_fetch = { version = "0.160.0" }
-deno_fs = { version = "0.46.0", features = ["sync_fs"] }
-deno_config = "=0.9.1"
-deno_io = "0.46.0"
-deno_webgpu = "0.103.0"
-deno_canvas = "0.5.0"
-deno_graph = "=0.64.1"
-deno_http =  { version = "0.133.0" }
-deno_media_type = { version = "0.1.1", features = ["module_specifier"] }
-deno_net = { version = "0.128.0" }
-deno_npm = "0.16.0"
-deno_url = { version = "0.136.0" }
+deno_ast = { version = "=0.38.1", features = ["transpiling"] }
+deno_broadcast_channel = { version = "0.143.0" }
+deno_core = { version = "0.278.0" }
+deno_console = { version = "0.149.0" }
+deno_crypto =  { version = "0.163.0" }
+deno_fetch = { version = "0.173.0" }
+deno_fs = { version = "0.59.0", features = ["sync_fs"] }
+deno_config = "=0.16.3"
+deno_io = "0.59.0"
+deno_webgpu = "0.116.0"
+deno_canvas = "0.18.0"
+deno_graph = "=0.74.5"
+deno_http =  { version = "0.146.0" }
+deno_media_type = { version = "0.1.4", features = ["module_specifier"] }
+deno_net = { version = "0.141.0" }
+deno_npm = "0.18.0"
+deno_url = { version = "0.149.0" }
 deno_semver = "0.5.4"
-deno_tls = { version = "0.123.0"}
-deno_webidl = { version = "0.136.0" }
-deno_web = { version = "0.167.0" }
-deno_websocket = { version = "0.141.0" }
-deno_webstorage = { version = "0.131.0" }
-deno_lockfile = { version = "0.18.0" }
+deno_tls = { version = "0.136.0"}
+deno_webidl = { version = "0.149.0" }
+deno_web = { version = "0.180.0" }
+deno_websocket = { version = "0.154.0" }
+deno_webstorage = { version = "0.144.0" }
 enum-as-inner = "0.6.0"
 serde = { version = "1.0.149", features = ["derive"] }
 hyper = "0.14.26"
-tokio = { version = "1.35", features = ["full"] }
+tokio = { version = "1.36.0", features = ["full"] }
 bytes = { version = "1.4.0" }
 once_cell = "1.17.1"
 thiserror = "1.0.40"
+deno_lockfile = "0.19.0"
 async-trait = "0.1.73"
 indexmap = { version = "2.0.0", features = ["serde"] }
 flate2 = "=1.0.26"
@@ -72,7 +72,7 @@ futures = { version = "0.3.28" }
 futures-util = { version = "0.3.28" }
 ctor = { version = "0.2.6" }
 fastwebsockets = { version = "0.4.4", features = ["upgrade"] }
-percent-encoding = "=2.3.0"
+percent-encoding = "=2.3.1"
 scopeguard = { version = "1.2.0" }
 glob = "0.3.1"
 httparse = "1.8"
@@ -81,8 +81,8 @@ faster-hex = "0.9.0"
 strum = "0.25"
 
 # DEBUG
-#[patch.crates-io]
-#deno_core = { path = "/your/path/to/deno_core/core" }
+# [patch.crates-io]
+# deno_core = { path = "/Users/andrespirela/Documents/workspace/supabase/deno_core/core" }
 
 [profile.dind]
 inherits = "dev"

Cargo.toml

@@ -5,10 +5,11 @@ use std::path::PathBuf;
 mod supabase_startup_snapshot {
     use super::*;
     use deno_core::error::AnyError;
-    use deno_core::snapshot_util::*;
+    use deno_core::snapshot::{create_snapshot, CreateSnapshotOptions};
     use deno_core::Extension;
     use deno_fs::OpenOptions;
     use deno_http::DefaultHttpPropertyExtractor;
+    use deno_io::fs::FsError;
     use event_worker::js_interceptors::sb_events_js_interceptors;
     use event_worker::sb_user_event_worker;
     use sb_ai::sb_ai;
@@ -22,7 +23,10 @@ mod supabase_startup_snapshot {
     use sb_env::sb_env;
     use sb_node::deno_node;
     use sb_workers::sb_user_workers;
+    use std::borrow::Cow;
+    use std::io::Write;
     use std::path::Path;
+    use std::rc::Rc;
     use std::sync::Arc;
     use url::Url;
 
@@ -90,6 +94,17 @@ mod supabase_startup_snapshot {
     }
 
     impl deno_fs::FsPermissions for Permissions {
+        fn check_open<'a>(
+            &mut self,
+            _resolved: bool,
+            _read: bool,
+            _write: bool,
+            path: &'a Path,
+            _api_name: &str,
+        ) -> Result<Cow<'a, Path>, FsError> {
+            Ok(Cow::Borrowed(path))
+        }
+
         fn check_read(&mut self, _path: &Path, _api_name: &str) -> Result<(), AnyError> {
             unreachable!("snapshotting!")
         }
@@ -128,12 +143,13 @@ mod supabase_startup_snapshot {
             unreachable!("snapshotting!")
         }
 
-        fn check(
+        fn check<'a>(
             &mut self,
+            _resolved: bool,
             _open_options: &OpenOptions,
-            _path: &Path,
+            _path: &'a Path,
             _api_name: &str,
-        ) -> Result<(), AnyError> {
+        ) -> Result<std::borrow::Cow<'a, Path>, FsError> {
             unreachable!("snapshotting!")
         }
     }
@@ -171,7 +187,7 @@ mod supabase_startup_snapshot {
     pub fn create_runtime_snapshot(snapshot_path: PathBuf) {
         let user_agent = String::from("supabase");
         let fs = Arc::new(deno_fs::RealFs);
-        let mut extensions: Vec<Extension> = vec![
+        let extensions: Vec<Extension> = vec![
             sb_core_permissions::init_ops_and_esm(false),
             deno_webidl::deno_webidl::init_ops_and_esm(),
             deno_console::deno_console::init_ops_and_esm(),
@@ -212,24 +228,28 @@ mod supabase_startup_snapshot {
             sb_core_runtime::init_ops_and_esm(None),
         ];
 
-        for extension in &mut extensions {
-            for source in extension.esm_files.to_mut() {
-                let _ = maybe_transpile_source(source).unwrap();
-            }
-            for source in extension.js_files.to_mut() {
-                let _ = maybe_transpile_source(source).unwrap();
-            }
-        }
-
-        let _ = create_snapshot(CreateSnapshotOptions {
-            cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"),
-            snapshot_path,
-            startup_snapshot: None,
-            skip_op_registration: false,
-            extensions,
-            compression_cb: None,
-            with_runtime_cb: None,
-        });
+        let snapshot = create_snapshot(
+            CreateSnapshotOptions {
+                cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"),
+                startup_snapshot: None,
+                extensions,
+                extension_transpiler: Some(Rc::new(|specifier, source| {
+                    maybe_transpile_source(specifier, source)
+                })),
+                skip_op_registration: false,
+                with_runtime_cb: None,
+            },
+            None,
+        );
+
+        let output = snapshot.unwrap();
+
+        let mut snapshot = std::fs::File::create(snapshot_path).unwrap();
+        snapshot.write_all(&output.output).unwrap();
+
+        for path in output.files_loaded_during_snapshot {
+            println!("cargo:rerun-if-changed={}", path.display());
+        }
     }
 }
 
@@ -242,5 +262,5 @@ fn main() {
     // Main snapshot
     let runtime_snapshot_path = o.join("RUNTIME_SNAPSHOT.bin");
 
-    supabase_startup_snapshot::create_runtime_snapshot(runtime_snapshot_path)
+    supabase_startup_snapshot::create_runtime_snapshot(runtime_snapshot_path.clone());
 }