Update all dependencies (#450)

* Update all dependencies

* Fix tests for changes in router param matching

Author: kflansburg

Cargo.lock

@@ -17,7 +17,7 @@ worker-sys = { path = "../worker-sys", version = "0.0.10" }
 syn = "2.0.17"
 proc-macro2 = "1.0.60"
 quote = "1.0.28"
-wasm-bindgen = "=0.2.87"
+wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4.36"
 wasm-bindgen-macro-support = "0.2.87"
 

worker-macros/Cargo.toml

@@ -22,7 +22,7 @@ cfg-if = "1.0.0"
 console_error_panic_hook = { version = "0.1.7", optional = true }
 getrandom = { version = "0.2.10", features = ["js"] }
 hex = "0.4.3"
-http = "0.2.9"
+http = "1"
 regex = "1.8.4"
 serde = { version = "1.0.164", features = ["derive"] }
 serde_json = "1.0.96"
@@ -46,6 +46,6 @@ reqwest = { version = "0.11.18", features = [
     "stream",
 ] }
 tokio = { version = "1.28.2", features = ["macros", "rt", "test-util"] }
-tungstenite = "0.17.3"
+tungstenite = "0.21"
 wasm-bindgen-test = "0.3.36"
 retry = "2.0.0"

worker-sandbox/Cargo.toml

@@ -356,8 +356,7 @@ pub async fn main(req: Request, env: Env, _ctx: worker::Context) -> Result<Respo
             ))
         })
         .get_async("/proxy_request/*url", |_req, ctx| async move {
-            let url = ctx.param("url").unwrap().strip_prefix('/').unwrap();
-
+            let url = ctx.param("url").unwrap();
             Fetch::Url(url.parse()?).send().await
         })
         .get_async("/durable/alarm", |_req, ctx| async move {

worker-sandbox/src/lib.rs

@@ -189,7 +189,7 @@ test("catchall", async () => {
     method: "OPTIONS",
   });
 
-  expect(await resp.text()).toBe("/hello-world");
+  expect(await resp.text()).toBe("hello-world");
 });
 
 test("redirect default", async () => {

worker-sandbox/tests/request.spec.ts

@@ -10,7 +10,7 @@ description = "Low-level extern definitions / FFI bindings to the Cloudflare Wor
 [dependencies]
 cfg-if = "1.0.0"
 js-sys = "0.3.63"
-wasm-bindgen = "=0.2.87"
+wasm-bindgen = "0.2"
 
 [dependencies.web-sys]
 version = "0.3.63"

worker-sys/Cargo.toml

@@ -19,19 +19,19 @@ chrono = { version = "0.4.26", default-features = false, features = [
 chrono-tz = { version = "0.8.2", default-features = false }
 futures-channel = "0.3.28"
 futures-util = { version = "0.3.28", default-features = false }
-http = "0.2.9"
+http = "1"
 js-sys = "0.3.63"
-matchit = "0.4.6"
+matchit = "0.7"
 pin-project = "1.1.0"
 serde = { version = "1.0.164", features = ["derive"] }
 serde_json = "1.0.96"
 tokio = { version = "1.28", default-features = false }
 url = "2.4.0"
-wasm-bindgen = "=0.2.87"
+wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4.36"
 serde-wasm-bindgen = "0.6.1"
 serde_urlencoded = "0.7"
-wasm-streams = "0.3.0"
+wasm-streams = "0.4"
 worker-kv = "0.6.0"
 worker-macros = { path = "../worker-macros", version = "0.0.10" }
 worker-sys = { path = "../worker-sys", version = "0.0.10" }

worker/Cargo.toml

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, future::Future, rc::Rc};
 
 use futures_util::future::LocalBoxFuture;
-use matchit::{Match, Node};
+use matchit::{Match, Router as MatchItRouter};
 use worker_kv::KvStore;
 
 use crate::{
@@ -43,8 +43,8 @@ impl<D> Clone for Handler<'_, D> {
 
 /// A path-based HTTP router supporting exact-match or wildcard placeholders and shared data.
 pub struct Router<'a, D> {
-    handlers: HashMap<Method, Node<Handler<'a, D>>>,
-    or_else_any_method: Node<Handler<'a, D>>,
+    handlers: HashMap<Method, MatchItRouter<Handler<'a, D>>>,
+    or_else_any_method: MatchItRouter<Handler<'a, D>>,
     data: D,
 }
 
@@ -126,7 +126,7 @@ impl<'a, D: 'a> Router<'a, D> {
     pub fn with_data(data: D) -> Self {
         Self {
             handlers: HashMap::new(),
-            or_else_any_method: Node::new(),
+            or_else_any_method: MatchItRouter::new(),
             data,
         }
     }
@@ -383,7 +383,7 @@ impl<'a, D: 'a> Router<'a, D> {
     }
 }
 
-type NodeWithHandlers<'a, D> = Node<Handler<'a, D>>;
+type NodeWithHandlers<'a, D> = MatchItRouter<Handler<'a, D>>;
 
 impl<'a, D: 'a> Router<'a, D> {
     fn split(