Update gloo

Author: carlsverre

Cargo.lock

@@ -52,16 +52,17 @@ event-listener = "3.0"
 sha2 = "0.10.8"
 serde-wasm-bindgen = "0.6"
 
-# specific revision of gloo needed for:
-#  - access `TryFrom<web_sys::Websocket> for WebSocket`
-#  - parse_message receiving a uint8array directly
-# and the cloudflare compatibility fix for writing to a websocket
-gloo = { git = "https://github.com/carlsverre/gloo", rev = "90f88e31daf1a9592c08c09375731166eeb8940e" }
-gloo-net = { git = "https://github.com/carlsverre/gloo", rev = "90f88e31daf1a9592c08c09375731166eeb8940e" }
-
 # specific revision of tsify needed for serde updates
 tsify = { git = "https://github.com/carlsverre/tsify", rev = "c05a60b6ae15b2869bf63f618940dc56ef516d1d", default-features = false }
 
+# specific revision of gloo needed for:
+#  - parse_message receiving a uint8array directly
+#  - cloudflare compatibility fix for writing to a websocket
+[workspace.dependencies.gloo]
+git = "https://github.com/carlsverre/gloo"
+rev = "8f48a39a0a1e126e3c455525d5b4c51487102333"
+features = ["futures"]
+
 [workspace.dependencies.libsqlite3-sys]
 git = "https://github.com/trevyn/rusqlite"
 features = ["bundled", "wasm32-unknown-unknown-openbsd-libc"]

Cargo.toml

@@ -7,8 +7,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-gloo = { workspace = true, features = ["futures"] }
-gloo-net = { workspace = true, features = ["cloudflare"] }
+gloo = { workspace = true, features = ["cloudflare"] }
 futures.workspace = true
 worker.workspace = true
 console_error_panic_hook.workspace = true

demo/cloudflare-backend/Cargo.toml

@@ -8,6 +8,6 @@
     "wrangler-tail": "wrangler tail"
   },
   "devDependencies": {
-    "wrangler": "^3.22.3"
+    "wrangler": "^3.22.4"
   }
-}
+}

demo/cloudflare-backend/package.json

@@ -10,8 +10,8 @@ use futures::{
     stream::{repeat, SelectAll, SplitSink, SplitStream},
     FutureExt, SinkExt, StreamExt,
 };
+use gloo::net::websocket::{futures::WebSocket, Message, WebSocketError};
 use gloo::timers::future::TimeoutFuture;
-use gloo_net::websocket::{futures::WebSocket, Message, WebSocketError};
 use sqlsync::{
     coordinator::CoordinatorDocument,
     replication::{ReplicationMsg, ReplicationProtocol, ReplicationSource},