Merge branch 'bump-leptos-0.5.0' of https://github.com/birkskyum/js-framework-benchmark into birkskyum-bump-leptos-0.5.0

Author: krausest

frameworks/keyed/leptos/Cargo.toml

@@ -12,7 +12,7 @@ wasm-bindgen = { version = "0.2", features = ["enable-interning"] }
 console_error_panic_hook = "0.1"
 getrandom = { version = "0.2.7", features = ["js"] }
 rand = { version = "0.8.5", features = ["small_rng"] }
-leptos = { version = "0.4.4", features = ["csr", "nightly", "template_macro"] }
+leptos = { version = "0.5.0", features = ["csr", "nightly", "template_macro"] }
 web-sys = "0.3"
 
 [profile.release]

frameworks/keyed/leptos/bundled-dist/js-framework-benchmark-leptos.js

@@ -4,16 +4,16 @@
   "description": "Benchmark for Leptos",
   "license": "ISC",
   "js-framework-benchmark": {
-    "frameworkVersion": "0.4.1",
+    "frameworkVersion": "0.5.0",
     "frameworkHomeURL": "https://github.com/leptos-rs/leptos",
     "issues": [
       1139
     ]
   },
   "scripts": {
     "build-prod": "echo This is a no-op. && echo Due to heavy dependencies, the generated javascript is already provided. && echo If you really want to rebuild from source use: && echo npm run build-prod-force",
-    "build-prod-quick": "rimraf bundled-dist && wasm-pack build --release --target web --no-typescript --out-name js-framework-benchmark-leptos --out-dir bundled-dist && cpr index.html bundled-dist/index.html && (cd bundled-dist && rimraf .gitignore README.md package.json)",
-    "build-prod-force": "rustup target add wasm32-unknown-unknown && cargo install --force wasm-pack && rimraf bundled-dist && wasm-pack build --release --target web --no-typescript --out-name js-framework-benchmark-leptos --out-dir bundled-dist && cpr index.html bundled-dist/index.html && (cd bundled-dist && rimraf .gitignore README.md package.json)"
+    "build-prod-quick": "rimraf bundled-dist && wasm-pack build --release --target web --no-typescript --out-name js-framework-benchmark-leptos --out-dir bundled-dist && cpr index.html bundled-dist/index.html && cd bundled-dist && esbuild --minify js-framework-benchmark-leptos.js > js-framework-benchmark-leptos.min.js && mv js-framework-benchmark-leptos.min.js js-framework-benchmark-leptos.js && rimraf .gitignore README.md package.json",
+    "build-prod-force": "rustup target add wasm32-unknown-unknown && cargo install --force wasm-pack && rimraf bundled-dist && wasm-pack build --release --target web --no-typescript --out-name js-framework-benchmark-leptos --out-dir bundled-dist && cpr index.html bundled-dist/index.html && (cd bundled-dist && esbuild --minify js-framework-benchmark-leptos.js > js-framework-benchmark-leptos.min.js && mv js-framework-benchmark-leptos.min.js js-framework-benchmark-leptos.js && rimraf .gitignore README.md package.json)"
   },
   "repository": {
     "type": "git",

frameworks/keyed/leptos/bundled-dist/js-framework-benchmark-leptos_bg.wasm

@@ -33,13 +33,13 @@ static ADJECTIVES: &[&str] = &[
 ];
 
 static COLOURS: &[&str] = &[
-    "red", "yellow", "blue", "green", "pink", "brown", "purple", "brown", "white", "black",
-    "orange",
+    "red", "yellow", "blue", "green", "pink", "brown", "purple", "brown",
+    "white", "black", "orange",
 ];
 
 static NOUNS: &[&str] = &[
-    "table", "chair", "house", "bbq", "desk", "car", "pony", "cookie", "sandwich", "burger",
-    "pizza", "mouse", "keyboard",
+    "table", "chair", "house", "bbq", "desk", "car", "pony", "cookie",
+    "sandwich", "burger", "pizza", "mouse", "keyboard",
 ];
 
 #[derive(Copy, Debug, Clone, PartialEq, Eq, Hash)]
@@ -50,7 +50,7 @@ struct RowData {
 
 static ID_COUNTER: AtomicUsize = AtomicUsize::new(1);
 
-fn build_data(cx: Scope, count: usize) -> Vec<RowData> {
+fn build_data(count: usize) -> Vec<RowData> {
     let mut thread_rng = thread_rng();
 
     let mut data = Vec::new();
@@ -70,10 +70,11 @@ fn build_data(cx: Scope, count: usize) -> Vec<RowData> {
 
         data.push(RowData {
             id: ID_COUNTER.load(Ordering::Relaxed),
-            label: create_signal(cx, label),
+            label: create_signal(label),
         });
 
-        ID_COUNTER.store(ID_COUNTER.load(Ordering::Relaxed) + 1, Ordering::Relaxed);
+        ID_COUNTER
+            .store(ID_COUNTER.load(Ordering::Relaxed) + 1, Ordering::Relaxed);
     }
 
     data
@@ -82,14 +83,13 @@ fn build_data(cx: Scope, count: usize) -> Vec<RowData> {
 /// Button component.
 #[component]
 fn Button(
-    cx: Scope,
     /// ID for the button element
     id: &'static str,
     /// Text that should be included
     text: &'static str,
 ) -> impl IntoView {
     view! {
-        cx,
+
         <div class="col-sm-6 smallpad">
             <button
                 id=id
@@ -103,26 +103,26 @@ fn Button(
 }
 
 #[component]
-fn App(cx: Scope) -> impl IntoView {
-    let (data, set_data) = create_signal(cx, Vec::<RowData>::new());
-    let (selected, set_selected) = create_signal(cx, None::<usize>);
+fn App() -> impl IntoView {
+    let (data, set_data) = create_signal(Vec::<RowData>::new());
+    let (selected, set_selected) = create_signal(None::<usize>);
 
     let remove = move |id: usize| {
         set_data.update(move |data| data.retain(|row| row.id != id));
     };
 
     let run = move |_| {
-        set_data(build_data(cx, 1000));
+        set_data(build_data(1000));
         set_selected(None);
     };
 
     let run_lots = move |_| {
-        set_data(build_data(cx, 10000));
+        set_data(build_data(10000));
         set_selected(None);
     };
 
     let add = move |_| {
-        set_data.update(move |data| data.append(&mut build_data(cx, 1000)));
+        set_data.update(move |data| data.append(&mut build_data(1000)));
     };
 
     let update = move |_| {
@@ -146,17 +146,17 @@ fn App(cx: Scope) -> impl IntoView {
         });
     };
 
-    let is_selected = create_selector(cx, selected);
+    let is_selected = create_selector(selected);
 
     view! {
-        cx,
+
         <div class="container">
             <div class="jumbotron">
                 <div class="row">
                     <div class="col-md-6"><h1>"Leptos"</h1></div>
                     <div class="col-md-6">
                         <div class="row">
-                            <Button id="run" text="Create 1,000 rows" on:click=run/>
+                            <Button id="run" text="Create 1,000 rows" on:click=run />
                             <Button id="runlots" text="Create 10,000 rows" on:click=run_lots />
                             <Button id="add" text="Append 1,000 rows" on:click=add />
                             <Button id="update" text="Update every 10th row" on:click=update />
@@ -171,16 +171,19 @@ fn App(cx: Scope) -> impl IntoView {
                     <For
                         each={data}
                         key={|row| row.id}
-                        view=move |cx, row: RowData| {
+                        children=move |row: RowData| {
                             let row_id = row.id;
                             let (label, _) = row.label;
-                            let is_selected = is_selected.clone();
-                            on_cleanup(cx, move || {
-                                label.dispose();
+                            on_cleanup({
+                                let is_selected = is_selected.clone();
+                                move || {
+                                    label.dispose();
+                                    is_selected.remove(&Some(row_id));
+                                }
                             });
+                            let is_selected = is_selected.clone();
                             template! {
-                                cx,
-                                <tr class:danger={move || is_selected(Some(row_id))}>
+                                <tr class:danger={move || is_selected.selected(Some(row_id))}>
                                     <td class="col-md-1">{row_id.to_string()}</td>
                                     <td class="col-md-4"><a on:click=move |_| set_selected(Some(row_id))>{move || label.get()}</a></td>
                                     <td class="col-md-1"><a on:click=move |_| remove(row_id)><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></td>
@@ -201,5 +204,5 @@ pub fn start() {
     console_error_panic_hook::set_once();
 
     let root = document().query_selector("#main").unwrap().unwrap();
-    mount_to(root.unchecked_into(), |cx| view! { cx, <App/> });
+    mount_to(root.unchecked_into(), || view! { <App/> });
 }