Add Support for cargo nextest && Fixed support for deno

.github/workflows/main.yml

@@ -144,6 +144,9 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: '20'
+    - uses: denoland/setup-deno@v1
+      with:
+        deno-version: v1.x
     - run: cargo test
     - run: cargo test -p wasm-bindgen-cli-support
     - run: cargo test -p wasm-bindgen-cli

Cargo.toml

@@ -55,6 +55,15 @@ serde_derive = "1.0"
 wasm-bindgen-test-crate-a = { path = 'tests/crates/a', version = '0.1' }
 wasm-bindgen-test-crate-b = { path = 'tests/crates/b', version = '0.1' }
 
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+assert_cmd = "1.0"
+lazy_static = "1.4.0"
+predicates = "1.0.0"
+rand = "0.8.5"
+regex = "1.10.4"
+
+[dev-dependencies]
+
 [workspace]
 members = [
   "benchmarks",

crates/cli-support/src/js/mod.rs

@@ -345,7 +345,8 @@ impl<'a> Context<'a> {
             }}
 
             const wasmInstance = (await WebAssembly.instantiate(wasmCode, imports)).instance;
-            const wasm = wasmInstance.exports;",
+            const wasm = wasmInstance.exports;
+            export const __wasm = wasm;",
             module_name = module_name
         )
     }

crates/cli/Cargo.toml

@@ -23,6 +23,7 @@ bin-dir = "wasm-bindgen-{ version }-{ target }/{ bin }{ binary-ext }"
 docopt = "1.0"
 env_logger = "0.8"
 anyhow = "1.0"
+fs2 = "0.4.3"
 log = "0.4"
 native-tls = { version = "0.2", default-features = false, optional = true }
 rouille = { version = "3.0.0", default-features = false }

crates/cli/src/bin/wasm-bindgen-test-runner/deno.rs

@@ -18,19 +18,16 @@ pub fn execute(
 
         {console_override}
 
-        // global.__wbg_test_invoke = f => f();
+        window.__wbg_test_invoke = f => f();
 
         // Forward runtime arguments. These arguments are also arguments to the
         // `wasm-bindgen-test-runner` which forwards them to deno which we
         // forward to the test harness. this is basically only used for test
         // filters for now.
         cx.args(Deno.args.slice(1));
 
-        const ok = await cx.run(tests.map(n => wasm.__wasm[n]));
-        if (!ok) Deno.exit(1);
-
         const tests = [];
-    "#,
+"#,
         module,
         console_override = SHARED_SETUP,
     );
@@ -39,6 +36,11 @@ pub fn execute(
         js_to_execute.push_str(&format!("tests.push('{}')\n", test));
     }
 
+    js_to_execute.push_str(
+        r#"const ok = await cx.run(tests.map(n => wasm.__wasm[n]));
+if (!ok) Deno.exit(1);"#,
+    );
+
     let js_path = tmpdir.join("run.js");
     fs::write(&js_path, js_to_execute).context("failed to write JS file")?;
 

crates/cli/src/bin/wasm-bindgen-test-runner/headless.rs

@@ -3,7 +3,7 @@ use anyhow::{bail, format_err, Context, Error};
 use log::{debug, warn};
 use rouille::url::Url;
 use serde::{Deserialize, Serialize};
-use serde_json::{self, json, Map, Value as Json};
+use serde_json::{json, Map, Value as Json};
 use std::env;
 use std::fs::File;
 use std::io::{self, Read};