Merge branch 'main' into feat/watch-path

Cargo.toml

@@ -84,7 +84,6 @@ cache_control = "0.2.0"
 nom = "7.1.3"
 exitcode = "1.1.2"
 resource = "0.5.0"
-stripmargin = "0.1.1"
 num_cpus = "1.16.0"
 fnv = "1.0.7"
 futures-channel = { version = "0.3.30" }
@@ -156,8 +155,6 @@ tailcall-macros = { path = "tailcall-macros" }
 tailcall-tracker = { path = "tailcall-tracker", optional = true }
 tailcall-typedefs-common = { path = "./tailcall-typedefs-common" }
 tonic-types = "0.12.1"
-datatest-stable = "0.2.9"
-tokio-test = "0.4.4"
 base64 = "0.22.1"
 tailcall-hasher = { path = "tailcall-hasher" }
 serde_json_borrow = "0.6.0"
@@ -167,12 +164,12 @@ pathdiff = "0.2.1"
 num = "0.4.3"
 indenter = "0.3.3"
 derive_more = { workspace = true }
-enum_dispatch = "0.3.13"
 strum = "0.26.2"
 notify = "6.1.1"
-maplit = "1.0.2"
 
 [dev-dependencies]
+datatest-stable = "0.2.9"
+tokio-test = "0.4.4"
 tailcall-prettier = { path = "tailcall-prettier" }
 criterion = "0.5.1"
 httpmock = "0.7.0"
@@ -181,7 +178,6 @@ stripmargin = "0.1.1"
 markdown = "1.0.0-alpha.17"
 insta = { workspace = true }
 tempfile = "3.10.1"
-temp-env = "0.3.6"
 maplit = "1.0.2"
 tailcall-fixtures = { path = "./tailcall-fixtures" }
 http-cache-semantics = { version = "1.0.1", default-features = false, features = [

src/cli/javascript/runtime.rs

@@ -24,19 +24,23 @@ fn qjs_print(msg: String, is_err: bool) {
     }
 }
 
+static CONSOLE_JS: &[u8] = include_bytes!("shim/console.js");
+
 fn setup_builtins(ctx: &Ctx<'_>) -> rquickjs::Result<()> {
     ctx.globals().set("__qjs_print", js_qjs_print)?;
-    let _: Value = ctx.eval_file("src/cli/javascript/shim/console.js")?;
+    let _: Value = ctx.eval(CONSOLE_JS)?;
 
     Ok(())
 }
 
-impl LocalRuntime {
-    fn try_new(script: blueprint::Script) -> anyhow::Result<Self> {
+impl TryFrom<blueprint::Script> for LocalRuntime {
+    type Error = anyhow::Error;
+
+    fn try_from(script: blueprint::Script) -> Result<Self, Self::Error> {
         let source = script.source;
         let js_runtime = rquickjs::Runtime::new()?;
         let context = Context::full(&js_runtime)?;
-        context.with(|ctx| {
+        let _: () = context.with(|ctx| {
             setup_builtins(&ctx)?;
             ctx.eval(source)
         })?;
@@ -126,7 +130,7 @@ fn init_rt(script: blueprint::Script) -> anyhow::Result<()> {
     // exit if failed to initialize
     LOCAL_RUNTIME.with(move |cell| {
         if cell.borrow().get().is_none() {
-            LocalRuntime::try_new(script).and_then(|runtime| {
+            LocalRuntime::try_from(script).and_then(|runtime| {
                 cell.borrow().set(runtime).map_err(|_| {
                     anyhow::anyhow!("trying to reinitialize an already initialized QuickJS runtime")
                 })

tailcall-cloudflare/Cargo.toml

@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 hyper = { version = "0.14.28", default-features = false }
-worker = "0.3.0"
+worker = "0.4.0"
 tailcall = { path = "..", default-features = false }
 lazy_static = "1.4.0"
 anyhow = "1.0.82"