Skip to content

Commit

Permalink
Merge pull request #201 from supabase/deno-1-37-2
Browse files Browse the repository at this point in the history
fix: update packages to Deno 1.37.2
  • Loading branch information
laktek authored Nov 7, 2023
2 parents b2092c6 + e45f19e commit 96bdad2
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 73 deletions.
72 changes: 36 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 19 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,26 @@ log = "0.4.20"
anyhow = { version = "1.0.57" }
libc = { version = "0.2.144" }
deno_ast = { version = "0.29.1", features = [ "cjs", "transpiling" ] }
deno_core = { version = "0.218.0" }
deno_console = { version = "0.120.0" }
deno_crypto = { version = "0.134.0" }
deno_fetch = { version = "0.144.0" }
deno_broadcast_channel = { version = "0.114.0" }
deno_fs = "0.30.0"
deno_broadcast_channel = { version = "0.115.0" }
deno_core = { version = "0.222.0" }
deno_console = { version = "0.121.0" }
deno_crypto = { version = "0.135.0" }
deno_fetch = { version = "0.145.0" }
deno_fs = "0.31.0"
deno_config = "=0.3.1"
deno_io = "0.30.0"
deno_io = "0.31.0"
deno_graph = "=0.55.0"
deno_http = { version = "0.115.0" }
deno_net = { version = "0.112.0" }
deno_url = { version = "0.120.0" }
deno_tls = { version = "0.107.0"}
deno_webidl = { version = "0.120.0" }
deno_web = { version = "0.151.0" }
deno_websocket = { version = "0.125.0" }
deno_webstorage = { version = "0.115.0" }
deno_http = { version = "0.116.0" }
deno_media_type = { version = "0.1.1", features = ["module_specifier"] }
deno_net = { version = "0.113.0" }
deno_npm = "0.15.1"
deno_url = { version = "0.121.0" }
deno_semver = "0.5.0"
deno_tls = { version = "0.108.0"}
deno_webidl = { version = "0.121.0" }
deno_web = { version = "0.152.0" }
deno_websocket = { version = "0.126.0" }
deno_webstorage = { version = "0.116.0" }
serde = { version = "1.0.149", features = ["derive"] }
hyper = "0.14.26"
tokio = { version = "1.28.1", features = ["full"] }
Expand All @@ -53,9 +56,7 @@ fs3 = "0.5.0"
tokio-util = "0.7.4"
uuid = { version = "1.3.0", features = ["v4"] }
rsa = { version = "0.7.0", default-features = false, features = ["std", "pem", "hazmat"] }
deno_media_type = { version = "0.1.1", features = ["module_specifier"] }
deno_npm = "0.15.1"
deno_semver = "0.5.0"

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

Expand Down
9 changes: 2 additions & 7 deletions crates/base/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ mod supabase_startup_snapshot {
fn allow_hrtime(&mut self) -> bool {
unreachable!("snapshotting!")
}

fn check_unstable(&self, _state: &deno_core::OpState, _api_name: &'static str) {
unreachable!("snapshotting!")
}
}

impl deno_websocket::WebSocketPermissions for Permissions {
Expand Down Expand Up @@ -215,13 +211,12 @@ mod supabase_startup_snapshot {
deno_crypto::deno_crypto::init_ops_and_esm(None),
deno_broadcast_channel::deno_broadcast_channel::init_ops_and_esm(
deno_broadcast_channel::InMemoryBroadcastChannel::default(),
false,
),
deno_net::deno_net::init_ops_and_esm::<Permissions>(None, false, None),
deno_net::deno_net::init_ops_and_esm::<Permissions>(None, None),
deno_tls::deno_tls::init_ops_and_esm(),
deno_http::deno_http::init_ops_and_esm::<DefaultHttpPropertyExtractor>(),
deno_io::deno_io::init_ops_and_esm(Some(Default::default())),
deno_fs::deno_fs::init_ops_and_esm::<Permissions>(false, fs.clone()),
deno_fs::deno_fs::init_ops_and_esm::<Permissions>(fs.clone()),
sb_env::init_ops_and_esm(),
sb_os::sb_os::init_ops_and_esm(),
sb_user_workers::init_ops_and_esm(),
Expand Down
9 changes: 2 additions & 7 deletions crates/base/src/deno_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,12 @@ impl DenoRuntime {
deno_crypto::deno_crypto::init_ops(None),
deno_broadcast_channel::deno_broadcast_channel::init_ops(
deno_broadcast_channel::InMemoryBroadcastChannel::default(),
false,
),
deno_net::deno_net::init_ops::<Permissions>(
Some(root_cert_store_provider),
false,
None,
),
deno_net::deno_net::init_ops::<Permissions>(Some(root_cert_store_provider), None),
deno_tls::deno_tls::init_ops(),
deno_http::deno_http::init_ops::<DefaultHttpPropertyExtractor>(),
deno_io::deno_io::init_ops(stdio),
deno_fs::deno_fs::init_ops::<Permissions>(false, fs.clone()),
deno_fs::deno_fs::init_ops::<Permissions>(fs.clone()),
sb_env_op::init_ops(),
sb_os::sb_os::init_ops(),
sb_user_workers::init_ops(),
Expand Down
2 changes: 1 addition & 1 deletion crates/base/test_cases/main_with_abort/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ serve(async (req: Request) => {
const worker = await createWorker();
const controller = new AbortController();
const signal = controller.signal;
controller.abort(new Error('Test abort'));
controller.abort();
return await worker.fetch(req, { signal });
} catch (e) {
console.error(e);
Expand Down
5 changes: 4 additions & 1 deletion crates/base/tests/main_worker_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ async fn test_main_worker_abort_request() {

let body_bytes = hyper::body::to_bytes(res.into_body()).await.unwrap();

assert_eq!(body_bytes, "{\"msg\":\"Error: Test abort\"}");
assert_eq!(
body_bytes,
"{\"msg\":\"AbortError: The signal has been aborted\"}"
);
}

//#[tokio::test]
Expand Down
2 changes: 1 addition & 1 deletion crates/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ whoami = "1.4.0"
winapi = "=0.3.9"
# https://github.com/dalek-cryptography/x25519-dalek/pull/89
x25519-dalek = "2.0.0-pre.1"
x509-parser = "0.15.0"
x509-parser = "0.15.0"
2 changes: 0 additions & 2 deletions crates/sb_core/permissions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ impl deno_web::TimersPermission for Permissions {
fn allow_hrtime(&mut self) -> bool {
false
}

fn check_unstable(&self, _state: &deno_core::OpState, _api_name: &'static str) {}
}

impl deno_fetch::FetchPermissions for Permissions {
Expand Down

0 comments on commit 96bdad2

Please sign in to comment.