Replace old build_demo_web.sh with trunk

egui_demo_app/Cargo.toml

@@ -11,9 +11,6 @@ default-run = "egui_demo_app"
 [package.metadata.docs.rs]
 all-features = true
 
-[lib]
-crate-type = ["cdylib", "rlib"]
-
 
 [features]
 default = ["glow", "persistence"]
@@ -70,3 +67,4 @@ tracing-subscriber = "0.3"
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_error_panic_hook = "0.1.6"
 tracing-wasm = "0.2"
+web-sys = { version = "0.3", features = [] }

egui_demo_app/README.md

@@ -5,7 +5,11 @@ View the demo app online at <https://egui.rs>.
 
 Run it locally with `cargo run --release -p egui_demo_app`.
 
-`egui_demo_app` can be compiled to WASM and viewed in a browser locally with:
+`egui_demo_app` can be compiled to WASM and viewed in a browser locally using [Trunk](https://trunkrs.dev/).
+
+First install trunk with `cargo install --locked trunk`.
+
+Run `trunk serve` to build and serve on `http://127.0.0.1:8080`. It will rebuild automatically if you edit the project.
 
 ```sh
 ./sh/start_server.sh &

egui_demo_app/src/lib.rs

@@ -5,9 +5,6 @@ mod backend_panel;
 pub(crate) mod frame_history;
 mod wrap_app;
 
-#[cfg(target_arch = "wasm32")]
-use eframe::web::AppRunnerRef;
-
 pub use wrap_app::WrapApp;
 
 /// Time of day as seconds since midnight. Used for clock in demo app.
@@ -16,66 +13,3 @@ pub(crate) fn seconds_since_midnight() -> f64 {
     let time = chrono::Local::now().time();
     time.num_seconds_from_midnight() as f64 + 1e-9 * (time.nanosecond() as f64)
 }
-
-// ----------------------------------------------------------------------------
-
-#[cfg(target_arch = "wasm32")]
-use eframe::wasm_bindgen::{self, prelude::*};
-
-#[cfg(target_arch = "wasm32")]
-#[wasm_bindgen]
-pub struct WebHandle {
-    handle: AppRunnerRef,
-}
-
-#[cfg(target_arch = "wasm32")]
-#[wasm_bindgen]
-impl WebHandle {
-    #[wasm_bindgen]
-    #[cfg(target_arch = "wasm32")]
-    pub fn stop_web(&self) -> Result<(), wasm_bindgen::JsValue> {
-        let mut app = self.handle.lock();
-        let res = app.destroy();
-
-        // let numw = Arc::weak_count(&app);
-        // let nums = Arc::strong_count(&app);
-        // tracing::debug!("runner ref {:?}, {:?}", numw, nums);
-
-        res
-    }
-}
-
-#[cfg(target_arch = "wasm32")]
-#[wasm_bindgen]
-pub fn init_wasm_hooks() {
-    // Make sure panics are logged using `console.error`.
-    console_error_panic_hook::set_once();
-
-    // Redirect tracing to console.log and friends:
-    tracing_wasm::set_as_global_default();
-}
-
-#[cfg(target_arch = "wasm32")]
-#[wasm_bindgen]
-pub fn start_separate(canvas_id: &str) -> Result<WebHandle, wasm_bindgen::JsValue> {
-    let web_options = eframe::WebOptions::default();
-    let handle = eframe::start_web(
-        canvas_id,
-        web_options,
-        Box::new(|cc| Box::new(WrapApp::new(cc))),
-    )
-    .map(|handle| WebHandle { handle });
-
-    handle
-}
-
-/// This is the entry-point for all the web-assembly.
-/// This is called once from the HTML.
-/// It loads the app, installs some callbacks, then returns.
-/// You can add more callbacks like this if you want to call in to your code.
-#[cfg(target_arch = "wasm32")]
-#[wasm_bindgen]
-pub fn start(canvas_id: &str) -> Result<WebHandle, wasm_bindgen::JsValue> {
-    init_wasm_hooks();
-    start_separate(canvas_id)
-}

egui_demo_app/src/main.rs

@@ -2,7 +2,10 @@
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
 
+use egui_demo_app::WrapApp;
+
 // When compiling natively:
+#[cfg(not(target_arch = "wasm32"))]
 fn main() {
     // Log to stdout (if you run with `RUST_LOG=debug`).
     tracing_subscriber::fmt::init();
@@ -20,6 +23,79 @@ fn main() {
     eframe::run_native(
         "egui demo app",
         options,
-        Box::new(|cc| Box::new(egui_demo_app::WrapApp::new(cc))),
+        Box::new(|cc| Box::new(WrapApp::new(cc))),
     );
 }
+
+#[cfg(target_arch = "wasm32")]
+use eframe::web::AppRunnerRef;
+
+#[cfg(target_arch = "wasm32")]
+use eframe::wasm_bindgen::{self, prelude::*};
+
+#[cfg(target_arch = "wasm32")]
+#[wasm_bindgen]
+pub struct WebHandle {
+    handle: AppRunnerRef,
+}
+
+#[cfg(target_arch = "wasm32")]
+#[wasm_bindgen]
+impl WebHandle {
+    #[wasm_bindgen]
+    #[cfg(target_arch = "wasm32")]
+    pub fn stop_web(&self) -> Result<(), wasm_bindgen::JsValue> {
+        let mut app = self.handle.lock();
+        let res = app.destroy();
+
+        // let numw = Arc::weak_count(&app);
+        // let nums = Arc::strong_count(&app);
+        // tracing::debug!("runner ref {:?}, {:?}", numw, nums);
+
+        res
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+#[wasm_bindgen]
+pub fn init_wasm_hooks() {
+    // Make sure panics are logged using `console.error`.
+    console_error_panic_hook::set_once();
+
+    // Redirect tracing to console.log and friends:
+    tracing_wasm::set_as_global_default();
+}
+
+#[cfg(target_arch = "wasm32")]
+#[wasm_bindgen]
+pub fn start_separate(canvas_id: &str) -> Result<WebHandle, wasm_bindgen::JsValue> {
+    let web_options = eframe::WebOptions::default();
+    let handle = eframe::start_web(
+        canvas_id,
+        web_options,
+        Box::new(|cc| Box::new(WrapApp::new(cc))),
+    )
+    .map(|handle| WebHandle { handle });
+
+    handle
+}
+
+/// This is the entry-point for all the web-assembly.
+/// This is called once from the HTML.
+/// It loads the app, installs some callbacks, then returns.
+/// You can add more callbacks like this if you want to call in to your code.
+#[cfg(target_arch = "wasm32")]
+fn main() {
+    fn remove_loading_text() -> Option<()> {
+        web_sys::window()?
+            .document()?
+            .get_element_by_id("loading_text")?
+            .remove();
+        None
+    }
+
+    let canvas_id = "the_canvas_id";
+    init_wasm_hooks();
+    start_separate(canvas_id).unwrap();
+    remove_loading_text();
+}