Merge pull request #223 from supabase/refactor-module-fetcher-2

Feat: Refactor module fetcher

Author: andreespirela

Cargo.lock

@@ -2,7 +2,6 @@
 members = [
   "./crates/base",
   "./crates/cli",
-  "./crates/module_fetcher",
   "./crates/sb_workers",
   "./crates/sb_env",
   "./crates/sb_core",
@@ -63,6 +62,8 @@ monch = "=0.4.3"
 reqwest = { version = "0.11.20", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks", "json"] }
 ring = "=0.16.20"
 urlencoding = { version = "2.1.2" }
+import_map = { version = "0.15.0" }
+base64 = { version = "=0.13.1" }
 
 [profile.release]
 lto = true

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 async-trait.workspace = true
-thiserror = "1.0.40"
+thiserror.workspace = true
 monch.workspace = true
 once_cell.workspace = true
 deno_semver.workspace = true
@@ -17,7 +17,7 @@ anyhow = { workspace = true }
 bytes = { version = "1.2.1" }
 cityhash = { version = "0.1.1" }
 deno_ast = { workspace = true }
-deno_fs = { workspace = true }
+deno_fs = { workspace = true, features = ["sync_fs"] }
 deno_io = { workspace = true }
 deno_core = { workspace = true }
 deno_console = { workspace = true }
@@ -33,9 +33,8 @@ deno_websocket = { workspace = true }
 httparse = { version = "1.8.0" }
 hyper = { version = "0.14.26", features = ["full"] }
 http = { version = "0.2" }
-import_map = { version = "0.15.0" }
+import_map.workspace = true
 log = { workspace = true }
-module_fetcher = { path = "../module_fetcher" }
 reqwest.workspace = true
 serde = { version = "1.0.149", features = ["derive"] }
 tokio = { workspace = true }
@@ -60,10 +59,17 @@ futures-util = { version = "0.3.28" }
 flaky_test = { version = "0.1.0", path = "../flaky_test" }
 
 [build-dependencies]
+sb_core = { version = "0.1.0", path = "../sb_core" }
+sb_npm = { version = "0.1.0", path = "../npm" }
+sb_graph = { version = "0.1.0", path = "../sb_graph" }
+sb_workers = { version = "0.1.0", path = "../sb_workers" }
+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" }
 deno_ast = { workspace = true }
-deno_fs = { workspace = true }
+deno_fs = { workspace = true, features = ["sync_fs"] }
 deno_io = { workspace = true }
 deno_core = { workspace = true }
 deno_console = { workspace = true }
@@ -80,15 +86,9 @@ httparse = { version = "1.8.0" }
 hyper = { version = "0.14.26", features = ["full"] }
 http = { version = "0.2" }
 log = { workspace = true }
-module_fetcher = { path = "../module_fetcher" }
 reqwest.workspace = true
 serde = { version = "1.0.149", features = ["derive"] }
 tokio.workspace = true
 url = { version = "2.3.1" }
 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" }
-sb_core = { version = "0.1.0", path = "../sb_core" }
-sb_os = { version = "0.1.0", path = "../sb_os" }
-sb_node = { version = "0.1.0", path = "../node" }
 deno_broadcast_channel.workspace = true

crates/base/Cargo.toml

@@ -22,7 +22,7 @@ use crate::snapshot;
 use event_worker::events::{EventMetadata, WorkerEventWithMetadata};
 use event_worker::js_interceptors::sb_events_js_interceptors;
 use event_worker::sb_user_event_worker;
-use module_fetcher::file_fetcher::CacheSetting;
+use sb_core::cache::CacheSetting;
 use sb_core::cert::ValueRootCertStoreProvider;
 use sb_core::http_start::sb_core_http;
 use sb_core::net::sb_core_net;