Skip to content

Commit ca246a4

Browse files
Merge pull request #217 from supabase/refactor-eszip-mods
Feat: Unify module loader into a single module loader (eszips)
2 parents e3c9e9e + 1aec460 commit ca246a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+841
-1243
lines changed

Cargo.lock

Lines changed: 69 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ members = [
44
"./crates/cli",
55
"./crates/module_fetcher",
66
"./crates/sb_workers",
7-
"./crates/sb_worker_context",
87
"./crates/sb_env",
98
"./crates/sb_core",
109
"./crates/flaky_test",
1110
"./crates/sb_os",
1211
"./crates/cpu_timer",
1312
"./crates/event_worker",
14-
"./crates/sb_eszip",
15-
"./crates/npm"
13+
"./crates/npm",
14+
"./crates/sb_graph",
15+
"./crates/sb_module_loader",
16+
"./crates/sb_fs"
1617
]
1718
resolver = "2"
1819

@@ -58,6 +59,7 @@ fs3 = "0.5.0"
5859
tokio-util = "0.7.4"
5960
uuid = { version = "1.3.0", features = ["v4"] }
6061
rsa = { version = "0.7.0", default-features = false, features = ["std", "pem", "hazmat"] }
62+
monch = "=0.4.3"
6163

6264
reqwest = { version = "0.11.20", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks", "json"] }
6365
ring = "=0.16.20"

crates/base/Cargo.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
async-trait.workspace = true
1010
thiserror = "1.0.40"
11-
monch = "=0.4.3"
11+
monch.workspace = true
1212
once_cell.workspace = true
1313
deno_semver.workspace = true
1414
deno_npm.workspace = true
@@ -41,13 +41,13 @@ serde = { version = "1.0.149", features = ["derive"] }
4141
tokio = { workspace = true }
4242
url = { version = "2.3.1" }
4343
event_worker ={ version = "0.1.0", path = "../event_worker" }
44-
sb_worker_context = { version = "0.1.0", path = "../sb_worker_context" }
4544
sb_workers = { version = "0.1.0", path = "../sb_workers" }
4645
sb_env = { version = "0.1.0", path = "../sb_env" }
4746
sb_core = { version = "0.1.0", path = "../sb_core" }
4847
sb_os = { version = "0.1.0", path = "../sb_os" }
49-
sb_eszip = { version = "0.1.0", path = "../sb_eszip" }
5048
sb_npm = { version = "0.1.0", path = "../npm" }
49+
sb_graph = { version = "0.1.0", path = "../sb_graph" }
50+
sb_module_loader = { version = "0.1.0", path = "../sb_module_loader" }
5151
urlencoding = { version = "2.1.2" }
5252
uuid = { workspace = true }
5353
deno_broadcast_channel.workspace = true
@@ -87,11 +87,9 @@ serde = { version = "1.0.149", features = ["derive"] }
8787
tokio.workspace = true
8888
url = { version = "2.3.1" }
8989
event_worker ={ version = "0.1.0", path = "../event_worker" }
90-
sb_worker_context = { version = "0.1.0", path = "../sb_worker_context" }
9190
sb_workers = { version = "0.1.0", path = "../sb_workers" }
9291
sb_env = { version = "0.1.0", path = "../sb_env" }
9392
sb_core = { version = "0.1.0", path = "../sb_core" }
9493
sb_os = { version = "0.1.0", path = "../sb_os" }
9594
sb_node = { version = "0.1.0", path = "../node" }
96-
deno_broadcast_channel.workspace = true
97-
sb_eszip = { version = "0.1.0", path = "../sb_eszip" }
95+
deno_broadcast_channel.workspace = true

0 commit comments

Comments
 (0)