Merge pull request #189 from MartinKavik/feat/scalable-application-support

scalable application support

Author: David-OConnor

Cargo.lock

@@ -132,7 +132,7 @@ command = "wasm-pack"
 args = ["test", "--firefox", "--", "--lib", "${@}"]
 
 [tasks.test_one_h]
-description = "Run a single test in headless Firefox. Ex 'cargo make test_one my_test'"
+description = "Run a single test in headless Firefox. Ex 'cargo make test_one_h my_test'"
 clear = true
 workspace = false
 install_crate = { crate_name = "wasm-pack", binary = "wasm-pack", test_arg = "-V" }

Makefile.toml

@@ -122,7 +122,7 @@ enum Msg {
 }
 
 /// How we update the model
-fn update(msg: Msg, model: &mut Model, _orders: &mut Orders<Msg>) {
+fn update(msg: Msg, model: &mut Model, _orders: &mut impl Orders<Msg>) {
     match msg {
         Msg::Increment => model.count += 1,
         Msg::Decrement => model.count -= 1,
@@ -182,7 +182,7 @@ fn view(model: &Model) -> impl View<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(Model::default(), update, view)
+    seed::App::build(|_,_| Model::default(), update, view)
         .finish()
         .run();
 }

README.md

@@ -10,5 +10,4 @@ crate-type = ["cdylib"]
 [dependencies]
 seed = {path = "../../"}
 wasm-bindgen = "0.2.45"
-serde = "^1.0.92"
 rand = {version = "0.6.5", features = ["wasm-bindgen"]}

examples/animation_frame/Cargo.toml

@@ -22,8 +22,8 @@
   <section id="app"></section>
   <script type="module">
       // https://rustwasm.github.io/docs/wasm-bindgen/examples/without-a-bundler.html
-      import init from './pkg/package.js';
-      init('./pkg/package_bg.wasm');
+      import init from '/pkg/package.js';
+      init('/pkg/package_bg.wasm');
     </script>
   </body>
 </html>

examples/animation_frame/index.html

@@ -2,7 +2,6 @@
 extern crate seed;
 use rand::prelude::*;
 use seed::prelude::*;
-use serde::{Deserialize, Serialize};
 
 // Model
 
@@ -56,30 +55,25 @@ struct Model {
 
 // Update
 
-#[derive(Clone, Copy, Serialize, Deserialize)]
+#[derive(Clone, Copy)]
 enum Msg {
-    Init,
     SetViewportWidth,
     NextAnimationStep,
     OnAnimationFrame(RequestAnimationFrameTime),
 }
 
-fn update(msg: Msg, model: &mut Model, orders: &mut Orders<Msg>) {
+fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
     match msg {
-        Msg::Init => {
-            orders
-                .send_msg(Msg::SetViewportWidth)
-                .send_msg(Msg::NextAnimationStep)
-                .skip();
-        }
         Msg::SetViewportWidth => {
             model.viewport_width = f64::from(seed::body().client_width());
             orders.skip();
         }
         Msg::NextAnimationStep => {
-            let cb = Closure::wrap(Box::new(|time| {
-                seed::update(Msg::OnAnimationFrame(time));
-            }) as Box<FnMut(RequestAnimationFrameTime)>);
+            let (app, msg_mapper) = (orders.clone_app(), orders.msg_mapper());
+
+            let cb = Closure::new(move |time| {
+                app.update(msg_mapper(Msg::OnAnimationFrame(time)));
+            });
 
             model.request_animation_frame_handle = Some(request_animation_frame(cb));
             orders.skip();
@@ -175,18 +169,19 @@ fn view_wheel(wheel_x: f64, car: &Car) -> Node<Msg> {
     }]
 }
 
+// Init
+
+fn init(_: Url, orders: &mut impl Orders<Msg>) -> Model {
+    orders
+        .send_msg(Msg::SetViewportWidth)
+        .send_msg(Msg::NextAnimationStep);
+    Model::default()
+}
+
 #[wasm_bindgen(start)]
 pub fn render() {
-    let app = seed::App::build(Model::default(), update, view)
-        .window_events(|_| {
-            vec![
-                // we want to use `seed::update(...)`
-                trigger_update_handler(),
-                simple_ev(Ev::Resize, Msg::SetViewportWidth),
-            ]
-        })
+    seed::App::build(init, update, view)
+        .window_events(|_| vec![simple_ev(Ev::Resize, Msg::SetViewportWidth)])
         .finish()
         .run();
-
-    app.update(Msg::Init);
 }

examples/animation_frame/src/lib.rs

@@ -22,8 +22,8 @@
     <section id="app"></section>
     <script type="module">
       // https://rustwasm.github.io/docs/wasm-bindgen/examples/without-a-bundler.html
-      import init from './pkg/package.js';
-      init('./pkg/package_bg.wasm');
+      import init from '/pkg/package.js';
+      init('/pkg/package_bg.wasm');
     </script>
   </body>
 </html>

examples/counter/index.html

@@ -34,7 +34,7 @@ enum Msg {
 }
 
 /// The sole source of updating the model
-fn update(msg: Msg, model: &mut Model, _: &mut Orders<Msg>) {
+fn update(msg: Msg, model: &mut Model, _: &mut impl Orders<Msg>) {
     match msg {
         Msg::Increment => model.count += 1,
         Msg::Decrement => model.count -= 1,
@@ -105,7 +105,7 @@ fn view(model: &Model) -> impl View<Msg> {
 
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(Model::default(), update, view)
+    seed::App::build(|_, _| Model::default(), update, view)
         .finish()
         .run();
 }

examples/counter/src/lib.rs

@@ -29,8 +29,8 @@
         <section id="app"></section>
         <script type="module">
             // https://rustwasm.github.io/docs/wasm-bindgen/examples/without-a-bundler.html
-            import init from './pkg/package.js';
-            init('./pkg/package_bg.wasm');
+            import init from '/pkg/package.js';
+            init('/pkg/package_bg.wasm');
         </script>
     </body>
 </html>

examples/mathjax/index.html

@@ -182,9 +182,13 @@ e^{-\mathbf{A}} = \mathbf{B} + [\mathbf{A}, \mathbf{B}]"
     ]
 }
 
+// Init
+
+fn init(_: Url, _: &mut impl Orders<Msg>) -> Model {
+    Model::default()
+}
+
 #[wasm_bindgen(start)]
 pub fn render() {
-    seed::App::build(Model::default(), |_, _, _| (), view)
-        .finish()
-        .run();
+    seed::App::build(init, |_, _, _| (), view).finish().run();
 }