working version

wasm_test_site/Cargo.toml

@@ -7,17 +7,17 @@ edition = "2018"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[features]
-default = ["console_error_panic_hook"]
-
 [dependencies]
+hydroflow = { path = "../hydroflow" }
 wasm-bindgen = "0.2.84"
+wasm-bindgen-futures = "0.4.43"
+web-sys = { version = "0.3.51", features = [ "console" ] }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
 # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
 # code size when deploying.
-console_error_panic_hook = { version = "0.1.7", optional = true }
+console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.34"

wasm_test_site/README.md

@@ -1,3 +1,7 @@
+# Go to `www/README.md`
+
+---
+
 <div align="center">
 
   <h1><code>wasm-pack-template</code></h1>

wasm_test_site/src/lib.rs

@@ -1,15 +1,31 @@
-mod utils;
-
-use utils::set_panic_hook;
 use wasm_bindgen::prelude::*;
 
-#[wasm_bindgen]
-extern "C" {
-    fn alert(s: &str);
+fn log(string: impl AsRef<str>) {
+    web_sys::console::log_1(&JsValue::from_str(string.as_ref()));
 }
 
 #[wasm_bindgen]
 pub fn greet() {
-    set_panic_hook();
-    alert("Hello, wasm_test_site!");
+    console_error_panic_hook::set_once();
+
+    log("Hello, wasm_test_site!");
+}
+
+#[wasm_bindgen]
+pub fn test_hydroflow() -> web_sys::js_sys::Promise {
+    console_error_panic_hook::set_once();
+
+    let mut df = hydroflow::hydroflow_syntax! {
+        // https://hydro.run/docs/hydroflow/quickstart/example_1_simplest
+        source_iter(0..10) -> for_each(|n| log(format!("Hello {}", n)));
+    };
+
+    wasm_bindgen_futures::future_to_promise(async move {
+        let work_done = df.run_available_async().await;
+        Ok(if work_done {
+            JsValue::TRUE
+        } else {
+            JsValue::FALSE
+        })
+    })
 }

wasm_test_site/www/README.md

@@ -1,3 +1,15 @@
+Run once to init:
+```
+npm ci
+```
+Run to rebuild:
+```
+npm run wasm
+npm run dev
+```
+
+---
+
 <div align="center">
 
   <h1><code>create-wasm-app</code></h1>

wasm_test_site/www/index.ts

@@ -1,3 +1,4 @@
-import init, { greet } from "wasm_test_site";
+import init, { greet, test_hydroflow } from "wasm_test_site";
 let { memory } = await init();
 greet();
+test_hydroflow();

wasm_test_site/www/package.json

@@ -6,7 +6,7 @@
   "type": "module",
   "scripts": {
     "build": "vite build",
-    "serve": "vite serve",
+    "dev": "vite serve",
     "preview": "vite preview",
     "wasm": "wasm-pack build ../ --target web"
   },

website_playground/Cargo.toml

@@ -23,7 +23,6 @@ serde-wasm-bindgen = "0.4.5"
 syn = { version = "2.0.46", features = [ "parsing", "extra-traits" ] }
 tokio = { version = "1.29.0", features = [ "sync" ] }
 wasm-bindgen = "0.2.83"
-wasm-bindgen-futures = "0.4.43"
 web-sys = { version = "0.3.51", features = [ "console" ] }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by

website_playground/src/lib.rs

@@ -281,20 +281,3 @@ pub fn send_datalog_boolean_demo(instance_name: &str, input: i32) -> Option<i32>
         }
     })
 }
-
-#[wasm_bindgen]
-pub fn test_hydroflow() -> web_sys::js_sys::Promise {
-    let mut df = hydroflow::hydroflow_syntax! {
-        // https://hydro.run/docs/hydroflow/quickstart/example_1_simplest
-        source_iter(0..10) -> for_each(|n| log(&format!("Hello {}", n)));
-    };
-
-    wasm_bindgen_futures::future_to_promise(async move {
-        let work_done = df.run_available_async().await;
-        Ok(if work_done {
-            JsValue::TRUE
-        } else {
-            JsValue::FALSE
-        })
-    })
-}