Make cargo fmt happy

Add GitHub sponsor info

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: gbj

.github/workflows/test.yml

@@ -0,0 +1,55 @@
+name: Test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  test:
+    name: Test on ${{ matrix.os }} (using rustc ${{ matrix.rust }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        rust:
+          - nightly
+        os:
+          - ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt
+
+      - name: Setup cargo-make
+        uses: davidB/rust-cargo-make@v1
+
+      - name: Cargo generate-lockfile
+        run: cargo generate-lockfile
+
+      - name: Run Rustfmt
+        run: cargo fmt -- --check
+
+      - name: Cargo cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ matrix.rust }}-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Run tests with all features
+        run: cargo make ci
+

Cargo.toml

@@ -3,39 +3,43 @@ members = [
   # core
   "leptos",
   "leptos_dom",
-  "leptos_core",
+  "leptos_config",
   "leptos_macro",
   "leptos_reactive",
   "leptos_server",
 
+  # integrations
+  "integrations/actix",
+  "integrations/axum",
+
   # libraries
   "meta",
   "router",
 
-  # examples
-  "examples/counter",
-  "examples/counter-isomorphic/client",
-  "examples/counter-isomorphic/server",
-  "examples/counter-isomorphic/counter",
-  "examples/counters",
-  "examples/counters-stable",
-  "examples/fetch",
-  "examples/gtk",
-  "examples/hackernews/hackernews-app",
-  "examples/hackernews/hackernews-client",
-  "examples/hackernews/hackernews-server",
-  "examples/parent-child",
-  "examples/router",
-  "examples/todomvc",
-  "examples/todomvc-ssr/todomvc-ssr-client",
-  "examples/todomvc-ssr/todomvc-ssr-server",
-]
-exclude = [
-  "benchmarks"
+  # book
+  "docs/book/project/ch02_getting_started",
+  "docs/book/project/ch03_building_ui",
+  "docs/book/project/ch04_reactivity",
 ]
+exclude = ["benchmarks", "examples"]
 
+[workspace.package]
+version = "0.1.0-beta"
+
+[workspace.dependencies]
+leptos = { path = "./leptos", default-features = false, version = "0.1.0-beta" }
+leptos_dom = { path = "./leptos_dom", default-features = false, version = "0.1.0-beta" }
+leptos_macro = { path = "./leptos_macro", default-features = false, version = "0.1.0-beta" }
+leptos_reactive = { path = "./leptos_reactive", default-features = false, version = "0.1.0-beta" }
+leptos_server = { path = "./leptos_server", default-features = false, version = "0.1.0-beta" }
+leptos_config = { path = "./leptos_config", default-features = false, version = "0.1.0-beta" }
+leptos_router = { path = "./router", version = "0.1.0-beta" }
+leptos_meta = { path = "./meta", default-feature = false, version = "0.1.0-beta" }
 
 [profile.release]
 codegen-units = 1
 lto = true
-opt-level = 'z'
+opt-level = 'z'
+
+[workspace.metadata.cargo-all-features]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]

Makefile.toml

@@ -0,0 +1,47 @@
+############
+# A make file for cargo-make, please install it with:
+#     cargo install --force cargo-make
+############
+
+[config]
+# make tasks run at the workspace root
+default_to_workspace = false
+
+[tasks.ci]
+dependencies = ["build", "build-examples", "test"]
+
+[tasks.build]
+clear = true
+dependencies = ["build-all"]
+
+[tasks.build-all]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
+
+[tasks.build-examples]
+clear = true
+dependencies = [
+	{ name = "build", path = "examples/counter" },
+	{ name = "build", path = "examples/counter_isomorphic" },
+	{ name = "build", path = "examples/counters" },
+	{ name = "build", path = "examples/counters_stable" },
+	{ name = "build", path = "examples/fetch" },
+	{ name = "build", path = "examples/hackernews" },
+	{ name = "build", path = "examples/hackernews_axum" },
+	{ name = "build", path = "examples/parent_child" },
+	{ name = "build", path = "examples/router" },
+	{ name = "build", path = "examples/tailwind" },
+	{ name = "build", path = "examples/todo_app_sqlite" },
+	{ name = "build", path = "examples/todo_app_sqlite_axum" },
+	{ name = "build", path = "examples/todomvc" },
+]
+
+[tasks.test]
+clear = true
+dependencies = ["test-all"]
+
+[tasks.test-all]
+command = "cargo"
+args = ["+nightly", "test-all-features"]
+install_crate = "cargo-all-features"

README.md

@@ -1,6 +1,9 @@
-**Please note:** This framework is in active development. I'm keeping it in a cycle of 0.0.x releases at the moment to indicate that it’s not even ready for its 0.1.0. Active work is being done on documentation and features, and APIs should not necessarily be considered stable. At the same time, it is more than a toy project or proof of concept, and I am actively using it for my own application development.
+**NOTE: We're in the middle of merging changes and making fixes to support our upcoming `0.1.0` release. Some of the examples may be in a broken state. You can continue using the `0.0` releases with no issues.**
 
-<img src="https://raw.githubusercontent.com/gbj/leptos/main/docs/logos/logo.svg" alt="Leptos Logo" style="width: 100%; height: auto; display: block; margin: auto;">
+<picture>
+    <source srcset="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_Solid_White.svg" media="(prefers-color-scheme: dark)">
+    <img src="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_RGB.svg" alt="Leptos Logo">
+</picture>
 
 [![crates.io](https://img.shields.io/crates/v/leptos.svg)](https://crates.io/crates/leptos)
 [![docs.rs](https://docs.rs/leptos/badge.svg)](https://docs.rs/leptos)
@@ -12,7 +15,7 @@
 use leptos::*;
 
 #[component]
-pub fn SimpleCounter(cx: Scope, initial_value: i32) -> Element {
+pub fn SimpleCounter(cx: Scope, initial_value: i32) -> impl IntoView {
     // create a reactive signal with the initial value
     let (value, set_value) = create_signal(cx, initial_value);
 
@@ -22,7 +25,7 @@ pub fn SimpleCounter(cx: Scope, initial_value: i32) -> Element {
     let decrement = move |_| set_value.update(|value| *value -= 1);
     let increment = move |_| set_value.update(|value| *value += 1);
 
-    // this JSX is compiled to an HTML template string for performance
+    // create user interfaces with the declarative `view!` macro
     view! {
         cx,
         <div>
@@ -48,10 +51,10 @@ Leptos is a full-stack, isomorphic Rust web framework leveraging fine-grained re
 ## What does that mean?
 
 - **Full-stack**: Leptos can be used to build apps that run in the browser (_client-side rendering_), on the server (_server-side rendering_), or by rendering HTML on the server and then adding interactivity in the browser (_hydration_). This includes support for _HTTP streaming_ of both data (`Resource`s) and HTML (out-of-order streaming of `<Suspense/>` components.)
-- **Isomorphic**: The same application code and business logic are compiled to run on the client and server, with seamless integration. You can write your server-only logic (database requests, authentication etc.) alongside the client-side components that will consume it, and let Leptos manage the data loading without the need to manually create APIs to consume.
-- **Web**: Leptos is built on the Web platform and Web standards. Whenever possible, we use Web essentials (like links and forms) and build on top of them rather than trying to replace them.
+- **Isomorphic**: Leptos provides primitives to write isomorphic server functions, i.e., functions that can be called with the “same shape” on the client or server, but only run on the server. This means you can write your server-only logic (database requests, authentication etc.) alongside the client-side components that will consume it, and call server functions as if they were running in the browser.
+- **Web**: Leptos is built on the Web platform and Web standards. The router is designed to use Web fundamentals (like links and forms) and build on top of them rather than trying to replace them.
 - **Framework**: Leptos provides most of what you need to build a modern web app: a reactive system, templating library, and a router that works on both the server and client side.
-- **Fine-grained reactivity**: The entire framework is build from reactive primitives. This allows for extremely performant code with minimal overhead: when a reactive signal’s value changes, it can update a single text node, toggle a single class, or remove an element from the DOM without any other code running. (_So, no virtual DOM!_)
+- **Fine-grained reactivity**: The entire framework is built from reactive primitives. This allows for extremely performant code with minimal overhead: when a reactive signal’s value changes, it can update a single text node, toggle a single class, or remove an element from the DOM without any other code running. (_So, no virtual DOM!_)
 - **Declarative**: Tell Leptos how you want the page to look, and let the framework tell the browser how to do it.
 
 ## Learn more
@@ -59,54 +62,47 @@ Leptos is a full-stack, isomorphic Rust web framework leveraging fine-grained re
 Here are some resources for learning more about Leptos:
 
 - [Examples](https://github.com/gbj/leptos/tree/main/examples)
-- [API Documentation](https://docs.rs/leptos/latest/leptos/) (in progress)
+- [API Documentation](https://docs.rs/leptos/latest/leptos/)
+- [Common Bugs](https://github.com/gbj/leptos/tree/main/docs/COMMON_BUGS.md) (and how to fix them!)
 - Leptos Guide (in progress)
 
 ## `nightly` Note
 
-Most of the examples assume you’re using `nightly` Rust. If you’re on stable, note the following:
+Most of the examples assume you’re using `nightly` Rust.
 
-1. You need to enable the `"stable"` flag in `Cargo.toml`: `leptos = { version = "0.0", features = ["stable"] }`
+To set up your Rust toolchain using `nightly` (and add the ability to compile Rust to WebAssembly, if you haven’t already)
+
+```
+rustup toolchain install nightly
+rustup default nightly
+rustup target add wasm32-unknown-unknown
+```
+
+If you’re on `stable`, note the following:
+
+1. You need to enable the `"stable"` flag in `Cargo.toml`: `leptos = { version = "0.1.0-alpha", features = ["stable"] }`
 2. `nightly` enables the function call syntax for accessing and setting signals. If you’re using `stable`,
    you’ll just call `.get()`, `.set()`, or `.update()` manually. Check out the
    [`counters-stable` example](https://github.com/gbj/leptos/blob/main/examples/counters-stable/src/main.rs)
    for examples of the correct API.
 
-## Benchmarks
+## `cargo-leptos`
 
-### Server-Side Rendering
+[`cargo-leptos`](https://github.com/akesson/cargo-leptos) is a build tool that's designed to make it easy to build apps that run on both the client and the server, with seamless integration. The best way to get started with a real Leptos project right now is to use `cargo-leptos` and our [starter template](https://github.com/leptos-rs/start).
 
-I’ve created a benchmark comparing Leptos’s HTML rendering on the server to [Tera](https://github.com/Keats/tera), [Yew](https://github.com/yewstack/yew), and [Sycamore](https://github.com/sycamore-rs/sycamore). You can find the benchmark [here](https://github.com/gbj/leptos/tree/main/benchmarks) and run it yourself using `cargo bench`. Leptos renders HTML roughly as fast as Tera, and scales well as templates become larger. It's significantly faster than the server-side HTML rendering done by similar frameworks.
-
-<details>
-  <summary>Click to show results</summary>
-<table>
-<thead>
-<tr><td><em>ns/iter</em></td><td>Tera</td><td>Leptos</td><td>Yew</td><td>Sycamore</td></tr>
-</thead>
-<tbody>
-<tr><td>3 Counters</td><td align="right">3,454</td><td align="right">5,666</td><td align="right">34,984</td><td align="right">32,412</td></tr>
-<tr><td>TodoMVC (no todos)</td><td align="right">2,396</td><td align="right">5,561</td><td align="right">38,725</td><td align="right">68,749</td></tr>
-<tr><td>TodoMVC (1000 todos)</td><td align="right">3,829,447</td><td align="right">3,077,907</td><td align="right">5,125,639</td><td align="right">19,448,900</td></tr>
-<tr><td><em>Average</em></td><td align="right">1.08</td><td align="right">1.65</td><td align="right">6.25</td><td align="right">9.36</td></tr>
-</tbody>
-</table>
-</details>
-
-### Client-Side Rendering
-
-The gold standard for testing raw rendering performance for front-end web frameworks is the [js-framework-benchmark](https://github.com/krausest/js-framework-benchmark). The official results list Leptos as the fastest Rust/Wasm framework, slightly slower than SolidJS and significantly faster than popular JS frameworks like Svelte, Preact, and React.
-
-<details>
-  <summary>Click to show results</summary>
-  <img width="913" alt="js-framework-benchmark results" src="https://user-images.githubusercontent.com/286622/198388168-d21e938b-5d59-4000-b373-91b48f1ec4d3.png">
-</details>
+```bash
+cargo install cargo-leptos
+cargo leptos new --git https://github.com/leptos-rs/start
+cd [your project name]
+cargo leptos watch
+```
 
 ## FAQs
 
 ### Can I use this for native GUI?
 
 Sure! Obviously the `view` macro is for generating DOM nodes but you can use the reactive system to drive native any GUI toolkit that uses the same kind of object-oriented, event-callback-based framework as the DOM pretty easily. The principles are the same:
+
 - Use signals, derived signals, and memos to create your reactive system
 - Create GUI widgets
 - Use event listeners to update signals
@@ -120,7 +116,7 @@ On the surface level, these libraries may seem similar. Yew is, of course, the m
 
 - **VDOM vs. fine-grained:** Yew is built on the virtual DOM (VDOM) model: state changes cause components to re-render, generating a new virtual DOM tree. Yew diffs this against the previous VDOM, and applies those patches to the actual DOM. Component functions rerun whenever state changes. Leptos takes an entirely different approach. Components run once, creating (and returning) actual DOM nodes and setting up a reactive system to update those DOM nodes.
 - **Performance:** This has huge performance implications: Leptos is simply _much_ faster at both creating and updating the UI than Yew is.
-- **Mental model:** Adopting fine-grained reactivity also tends to simplify the mental model. There are no surprising components re-renders because there are no re-renders. Your app can be divided into components based on what makes sense for your app, because they have no performance implications.
+- **Mental model:** Adopting fine-grained reactivity also tends to simplify the mental model. There are no surprising component re-renders because there are no re-renders. Your app can be divided into components based on what makes sense for your app, because they have no performance implications.
 
 ### How is this different from Sycamore?
 
@@ -131,20 +127,19 @@ There are some practical differences that make a significant difference:
 - **Maturity:** Sycamore is obviously a much more mature and stable library with a larger ecosystem.
 - **Templating:** Leptos uses a JSX-like template format (built on [syn-rsx](https://github.com/stoically/syn-rsx)) for its `view` macro. Sycamore offers the choice of its own templating DSL or a builder syntax.
 - **Template node cloning:** Leptos's `view` macro compiles to a static HTML string and a set of instructions of how to assign its reactive values. This means that at runtime, Leptos can clone a `<template>` node rather than calling `document.createElement()` to create DOM nodes. This is a _significantly_ faster way of rendering components.
-- **Read-write segregation:** Leptos, like Solid, enforces read-write segregation between signal getters and setters, so you end up accessing signals with tuples like `let (count, set_count) = create_signal(cx, 0);`
+- **Read-write segregation:** Leptos, like Solid, encourages read-write segregation between signal getters and setters, so you end up accessing signals with tuples like `let (count, set_count) = create_signal(cx, 0);` _(If you prefer or if it's more convenient for your API, you can use `create_rw_signal` to give a unified read/write signal.)_
 - **Signals are functions:** In Leptos, you can call a signal to access it rather than calling a specific method (so, `count()` instead of `count.get()`) This creates a more consistent mental model: accessing a reactive value is always a matter of calling a function. For example:
 
-```rust
-let (count, set_count) = create_signal(cx, 0); // a signal
-let double_count = move || count() * 2; // a derived signal
-let memoized_count = create_memo(cx, move |_| count() * 3); // a memo
-// all are accessed by calling them
-assert_eq!(count(), 0);
-assert_eq!(double_count(), 0);
-assert_eq!(memoized_count(), 0);
+  ```rust
+  let (count, set_count) = create_signal(cx, 0); // a signal
+  let double_count = move || count() * 2; // a derived signal
+  let memoized_count = create_memo(cx, move |_| count() * 3); // a memo
+  // all are accessed by calling them
+  assert_eq!(count(), 0);
+  assert_eq!(double_count(), 0);
+  assert_eq!(memoized_count(), 0);
+  // this function can accept any of those signals
+  fn do_work_on_signal(my_signal: impl Fn() -> i32) { ... }
+  ```
 
-// this function can accept any of those signals
-fn do_work_on_signal(my_signal: impl Fn() -> i32) { ... }
-```
-
-- **Signals and scopes are `'static`:** Both Leptos and Sycamore ease the pain of moving signals in closures (in particular, event listeners) by making them `Copy`, to avoid the `{ let count = count.clone(); move |_| ... }` that's very familiar in Rust UI code. Sycamore does this by using bump allocation to tie the lifetimes of its signals to its scopes: since references are `Copy`, `&'a Signal<T>` can be moved into a closure. Leptos does this by using arena allocation and passing around indices: types like `ReadSignal<T>`, `WriteSignal<T>`, and `Memo<T>` are actually wrapper for indices into an arena. This means that both scopes and signals are both `Copy` and `'static` in Leptos, which means that they can be moved easily into closures without adding lifetime complexity.
+- **Signals and scopes are `'static`:** Both Leptos and Sycamore ease the pain of moving signals in closures (in particular, event listeners) by making them `Copy`, to avoid the `{ let count = count.clone(); move |_| ... }` that's very familiar in Rust UI code. Sycamore does this by using bump allocation to tie the lifetimes of its signals to its scopes: since references are `Copy`, `&'a Signal<T>` can be moved into a closure. Leptos does this by using arena allocation and passing around indices: types like `ReadSignal<T>`, `WriteSignal<T>`, and `Memo<T>` are actually wrappers for indices into an arena. This means that both scopes and signals are both `Copy` and `'static` in Leptos, which means that they can be moved easily into closures without adding lifetime complexity.

benchmarks/src/ssr.rs

@@ -2,12 +2,12 @@ use test::Bencher;
 
 #[bench]
 fn leptos_ssr_bench(b: &mut Bencher) {
-	use leptos::*;
-
 	b.iter(|| {
-		_ = create_scope(|cx| {
+		use leptos::*;
+
+		_ = create_scope(create_runtime(), |cx| {
 			#[component]
-			fn Counter(cx: Scope, initial: i32) -> Element {
+			fn Counter(cx: Scope, initial: i32) -> impl IntoView {
 				let (value, set_value) = create_signal(cx, initial);
 				view! {
 					cx,
@@ -28,16 +28,16 @@ fn leptos_ssr_bench(b: &mut Bencher) {
 					<Counter initial=2/>
 					<Counter initial=3/>
 				</main>
-			};
+			}.into_view(cx).render_to_string(cx);
 
 			assert_eq!(
 				rendered,
-				"<main data-hk=\"0-0\"><h1>Welcome to our benchmark page.</h1><p>Here's some introductory text.</p><!--#--><div data-hk=\"0-2-0\"><button>-1</button><span>Value: <!--#-->1<!--/-->!</span><button>+1</button></div><!--/--><!--#--><div data-hk=\"0-3-0\"><button>-1</button><span>Value: <!--#-->2<!--/-->!</span><button>+1</button></div><!--/--><!--#--><div data-hk=\"0-4-0\"><button>-1</button><span>Value: <!--#-->3<!--/-->!</span><button>+1</button></div><!--/--></main>"
+				"<main><h1>Welcome to our benchmark page.</h1><p>Here's some introductory text.</p><div><button>-1</button><span>Value: <!>1<template id=\"_3\"></template>!</span><button>+1</button></div><template id=\"_1\"></template><div><button>-1</button><span>Value: <!>2<template id=\"_2\"></template>!</span><button>+1</button></div><template id=\"_0\"></template><div><button>-1</button><span>Value: <!>3<template id=\"_2\"></template>!</span><button>+1</button></div><template id=\"_0\"></template></main>"
 			);
 		});
 	});
 }
-
+/* 
 #[bench]
 fn tera_ssr_bench(b: &mut Bencher) {
 	use tera::*;
@@ -194,3 +194,4 @@ fn yew_ssr_bench(b: &mut Bencher) {
 		});
 	});
 }
+ */

benchmarks/src/todomvc/leptos.rs

@@ -1,4 +1,4 @@
-use leptos::*;
+pub use leptos::*;
 use miniserde::*;
 use web_sys::HtmlInputElement;
 
@@ -8,314 +8,320 @@ pub struct Todos(pub Vec<Todo>);
 const STORAGE_KEY: &str = "todos-leptos";
 
 impl Todos {
-    pub fn new(cx: Scope) -> Self {
-        Self(vec![])
-    }
+  pub fn new(cx: Scope) -> Self {
+    Self(vec![])
+  }
 
-    pub fn new_with_1000(cx: Scope) -> Self {
-        let todos = (0..1000)
-            .map(|id| Todo::new(cx, id, format!("Todo #{id}")))
-            .collect();
-        Self(todos)
-    }
+  pub fn new_with_1000(cx: Scope) -> Self {
+    let todos = (0..1000)
+      .map(|id| Todo::new(cx, id, format!("Todo #{id}")))
+      .collect();
+    Self(todos)
+  }
 
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
+  pub fn is_empty(&self) -> bool {
+    self.0.is_empty()
+  }
 
-    pub fn add(&mut self, todo: Todo) {
-        self.0.push(todo);
-    }
+  pub fn add(&mut self, todo: Todo) {
+    self.0.push(todo);
+  }
 
-    pub fn remove(&mut self, id: usize) {
-        self.0.retain(|todo| todo.id != id);
-    }
+  pub fn remove(&mut self, id: usize) {
+    self.0.retain(|todo| todo.id != id);
+  }
 
-    pub fn remaining(&self) -> usize {
-        self.0.iter().filter(|todo| !(todo.completed)()).count()
-    }
+  pub fn remaining(&self) -> usize {
+    self.0.iter().filter(|todo| !(todo.completed)()).count()
+  }
 
-    pub fn completed(&self) -> usize {
-        self.0.iter().filter(|todo| (todo.completed)()).count()
-    }
+  pub fn completed(&self) -> usize {
+    self.0.iter().filter(|todo| (todo.completed)()).count()
+  }
 
-    pub fn toggle_all(&self) {
-        // if all are complete, mark them all active instead
-        if self.remaining() == 0 {
-            for todo in &self.0 {
-                if todo.completed.get() {
-                    (todo.set_completed)(false);
-                }
-            }
-        }
-        // otherwise, mark them all complete
-        else {
-            for todo in &self.0 {
-                (todo.set_completed)(true);
-            }
+  pub fn toggle_all(&self) {
+    // if all are complete, mark them all active instead
+    if self.remaining() == 0 {
+      for todo in &self.0 {
+        if todo.completed.get() {
+          (todo.set_completed)(false);
         }
+      }
     }
+    // otherwise, mark them all complete
+    else {
+      for todo in &self.0 {
+        (todo.set_completed)(true);
+      }
+    }
+  }
 
-    fn clear_completed(&mut self) {
-        self.0.retain(|todo| !todo.completed.get());
-    }
+  fn clear_completed(&mut self) {
+    self.0.retain(|todo| !todo.completed.get());
+  }
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct Todo {
-    pub id: usize,
-    pub title: ReadSignal<String>,
-    pub set_title: WriteSignal<String>,
-    pub completed: ReadSignal<bool>,
-    pub set_completed: WriteSignal<bool>,
+  pub id: usize,
+  pub title: ReadSignal<String>,
+  pub set_title: WriteSignal<String>,
+  pub completed: ReadSignal<bool>,
+  pub set_completed: WriteSignal<bool>,
 }
 
 impl Todo {
-    pub fn new(cx: Scope, id: usize, title: String) -> Self {
-        Self::new_with_completed(cx, id, title, false)
-    }
+  pub fn new(cx: Scope, id: usize, title: String) -> Self {
+    Self::new_with_completed(cx, id, title, false)
+  }
 
-    pub fn new_with_completed(cx: Scope, id: usize, title: String, completed: bool) -> Self {
-        let (title, set_title) = create_signal(cx, title);
-        let (completed, set_completed) = create_signal(cx, completed);
-        Self {
-            id,
-            title,
-            set_title,
-            completed,
-            set_completed,
-        }
+  pub fn new_with_completed(
+    cx: Scope,
+    id: usize,
+    title: String,
+    completed: bool,
+  ) -> Self {
+    let (title, set_title) = create_signal(cx, title);
+    let (completed, set_completed) = create_signal(cx, completed);
+    Self {
+      id,
+      title,
+      set_title,
+      completed,
+      set_completed,
     }
+  }
 
-    pub fn toggle(&self) {
-        self.set_completed
-            .update(|completed| *completed = !*completed);
-    }
+  pub fn toggle(&self) {
+    self
+      .set_completed
+      .update(|completed| *completed = !*completed);
+  }
 }
 
 const ESCAPE_KEY: u32 = 27;
 const ENTER_KEY: u32 = 13;
 
 #[component]
-pub fn TodoMVC(cx: Scope, todos: Todos) -> Element {
-    let mut next_id = todos
+pub fn TodoMVC(cx: Scope,todos: Todos) -> impl IntoView {
+  let mut next_id = todos
+    .0
+    .iter()
+    .map(|todo| todo.id)
+    .max()
+    .map(|last| last + 1)
+    .unwrap_or(0);
+
+  let (todos, set_todos) = create_signal(cx, todos);
+  provide_context(cx, set_todos);
+
+  let (mode, set_mode) = create_signal(cx, Mode::All);
+  window_event_listener("hashchange", move |_| {
+    let new_mode = location_hash().map(|hash| route(&hash)).unwrap_or_default();
+    set_mode(new_mode);
+  });
+
+  let add_todo = move |ev: web_sys::KeyboardEvent| {
+    let target = event_target::<HtmlInputElement>(&ev);
+    ev.stop_propagation();
+    let key_code = ev.unchecked_ref::<web_sys::KeyboardEvent>().key_code();
+    if key_code == ENTER_KEY {
+      let title = event_target_value(&ev);
+      let title = title.trim();
+      if !title.is_empty() {
+        let new = Todo::new(cx, next_id, title.to_string());
+        set_todos.update(|t| t.add(new));
+        next_id += 1;
+        target.set_value("");
+      }
+    }
+  };
+
+  let filtered_todos = create_memo::<Vec<Todo>>(cx, move |_| {
+    todos.with(|todos| match mode.get() {
+      Mode::All => todos.0.to_vec(),
+      Mode::Active => todos
         .0
         .iter()
-        .map(|todo| todo.id)
-        .max()
-        .map(|last| last + 1)
-        .unwrap_or(0);
+        .filter(|todo| !todo.completed.get())
+        .cloned()
+        .collect(),
+      Mode::Completed => todos
+        .0
+        .iter()
+        .filter(|todo| todo.completed.get())
+        .cloned()
+        .collect(),
+    })
+  });
 
-    let (todos, set_todos) = create_signal(cx, todos);
-    provide_context(cx, set_todos);
-
-    let (mode, set_mode) = create_signal(cx, Mode::All);
-    window_event_listener("hashchange", move |_| {
-        let new_mode = location_hash().map(|hash| route(&hash)).unwrap_or_default();
-        set_mode(new_mode);
-    });
-
-    let add_todo = move |ev: web_sys::Event| {
-        let target = event_target::<HtmlInputElement>(&ev);
-        ev.stop_propagation();
-        let key_code = ev.unchecked_ref::<web_sys::KeyboardEvent>().key_code();
-        if key_code == ENTER_KEY {
-            let title = event_target_value(&ev);
-            let title = title.trim();
-            if !title.is_empty() {
-                let new = Todo::new(cx, next_id, title.to_string());
-                set_todos.update(|t| t.add(new));
-                next_id += 1;
-                target.set_value("");
-            }
-        }
-    };
-
-    let filtered_todos = create_memo::<Vec<Todo>>(cx, move |_| {
-        todos.with(|todos| match mode.get() {
-            Mode::All => todos.0.to_vec(),
-            Mode::Active => todos
-                .0
-                .iter()
-                .filter(|todo| !todo.completed.get())
-                .cloned()
-                .collect(),
-            Mode::Completed => todos
-                .0
-                .iter()
-                .filter(|todo| todo.completed.get())
-                .cloned()
-                .collect(),
-        })
-    });
-
-    // effect to serialize to JSON
-    // this does reactive reads, so it will automatically serialize on any relevant change
-    create_effect(cx, move |_| {
-        if let Ok(Some(storage)) = window().local_storage() {
-            let objs = todos
-                .get()
-                .0
-                .iter()
-                .map(TodoSerialized::from)
-                .collect::<Vec<_>>();
-            let json = json::to_string(&objs);
-            if storage.set_item(STORAGE_KEY, &json).is_err() {
-                log::error!("error while trying to set item in localStorage");
-            }
-        }
-    });
-
-    view! { cx,
-        <main>
-            <section class="todoapp">
-                <header class="header">
-                    <h1>"todos"</h1>
-                    <input class="new-todo" placeholder="What needs to be done?" autofocus on:keydown=add_todo />
-                </header>
-                <section class="main" class:hidden={move || todos.with(|t| t.is_empty())}>
-                    <input id="toggle-all" class="toggle-all" type="checkbox"
-                        prop:checked={move || todos.with(|t| t.remaining() > 0)}
-                        on:input=move |_| set_todos.update(|t| t.toggle_all())
-                    />
-                    <label for="toggle-all">"Mark all as complete"</label>
-                    <ul class="todo-list">
-                        <For each=filtered_todos key=|todo| todo.id>
-                            {move |cx, todo: &Todo| view! { cx,  <Todo todo=todo.clone() /> }}
-                        </For>
-                    </ul>
-                </section>
-                <footer class="footer" class:hidden={move || todos.with(|t| t.is_empty())}>
-                    <span class="todo-count">
-                        <strong>{move || todos.with(|t| t.remaining().to_string())}</strong>
-                        {move || if todos.with(|t| t.remaining()) == 1 {
-                            " item"
-                        } else {
-                            " items"
-                        }}
-                        " left"
-                    </span>
-                    <ul class="filters">
-                        <li><a href="#/" class="selected" class:selected={move || mode() == Mode::All}>"All"</a></li>
-                        <li><a href="#/active" class:selected={move || mode() == Mode::Active}>"Active"</a></li>
-                        <li><a href="#/completed" class:selected={move || mode() == Mode::Completed}>"Completed"</a></li>
-                    </ul>
-                    <button
-                        class="clear-completed hidden"
-                        class:hidden={move || todos.with(|t| t.completed() == 0)}
-                        on:click=move |_| set_todos.update(|t| t.clear_completed())
-                    >
-                        "Clear completed"
-                    </button>
-                </footer>
-            </section>
-            <footer class="info">
-                <p>"Double-click to edit a todo"</p>
-                <p>"Created by "<a href="http://todomvc.com">"Greg Johnston"</a></p>
-                <p>"Part of "<a href="http://todomvc.com">"TodoMVC"</a></p>
-            </footer>
-        </main>
+  // effect to serialize to JSON
+  // this does reactive reads, so it will automatically serialize on any relevant change
+  create_effect(cx, move |_| {
+    if let Ok(Some(storage)) = window().local_storage() {
+      let objs = todos
+        .get()
+        .0
+        .iter()
+        .map(TodoSerialized::from)
+        .collect::<Vec<_>>();
+      let json = json::to_string(&objs);
+      if storage.set_item(STORAGE_KEY, &json).is_err() {
+        log::error!("error while trying to set item in localStorage");
+      }
     }
+  });
+
+  view! { cx,
+      <main>
+          <section class="todoapp">
+              <header class="header">
+                  <h1>"todos"</h1>
+                  <input class="new-todo" placeholder="What needs to be done?" autofocus="" on:keydown=add_todo />
+              </header>
+              <section class="main" class:hidden={move || todos.with(|t| t.is_empty())}>
+                  <input id="toggle-all" class="toggle-all" type="checkbox"
+                      prop:checked={move || todos.with(|t| t.remaining() > 0)}
+                      on:input=move |_| set_todos.update(|t| t.toggle_all())
+                  />
+                  <label for="toggle-all">"Mark all as complete"</label>
+                  <ul class="todo-list">
+                      <For
+                        each=filtered_todos
+                        key=|todo| todo.id
+                        view=move |todo: Todo| view! { cx,  <Todo todo=todo.clone() /> }
+                      />
+                  </ul>
+              </section>
+              <footer class="footer" class:hidden={move || todos.with(|t| t.is_empty())}>
+                  <span class="todo-count">
+                      <strong>{move || todos.with(|t| t.remaining().to_string())}</strong>
+                      {move || if todos.with(|t| t.remaining()) == 1 {
+                          " item"
+                      } else {
+                          " items"
+                      }}
+                      " left"
+                  </span>
+                  <ul class="filters">
+                      <li><a href="#/" class="selected" class:selected={move || mode() == Mode::All}>"All"</a></li>
+                      <li><a href="#/active" class:selected={move || mode() == Mode::Active}>"Active"</a></li>
+                      <li><a href="#/completed" class:selected={move || mode() == Mode::Completed}>"Completed"</a></li>
+                  </ul>
+                  <button
+                      class="clear-completed hidden"
+                      class:hidden={move || todos.with(|t| t.completed() == 0)}
+                      on:click=move |_| set_todos.update(|t| t.clear_completed())
+                  >
+                      "Clear completed"
+                  </button>
+              </footer>
+          </section>
+          <footer class="info">
+              <p>"Double-click to edit a todo"</p>
+              <p>"Created by "<a href="http://todomvc.com">"Greg Johnston"</a></p>
+              <p>"Part of "<a href="http://todomvc.com">"TodoMVC"</a></p>
+          </footer>
+      </main>
+  }.into_view(cx)
 }
 
 #[component]
-pub fn Todo(cx: Scope, todo: Todo) -> Element {
-    let (editing, set_editing) = create_signal(cx, false);
-    let set_todos = use_context::<WriteSignal<Todos>>(cx).unwrap();
-    let input: Element;
+pub fn Todo(cx: Scope, todo: Todo) -> impl IntoView {
+  let (editing, set_editing) = create_signal(cx, false);
+  let set_todos = use_context::<WriteSignal<Todos>>(cx).unwrap();
+  //let input = NodeRef::new(cx);
 
-    let save = move |value: &str| {
-        let value = value.trim();
-        if value.is_empty() {
-            set_todos.update(|t| t.remove(todo.id));
-        } else {
-            (todo.set_title)(value.to_string());
-        }
-        set_editing(false);
-    };
+  let save = move |value: &str| {
+    let value = value.trim();
+    if value.is_empty() {
+      set_todos.update(|t| t.remove(todo.id));
+    } else {
+      (todo.set_title)(value.to_string());
+    }
+    set_editing(false);
+  };
 
-    let tpl = view! { cx,
-        <li
-            class="todo"
-            class:editing={editing}
-            class:completed={move || (todo.completed)()}
-            _ref=input
-        >
-            <div class="view">
-                <input
-                    class="toggle"
-                    type="checkbox"
-                    prop:checked={move || (todo.completed)()}
+  view! { cx,
+      <li
+          class="todo"
+          class:editing={editing}
+          class:completed={move || (todo.completed)()}
+          //_ref=input
+      >
+          <div class="view">
+              <input
+                  class="toggle"
+                  type="checkbox"
+                  prop:checked={move || (todo.completed)()}
 
-                />
-                <label on:dblclick=move |_| set_editing(true)>
-                    {move || todo.title.get()}
-                </label>
-                <button class="destroy" on:click=move |_| set_todos.update(|t| t.remove(todo.id))/>
-            </div>
-            {move || editing().then(|| view! { cx,
-                <input
-                    class="edit"
-                    class:hidden={move || !(editing)()}
-                    prop:value={move || todo.title.get()}
-                    on:focusout=move |ev| save(&event_target_value(&ev))
-                    on:keyup={move |ev| {
-                        let key_code = ev.unchecked_ref::<web_sys::KeyboardEvent>().key_code();
-                        if key_code == ENTER_KEY {
-                            save(&event_target_value(&ev));
-                        } else if key_code == ESCAPE_KEY {
-                            set_editing(false);
-                        }
-                    }}
-                />
-            })
-        }
-        </li>
-    };
-
-    tpl
+              />
+              <label on:dblclick=move |_| set_editing(true)>
+                  {move || todo.title.get()}
+              </label>
+              <button class="destroy" on:click=move |_| set_todos.update(|t| t.remove(todo.id))/>
+          </div>
+          {move || editing().then(|| view! { cx,
+              <input
+                  class="edit"
+                  class:hidden={move || !(editing)()}
+                  prop:value={move || todo.title.get()}
+                  on:focusout=move |ev| save(&event_target_value(&ev))
+                  on:keyup={move |ev| {
+                      let key_code = ev.unchecked_ref::<web_sys::KeyboardEvent>().key_code();
+                      if key_code == ENTER_KEY {
+                          save(&event_target_value(&ev));
+                      } else if key_code == ESCAPE_KEY {
+                          set_editing(false);
+                      }
+                  }}
+              />
+          })
+      }
+      </li>
+  }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Mode {
-    Active,
-    Completed,
-    All,
+  Active,
+  Completed,
+  All,
 }
 
 impl Default for Mode {
-    fn default() -> Self {
-        Mode::All
-    }
+  fn default() -> Self {
+    Mode::All
+  }
 }
 
 pub fn route(hash: &str) -> Mode {
-    match hash {
-        "/active" => Mode::Active,
-        "/completed" => Mode::Completed,
-        _ => Mode::All,
-    }
+  match hash {
+    "/active" => Mode::Active,
+    "/completed" => Mode::Completed,
+    _ => Mode::All,
+  }
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct TodoSerialized {
-    pub id: usize,
-    pub title: String,
-    pub completed: bool,
+  pub id: usize,
+  pub title: String,
+  pub completed: bool,
 }
 
 impl TodoSerialized {
-    pub fn into_todo(self, cx: Scope) -> Todo {
-        Todo::new_with_completed(cx, self.id, self.title, self.completed)
-    }
+  pub fn into_todo(self, cx: Scope) -> Todo {
+    Todo::new_with_completed(cx, self.id, self.title, self.completed)
+  }
 }
 
 impl From<&Todo> for TodoSerialized {
-    fn from(todo: &Todo) -> Self {
-        Self {
-            id: todo.id,
-            title: todo.title.get(),
-            completed: (todo.completed)(),
-        }
+  fn from(todo: &Todo) -> Self {
+    Self {
+      id: todo.id,
+      title: todo.title.get(),
+      completed: (todo.completed)(),
     }
+  }
 }

benchmarks/src/todomvc/mod.rs

@@ -7,15 +7,14 @@ mod yew;
 
 #[bench]
 fn leptos_todomvc_ssr(b: &mut Bencher) {
-    use self::leptos::*;
-    use ::leptos::*;
-
     b.iter(|| {
-        _ = create_scope(|cx| {
+        use crate::todomvc::leptos::*;
+
+        _ = create_scope(create_runtime(), |cx| {
             let rendered = view! {
                 cx,
                 <TodoMVC todos=Todos::new(cx)/>
-            };
+            }.into_view(cx).render_to_string(cx);
 
             assert!(rendered.len() > 1);
         });
@@ -59,15 +58,15 @@ fn yew_todomvc_ssr(b: &mut Bencher) {
 
 #[bench]
 fn leptos_todomvc_ssr_with_1000(b: &mut Bencher) {
-    use self::leptos::*;
-    use ::leptos::*;
-
     b.iter(|| {
-        _ = create_scope(|cx| {
+        use self::leptos::*;
+        use ::leptos::*;
+
+        _ = create_scope(create_runtime(), |cx| {
             let rendered = view! {
                 cx,
                 <TodoMVC todos=Todos::new_with_1000(cx)/>
-            };
+            }.into_view(cx).render_to_string(cx);
 
             assert!(rendered.len() > 1);
         });

docs/COMMON_BUGS.md

@@ -0,0 +1,63 @@
+# Leptos Gotchas: Common Bugs
+
+This document is intended as a running list of common issues, with example code and solutions.
+
+## Reactivity
+
+### Avoid writing to a signal from an effect
+
+**Issue**: Sometimes you want to update a reactive signal in a way that depends on another signal.
+
+```rust
+let (a, set_a) = create_signal(cx, 0);
+let (b, set_b) = create_signal(cx, false);
+
+create_effect(cx, move |_| {
+	if a() > 5 {
+		set_b(true);
+	}
+});
+```
+
+This creates an inefficient chain of updates, and can easily lead to infinite loops in more complex applications.
+
+**Solution**: Follow the rule, _What can be derived, should be derived._ In this case, this has the benefit of massively reducing the code size, too!
+
+```rust
+let (a, set_a) = create_signal(cx, 0);
+let b = move || a () > 5;
+```
+
+## Templates and the DOM
+
+### `<input value=...>` doesn't update or stops updating
+
+Many DOM attributes can be updated either by setting an attribute on the DOM node, or by setting an object property directly on it. In general, `setAttribute()` stops working once the property has been set.
+
+This means that in practice, attributes like `value` or `checked` on an `<input/>` element only update the _default_ value for the `<input/>`. If you want to reactively update the value, you should use `prop:value` instead to set the `value` property.
+
+```rust
+let (a, set_a) = create_signal(cx, "Starting value".to_string());
+let on_input = move |ev| set_a(event_target_value(&ev));
+
+view! {
+	cx,
+	// ❌ reactivity doesn't work as expected: typing only updates the default
+	//    of each input, so if you start typing in the second input, it won't
+	//    update the first one
+	<input value=a on:input=on_input />
+	<input value=a on:input=on_input />
+}
+```
+
+```rust
+let (a, set_a) = create_signal(cx, "Starting value".to_string());
+let on_input = move |ev| set_a(event_target_value(&ev));
+
+view! {
+	cx,
+	// ✅ works as intended by setting the value *property*
+	<input prop:value=a on:input=on_input />
+	<input prop:value=a on:input=on_input />
+}
+```

docs/book/book.toml

@@ -4,3 +4,13 @@ language = "en"
 multilingual = false
 src = "src"
 title = "The Leptos Guide"
+
+[preprocessor]
+
+[preprocessor.mermaid]
+command = "mdbook-mermaid"
+
+[output]
+
+[output.html]
+additional-js = ["mermaid.min.js", "mermaid-init.js"]

docs/book/mermaid-init.js

@@ -0,0 +1 @@
+mermaid.initialize({startOnLoad:true});

docs/book/project/ch01_getting_started/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "ch01_getting_started"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-leptos = { version = "0.0", features = ["csr"] }
-
-[profile.release]
-codegen-units = 1
-lto = true
-opt-level = 'z'

docs/book/project/ch01_getting_started/src/main.rs

@@ -1,5 +0,0 @@
-use leptos::*;
-
-fn main() {
-    mount_to_body(|cx| view! { cx,  <p>"Hello, world!"</p> })
-}

docs/book/project/ch02_getting_started/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "ch02_getting_started"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+leptos = "0.0.18"

docs/book/project/ch02_getting_started/index.html

@@ -4,7 +4,11 @@
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<title>Leptos • Todos</title>
+
+		<!-- This custom link tag with `data-trunk` tells Trunk to insert code here to load our Rust/Wasm code -->
+		<!-- `data-wasm-opt=z` tells the compiler to optimize for binary size in a release build -->
 		<link data-trunk rel="rust" data-wasm-opt="z" />
+
 	</head>
 	<body></body>
 </html>

docs/book/project/ch02_getting_started/src/main.rs

@@ -0,0 +1,5 @@
+use leptos::*;
+
+fn main() {
+    mount_to_body(|_cx| view! { cx,  <p>"Hello, world!"</p> })
+}

docs/book/project/ch03_building_ui/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "ch03_building_ui"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+leptos = "0.0.18"

docs/book/project/ch03_building_ui/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<title>Leptos • Todos</title>
+
+		<!-- This custom link tag with `data-trunk` tells Trunk to insert code here to load our Rust/Wasm code -->
+		<!-- `data-wasm-opt=z` tells the compiler to optimize for binary size in a release build -->
+		<link data-trunk rel="rust" data-wasm-opt="z" />
+
+	</head>
+	<body></body>
+</html>

docs/book/project/ch03_building_ui/src/main.rs

@@ -0,0 +1,39 @@
+use leptos::*;
+
+fn main() {
+    mount_to_body(|cx| {
+        let name = "gbj";
+        let userid = 0;
+        let _input_element: Element;
+
+        view! {
+            cx,
+            <main>
+                <h1>"My Tasks"</h1>     // text nodes are wrapped in quotation marks
+                <h2>"by " {name}</h2>
+                <input
+                    type="text"         // attributes work just like they do in HTML
+                    name="new-todo"
+                    prop:value="todo"   // `prop:` lets you set a property on a DOM node
+                    value="initial"     // side note: the DOM `value` attribute only sets *initial* value
+                                        // this is very important when working with forms!
+                    _ref=_input_element // `_ref` stores tis element in a variable
+                />
+                <ul data-user=userid>   // attributes can take expressions as values
+                    <li class="todo my-todo" // here we set the `class` attribute
+                        class:completed=true // `class:` also lets you toggle individual classes
+                        on:click=|_| todo!() // `on:` adds an event listener
+                    >
+                        "Buy milk."
+                    </li>
+                    <li class="todo my-todo" class:completed=false>
+                        "???"
+                    </li>
+                    <li class="todo my-todo" class:completed=false>
+                        "Profit!!!"
+                    </li>
+                </ul>
+            </main>
+        }
+    })
+}

docs/book/project/ch04_reactivity/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "ch04_reactivity"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+leptos = "0.0.18"

docs/book/project/ch04_reactivity/src/main.rs

@@ -0,0 +1,28 @@
+use leptos::*;
+
+fn main() {
+    run_scope(create_runtime(), |cx| {
+        // signal
+        let (count, set_count) = create_signal(cx, 1);
+
+        // derived signal
+        let double_count = move || count() * 2;
+
+        // memo
+        let memoized_square = create_memo(cx, move |_| count() * count());
+
+        // effect
+        create_effect(cx, move |_| {
+            println!(
+                "count =\t\t{} \ndouble_count = \t{}, \nsquare = \t{}",
+                count(),
+                double_count(),
+                memoized_square()
+            );
+        });
+
+        set_count(1);
+        set_count(2);
+        set_count(3);
+    });
+}

docs/book/src/02_getting_started.md

@@ -1,8 +1,8 @@
 # Getting Started
 
-> The code for this chapter can be found [here](https://github.com/gbj/leptos/tree/main/docs/book/project/ch01_getting_started).
+> The code for this chapter can be found [here](https://github.com/gbj/leptos/tree/main/docs/book/project/ch02_getting_started).
 
-The easiest way to get started using Leptos is to use [Trunk](https://trunkrs.dev/), as many of our [examples](https://github.com/gbj/leptos/tree/main/examples) do.
+The easiest way to get started using Leptos is to use [Trunk](https://trunkrs.dev/), as many of our [examples](https://github.com/gbj/leptos/tree/main/examples) do. (Trunk is a simple build tool that includes a dev server.)
 
 If you don’t already have it installed, you can install Trunk by running
 
@@ -19,19 +19,19 @@ cargo init leptos-todo
 Add `leptos` as a dependency to your `Cargo.toml` with the `csr` featured enabled. (That stands for “client-side rendering.” We’ll talk more about Leptos’s support for server-side rendering and hydration later.)
 
 ```toml
-leptos = { version = "0.0", features = ["csr"] }
+leptos = "0.0"
 ```
 
 You’ll want to set up a basic `index.html` with the following content:
 
 ```html
-{{#include ../project/ch01_getting_started/index.html}}
+{{#include ../project/ch02_getting_started/index.html}}
 ```
 
 Let’s start with a very simple `main.rs`
 
 ```rust
-{{#include ../project/ch01_getting_started/src/main.rs}}
+{{#include ../project/ch02_getting_started/src/main.rs}}
 ```
 
-Now run `trunk serve --open`. Trunk should automatically compile your app and open it in your default browser.
+Now run `trunk serve --open`. Trunk should automatically compile your app and open it in your default browser. If you make edits to `main.rs`, Trunk will recompile your source code and live-reload the page.

docs/book/src/03_building_ui.md

@@ -0,0 +1,49 @@
+# Templating: Building User Interfaces
+
+> The code for this chapter can be found [here](https://github.com/gbj/leptos/tree/main/docs/book/project/ch03_building_ui).
+
+## RSX and the `view!` macro
+
+Okay, that “Hello, world!” was a little boring. We’re going to be building a todo app, so let’s look at something a little more complicated.
+
+As you noticed in the first example, Leptos lets you describe your user interface with a declarative `view!` macro. It looks something like this:
+
+```
+view! {
+	cx, // this is the "reactive scope": more on that in the next chapter
+	<p>"..."</p> // this is some HTML-ish stuff
+}
+```
+
+The “HTML-ish stuff” is what we call “RSX”: XML in Rust. (You may recognize the similarity to JSX, which is the mixed JavaScript/XML syntax used by frameworks like React.)
+
+Here’s a more in-depth example:
+
+```rust
+{{#include ../project/ch03_building_ui/src/main.rs}}
+```
+
+You’ll probably notice a few things right away:
+
+1. Elements without children need to be explicit closed with a `/` (`<input/>`, not `<input>`)
+2. Text nodes are formatted as strings, i.e., wrapped in quotation marks (`"My Tasks"`)
+3. Dynamic blocks can be inserted as children of elements, if wrapped in curly braces (`<h2>"by " {name}</h2>`)
+4. Attributes can be given Rust expressions as values. This could be a string literal as in HTML (`<input type="text" .../>)` or a variable or block (`data-user=userid` or `on:click=move |_| { ... }`)
+5. Unlike in HTML, whitespace is ignored and should be manually added (it’s `<h2>"by " {name}</h2>`, not `<h2>"by" {name}</h2>`; the space between `"by"` and `{name}` is ignored.)
+6. Normal attributes work exactly like you'd think they would.
+7. There are also special, prefixed attributes.
+
+- `class:` lets you make targeted updates to a single class
+- `on:` lets you add an event listener
+- `prop:` lets you set a property on a DOM element
+- `_ref` stores the DOM element you’re creating in a variable
+
+> You can find more information in the [reference docs for the `view!` macro](https://docs.rs/leptos/0.0.15/leptos/macro.view.html).
+
+## But, wait...
+
+This example shows some parts of the Leptos templating syntax. But it’s completely static.
+
+How do you actually make the user interface interactive?
+
+In the next chapter, we’ll talk about “fine-grained reactivity,” which is the core of the Leptos framework.

docs/book/src/04_reactivity.md

@@ -0,0 +1,240 @@
+# Reactivity
+
+## What is reactivity?
+
+A few months ago, I completely baffled a friend by trying to explain what I was working on. “You have two variables, right? Call them `a` and `b`. And then you have a third variable, `c`. And when you update `a` or `b`, the value of `c` just _automatically changes_. And it changes _on the screen_! Automatically!”
+
+“Isn’t that just... how computers work?” she asked me, puzzled. If your programming experience is limited to something like spreadsheets, it’s a reasonable enough assumption. This is, after all, how math works.
+
+But you know this isn't how ordinary imperative programming works.
+
+```rust,should_panic
+let mut a = 0;
+let mut b = 0;
+let c = a + b;
+
+assert_eq!(c, 0); // sanity check
+
+a = 2;
+b = 2;
+
+// now c = 4, right?
+assert_eq!(c, 4); // nope. we all know this is wrong!
+```
+
+But that’s _exactly_ how reactive programming works.
+
+```rust
+use leptos::*;
+
+run_scope(create_runtime(), |cx| {
+    let (a, set_a) = create_signal(cx, 0);
+    let (b, set_b) = create_signal(cx, 0);
+    let c = move || a() + b();
+
+    assert_eq!(c(), 0); // yep, still true
+
+    set_a(2);
+    set_b(2);
+
+    assert_eq!(c(), 4); // ohhhhh yeah.
+});
+```
+
+Hopefully, this makes some intuitive sense. After all, `c` is a closure. Calling it again causes it to access its values a second time. This isn’t _that_ cool.
+
+```rust
+use leptos::*;
+
+run_scope(create_runtime(), |cx| {
+    let (a, set_a) = create_signal(cx, 0);
+    let (b, set_b) = create_signal(cx, 0);
+    let c = move || a() + b();
+
+    create_effect(cx, move |_| {
+        println!("c = {}", c()); // prints "c = 0"
+    });
+
+    set_a(2); // prints "c = 2"
+    set_b(2); // prints "c = 4"
+});
+```
+
+This example’s a little different. [`create_effect`](https://docs.rs/leptos/latest/leptos/fn.create_effect.html) defines a “side effect,” a bridge between the reactive system of signals and the outside world. Effects synchronize the reactive system with everything else: the console, the filesystem, an HTTP request, whatever.
+
+Because the closure `c` is called within the effect and in turns calls the signals `a` and `b`, the effect automatically subscribes to the signals `a` and `b`. This means that whenever `a` or `b` is updated, the effect will re-run, logging the value again.
+
+You can picture the reactive graph for this system like this:
+
+```mermaid
+graph TD;
+    A-->C;
+    B-->C;
+    C-->Effect;
+```
+
+This is the foundation on which _everything_ else is built.
+
+## Reactive Primitives
+
+### Overview
+
+The reactive system is built on the interaction between these two halves: **signals** and **effects**. When a signal is called inside an effect, the effect automatically subscribes to the signal. When a signal’s value is updated, it automatically notifies all its subscribers, and they re-run.
+
+The following simple example contains most of the core reactive concepts:
+
+```rust
+{{#include ../project/ch04_reactivity/src/main.rs}}
+```
+
+This creates a reactive graph like this:
+
+```mermaid
+graph TD;
+    count-->double_count;
+    count-->memoized_square;
+    count-->effect;
+    double_count-->effect;
+    memoized_square-->effect;
+```
+
+**Signals** are reactive values created using [`create_signal`](https://docs.rs/leptos/latest/leptos/fn.create_signal.html) or [`create_rw_signal`](https://docs.rs/leptos/latest/leptos/fn.create_rw_signal.html).
+
+**Derived Signals** computations in ordinary closures that rely on other signals. The computation re-runs whenever you access its value.
+
+**Memos** are computations that are memoized with [create_memo](https://docs.rs/leptos/latest/leptos/fn.create_memo.html). Memos only re-run when one of their signal dependencies has changed.
+
+And **effects** (created with [create_effect](<(https://docs.rs/leptos/latest/leptos/fn.create_effect.html)>) synchronize the reactive system with something outside it.
+
+The rest of this chapter will walk through each of these concepts in more depth.
+
+### Signals
+
+A **signal** is a piece of data that may change over time, and notifies other code when it has changed. This is the core primitive of Leptos’s reactive system.
+
+Creating a signal is very simple. You call `create_signal`, passing in the reactive scope and the default value, and receive a tuple containing a `ReadSignal` and a `WriteSignal`.
+
+```rust
+let (value, set_value) = create_signal(cx, 0);
+```
+
+> If you’ve used signals in Sycamore or Solid, observables in MobX or Knockout, or a similar primitive in reactive library, you probably have a pretty good idea of how signals work in Leptos. If you’re familiar with React, Yew, or Dioxus, you may recognize a similar pattern to their `use_state` hooks.
+
+#### `ReadSignal<T>`
+
+The [`ReadSignal`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html) half of this tuple allows you to get the current value of the signal. Reading that value in a reactive context automatically subscribes to any further changes. You can access the value by simply calling the `ReadSignal` as a function.
+
+```rust
+let (value, set_value) = create_signal(cx, 0);
+
+// calling value() with return the current value of the signal,
+// and automatically track changes if you're in a reactive context
+assert_eq!(value(), 0);
+```
+
+> Here, a **reactive context** means anywhere within an `Effect`. Leptos’s templating system is built on top of its reactive system, so if you’re reading the signal’s value within the template, the template will automatically subscribe to the signal and update exactly the value that needs to change in the DOM.
+
+Calling a `ReadSignal` clones the value it contains. If that’s too expensive, use [`ReadSignal::with()`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html#method.with) to borrow the value and do whatever you need.
+
+```rust
+struct MySuperExpensiveStruct {
+    a: String,
+    b: StructThatsSuperExpensiveToClone
+}
+let (value, set_value) = create_signal(cx, MySuperExpensiveStruct::default());
+
+// ❌ this is going to clone the `StructThatsSuperExpensiveToClone` unnecessarily!
+let lowercased = move || value().a.to_lowercase();
+// ✅ only use what we need
+let lowercased = move || value.with(|value: &MySuperExpensiveStruct| value.a.to_lowercase());
+```
+
+#### `WriteSignal<T>`
+
+The [`WriteSignal`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html) half of this tuple allows you to update the value of the signal, which will automatically notify anything that’s listening to the value that something has changed. If you simply call the `WriteSignal` as a function, its value will be set to the argument you pass. If you want to mutate the value in place instead of replacing it, you can call [`WriteSignal::update`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html#method.update) instead.
+
+```rust
+// often you just want to replace the value
+let (value, set_value) = create_signal(cx, 0);
+set_value(1);
+assert_eq!(value(), 1);
+
+// sometimes you want to mutate something in place, like a Vec. Just call update()
+let (items, set_items) = create_signal(cx, vec![0]);
+set_items.update(|items: &mut Vec<i32>| items.push(1));
+assert_eq!(items(), vec![1]);
+```
+
+> Under the hood, `set_value(1)` is just syntactic sugar for `set_value.update(|n| *n = 1)`.
+
+#### `RwSignal<T>`
+
+This kind of “read-write segregation,” in which the getter and the setter are stored in separate variables, may be familiar from the tuple-based ”hooks” pattern in libraries like React, Solid, Yew, or Dioxus. It encourages clear contracts between components. For example, if a child component only needs to be able to read a signal, but shouldn’t be able to update it (and therefore trigger changes in other parts of the application), you can pass it only the `ReadSignal`.
+
+Sometimes, however, you may prefer to keep the getter and setter combined in one variable. For example, it’s awkward and repetitive to store both halves of a signal in another data structure:
+
+```rust
+# use leptos::*;
+
+// pretty repetitive
+struct AppState {
+    count: ReadSignal<i32>,
+    set_count: WriteSignal<i32>,
+    name: ReadSignal<String>,
+    set_name: WriteSignal<String>
+}
+
+#[component]
+fn App(cx: Scope) {
+    let (count, set_count) = create_signal(cx, 0);
+    let (name, set_name) = create_signal(cx, "Alice".to_string());
+    provide_context(cx, AppState {
+        count,
+        set_count,
+        name,
+        set_name
+    })
+
+    todo!()
+}
+```
+
+Or maybe you just like to keep your getters and setters in one place.
+
+In this case, you can use [`create_rw_signal`](https://docs.rs/leptos/latest/leptos/fn.create_rw_signal.html) and the [`RwSignal`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html) type. This returns a **R**ead-**w**rite Signal, which has the same [`get`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.get), [`with`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.with), [`set`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.set), and [`update`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.update) functions as the `ReadSignal` and `WriteSignal` halves.
+
+```rust
+# use leptos::*;
+
+// better
+struct AppState {
+    count: RwSignal<i32>,
+    name: RwSignal<String>,
+}
+
+#[component]
+fn App(cx: Scope) {
+    let count = create_rw_signal(cx, 0);
+    let name = create_rw_signal(cx, "Alice".to_string());
+    provide_context(cx, AppState {
+        count,
+        name,
+    })
+
+    todo!()
+}
+```
+
+If you still want to hand off read-only access to another part of the app, you can get a `ReadSignal` with [`RwSignal::read_only()`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.get).
+
+### Derived Signals
+
+(todo)
+
+### Memos
+
+(todo)
+
+### Effects
+
+(todo)

docs/book/src/SUMMARY.md

@@ -1,6 +1,6 @@
 # Summary
 
-- [Introduction](./introduction.md)
-- [Getting Started](./getting_started.md)
-- [Templating: Building User Interfaces](./building_ui.md)
-- [Reactivity: Making Things Interactive](./reactivity.md)
+- [Introduction](./01_introduction.md)
+- [Getting Started](./02_getting_started.md)
+- [Templating: Building User Interfaces](./03_building_ui.md)
+- [Reactivity: Making Things Interactive](./04_reactivity.md)

docs/book/src/building_ui.md

@@ -1,49 +0,0 @@
-# Templating: Building User Interfaces
-
-## Views
-
-Leptos uses a simple `view` macro to create the user interface. If you’re familiar with JSX, then
-
-## Components
-
-**Components** are the basic building blocks of your application. Each component is simply a function that creates DOM nodes and sets up the reactive system that will update them. The component function runs exactly once per instance of the component.
-
-The `component` macro annotates a function as a component, allowing you to use it within other components.
-
-```rust
-use leptos::*;
-
-#[component]
-fn Button(cx: Scope, text: &'static str) -> Element {
-    view! { cx,
-        <button>{text}</button>
-    }
-}
-
-#[component]
-fn BoringButtons(cx: Scope) -> Element {
-    view! { cx,
-        <div>
-			<Button text="These"/>
-			<Button text="Do"/>
-			<Button text="Nothing"/>
-		</div>
-    }
-}
-```
-
-## Views
-
-Leptos uses a simple `view` macro to create the user interface. It’s much like HTML, with the following differences:
-
-1. Text within elements follows the rules of normal Rust strings (i.e., quotation marks or other string syntax)
-
-```rust
-view! { cx,  <p>"Hello, world!"</p> }
-```
-
-2. Values can be inserted between curly braces. Reactive values
-
-```rust
-view! { cx,  <p id={non_reactive_variable}>{move || value()}</p> }
-```

docs/book/src/reactivity.md

@@ -1,62 +0,0 @@
-# Reactivity
-
-## Signals
-
-A **signal** is a piece of data that may change over time, and notifies other code when it has changed. This is the core primitive of Leptos’s reactive system.
-
-Creating a signal is very simple. You call `create_signal`, passing in the reactive scope and the default value, and receive a tuple containing a `ReadSignal` and a `WriteSignal`.
-
-```rust
-let (value, set_value) = create_signal(cx, 0);
-```
-
-> If you’ve used signals in Sycamore or Solid, observables in MobX or Knockout, or a similar primitive in reactive library, you probably have a pretty good idea of how signals work in Leptos. If you’re familiar with React, Yew, or Dioxus, you may recognize a similar pattern to their `use_state` hooks.
-
-### `ReadSignal<T>`
-
-The `ReadSignal` half of this tuple allows you to get the current value of the signal. Reading that value in a reactive context automatically subscribes to any further changes. You can access the value by simply calling the `ReadSignal` as a function.
-
-```rust
-let (value, set_value) = create_signal(cx, 0);
-
-// calling value() with return the current value of the signal,
-// and automatically track changes if you're in a reactive context
-assert_eq!(value(), 0);
-```
-
-> Here, a **reactive context** means anywhere within an `Effect`. Leptos’s templating system is built on top of its reactive system, so if you’re reading the signal’s value within the template, the template will automatically subscribe to the signal and update exactly the value that needs to change in the DOM.
-
-Calling a `ReadSignal` clones the value it contains. If that’s too expensive, use `ReadSignal::with()` to borrow the value and do whatever you need.
-
-```rust
-struct MySuperExpensiveStruct {
-    a: String,
-    b: StructThatsSuperExpensiveToClone
-}
-let (value, set_value) = create_signal(cx, MySuperExpensiveStruct::default());
-
-// ❌ this is going to clone the `StructThatsSuperExpensiveToClone` unnecessarily!
-let lowercased = move || value().a.to_lowercase();
-// ✅ only use what we need
-let lowercased = move || value.with(|value| value.to_lowercase());
-// 🔥 aaaand there's no need to type "value" three times in a row
-let lowercased = move || value.with(String::to_lowercase);
-```
-
-### `WriteSignal<T>`
-
-The `WriteSignal` half of this tuple allows you to update the value of the signal, which will automatically notify anything that’s listening to the value that something has changed. If you simply call the `WriteSignal` as a function, its value will be set to the argument you pass. If you want to mutate the value in place instead of replacing it, you can call `WriteSignal::update` instead.
-
-```rust
-// often you just want to replace the value
-let (value, set_value) = create_signal(cx, 0);
-set_value(1);
-assert_eq!(value(), 1);
-
-// sometimes you want to mutate something in place, like a Vec. Just call update()
-let (items, set_items) = create_signal(cx, vec![0]);
-set_items.update(|items: &mut Vec<i32>| items.push(1));
-assert_eq!(items(), vec![1]);
-```
-
-> Under the hood, `set_value(1)` is just syntactic sugar for `set_value.update(|n| *n = 1)`.

docs/logos/Leptos_logo_RGB.svg

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 437.4294 209.6185" style="enable-background:new 0 0 437.4294 209.6185;" xml:space="preserve">
+<path style="fill:none;" d="M130.0327,79.3931c-11.4854-0.23-22.52,9.3486-24.5034,21.0117l49.1157,0.0293
+	c-2.1729-10.418-11.1821-21.0449-24.1987-21.0449C130.3081,79.3892,130.1714,79.3907,130.0327,79.3931z"/>
+<path style="fill:#181139;" d="M95.1109,128.1089H58.6797V65.6861c0-1.5234-0.8169-2.4331-2.1855-2.4331h-3.1187
+	c-1.3159,0-2.2349,1.0005-2.2349,2.4331v67.4297c0,1.4521,0.8145,2.2852,2.2349,2.2852h41.7353c1.4844,0,2.4819-0.9375,2.4819-2.333
+	v-2.7744C97.5928,128.9253,96.6651,128.1089,95.1109,128.1089z"/>
+<path style="fill:#181139;" d="M146.4561,77.1739c-4.8252-3.001-10.3037-4.5249-16.2837-4.5288c-0.0068,0-0.0137,0-0.0205,0
+	c-5.7349,0-11.1377,1.4639-16.0566,4.3511c-4.916,2.8853-8.8721,6.8364-11.7593,11.7456
+	c-2.8975,4.9248-4.3687,10.332-4.3721,16.0713c-0.0034,5.7188,1.4966,11.0654,4.4565,15.8887
+	c2.9893,4.9209,6.8789,8.7334,11.8887,11.6514c4.8657,2.8633,10.2397,4.3174,15.9717,4.3203c0.0073,0,0.0146,0,0.022,0
+	c8.123,0,14.7441-2.5869,21.4683-8.3906c0.5493-0.4805,0.8516-1.1201,0.8516-1.8008c0.001-0.6074-0.1743-1.1035-0.5205-1.4756
+	l-1.3569-1.8428l-0.0732-0.0859c-0.2637-0.2637-0.6929-0.6152-1.3716-0.6152c-0.6421,0-1.2549,0.2217-1.7124,0.6143
+	c-1.9346,1.585-3.5459,2.8008-4.7969,3.6182c-1.7979,1.208-5.8218,3.2314-12.5986,3.2314c-0.0073,0-0.0142,0-0.021,0
+	c-0.1357,0.0029-0.269,0.0039-0.4043,0.0039c-12.2642,0-23.4736-10.3262-24.5088-22.4814l53.0127,0.0322c0.0015,0,0.0024,0,0.0034,0
+	c2.2373,0,3.4697-1.1621,3.4712-3.2715c0.0034-5.2588-1.3574-10.3945-4.0464-15.2705
+	C155.0015,84.0953,151.2188,80.1363,146.4561,77.1739z M154.6451,100.4341l-49.1157-0.0293
+	c1.9834-11.6631,13.0181-21.2417,24.5034-21.0117c0.1387-0.0024,0.2754-0.0039,0.4136-0.0039
+	C143.4629,79.3892,152.4722,90.0162,154.6451,100.4341z"/>
+<path style="fill:#181139;" d="M204.0386,136.6382c5.7319,0,11.1069-1.4502,15.9746-4.3115
+	c4.938-2.9014,8.75-6.7129,11.6533-11.6533c2.8608-4.8672,4.311-10.2578,4.311-16.0244c0-5.7324-1.4502-11.1064-4.311-15.9746
+	c-2.9019-4.9385-6.7134-8.75-11.6533-11.6533c-4.8687-2.8618-10.2437-4.3125-15.9746-4.3125
+	c-9.938,0-19.2021,4.7583-24.3516,12.3174v-9.438c0-0.5946-0.1465-1.0788-0.411-1.4511c-0.3815-0.5369-1.0157-0.834-1.8727-0.834
+	h-2.6738c-1.4521,0-2.2852,0.833-2.2852,2.2852v5.6964v46.4791v23.9676c0,1.2568,0.7808,2.0371,2.0371,2.0371h3.3667
+	c0.9209,0,1.6421-0.6992,1.6421-1.5908v-17.098v-10.984C185.0884,131.8892,194.2749,136.6382,204.0386,136.6382z M186.6358,122.5591
+	c-4.9346-4.9346-7.6831-11.4932-7.542-18.0254c-0.1367-6.3506,2.5439-12.751,7.3545-17.5605
+	c4.8521-4.8521,11.3037-7.5547,17.7383-7.417c4.3691,0,8.4863,1.1465,12.2314,3.4043c3.7344,2.2979,6.7456,5.4053,8.9492,9.2354
+	c2.1699,3.9072,3.2695,8.0967,3.2695,12.4697c0.1396,6.4619-2.5967,12.9844-7.5083,17.8955
+	c-4.7617,4.7617-11.0469,7.3857-17.2544,7.2803C197.6856,129.9712,191.396,127.3208,186.6358,122.5591z"/>
+<path style="fill:#181139;" d="M241.8955,80.3975h7.5669v42.0259c0,6.8174,4.5674,12.1309,11.0825,12.9189
+	c0.6836,0.1055,1.8379,0.1572,3.5303,0.1572c2.0078,0,3.0273-0.3535,3.0273-2.2842v-2.377c0-1.7891-1.334-2.0371-2.7568-2.0371
+	c0,0-0.001,0-0.002,0l-1.7871-0.0488c-2.0117-0.0439-3.4883-0.7627-4.3896-2.1367c-0.9697-1.4805-1.4619-3.1738-1.4619-5.0352
+	V80.3975h10.0928c1.3076,0,2.2852-1.3628,2.2852-2.5815v-1.9312c0-1.3999-0.8359-2.2354-2.2354-2.2354h-10.1426V60.6861
+	c0-1.4619-0.7969-2.4829-1.9375-2.4829c-0.1865,0-0.4121,0-0.6392,0.0884l-2.6489,0.6865
+	c-1.2109,0.3682-2.0171,0.9263-2.0171,2.4507v12.2207h-7.5669c-1.4185,0-2.335,0.897-2.335,2.2852v1.8813
+	C239.5606,79.2393,240.6079,80.3975,241.8955,80.3975z"/>
+<path style="fill:#181139;" d="M379.1182,106.2691c-4.0488-2.9219-8.8545-5.0293-14.291-6.2646
+	c-6.5049-1.3975-13.4473-5.2129-13.3203-10.3066c0-7.5225,6.6367-10.1914,12.3203-10.1914c5.3574,0,10.2207,3.002,13.001,8.0146
+	c0.6729,1.2861,1.4785,1.9375,2.3955,1.9375c0.3311,0,0.7061-0.1113,0.9922-0.2832l2.2021-1.1523
+	c0.5947-0.3408,0.9229-0.9414,0.9229-1.6924c0-0.5205-0.0908-0.9541-0.2617-1.292c-3.6367-8.2466-10.0967-12.4282-19.2021-12.4282
+	c-11.7305,0-19.6123,6.9263-19.6123,17.2349c0,4.3125,1.8438,7.9746,5.4756,10.8809c3.4482,2.7979,7.9121,4.8623,13.2705,6.1377
+	c4.5859,1.085,8.3193,2.5654,11.0977,4.4023c1.4159,0.9354,2.4412,2.0535,3.106,3.3672c0.6053,1.1962,0.9135,2.5535,0.9135,4.1005
+	c0.0742,2.3857-0.79,4.5176-2.5684,6.3389c-3.1445,3.2178-8.4053,4.6689-12.0205,4.6689c-0.0361,0-0.0723,0-0.1074,0
+	c-3.4268,0-6.4893-0.8438-9.1035-2.5068c-2.5918-1.6484-4.2363-3.8076-5.0293-6.6064c-0.3203-1.0996-0.751-2.1738-2.1553-2.1738
+	c-0.0742,0-0.2109,0.0146-0.4062,0.0449c-0.1133,0.0166-0.2559,0.0381-0.5088,0.0742l-1.8818,0.4463l-0.1045,0.0332
+	c-1.0244,0.4082-1.6113,1.1846-1.6113,2.1309c0,0.2285,0.0625,0.6592,0.2178,1.1094c1.9707,8.5801,10.2432,14.3447,20.5732,14.3447
+	c0.125,0.002,0.249,0.002,0.374,0.002c6.5947,0,12.6748-2.3193,16.7275-6.3945c3.1895-3.208,4.8311-7.2363,4.748-11.6357
+	c0-2.8187-0.6185-5.3109-1.8062-7.481C382.4437,109.2624,381.0062,107.631,379.1182,106.2691z"/>
+<path style="fill:#EF3939;" d="M348.9043,45.7325c0-6.3157-3.2826-11.8699-8.2238-15.0756
+	c-2.811-1.8237-6.1537-2.8947-9.7469-2.8947c-9.9092,0-17.9707,8.0615-17.9707,17.9702c0,4.7659,1.8775,9.0925,4.9157,12.3123
+	c-3.6619,4.3709-6.6334,9.3336-8.7663,14.7186c-1.5873-0.2422-3.2123-0.3683-4.8662-0.3683
+	c-17.7158,0-32.1289,14.4131-32.1289,32.1289c0,14.6854,9.9077,27.0922,23.3869,30.9101
+	c-6.7762,17.3461-23.6572,29.6719-43.3742,29.6719c-16.8195,0-31.583-8.9662-39.7656-22.369
+	c-2.4778,0.5446-5.0429,0.8519-7.6721,0.9023c9.0226,16.99,26.8969,28.5917,47.4377,28.5917
+	c23.2646,0,43.1121-14.8788,50.5461-35.6179c0.5204,0.0251,1.0435,0.0398,1.5701,0.0398c17.7158,0,32.1289-14.4131,32.1289-32.1289
+	c0-13.557-8.4446-25.1712-20.3465-29.8811c1.9001-4.5678,4.5115-8.7646,7.6888-12.4641c0.9996,0.4404,2.0479,0.785,3.1324,1.0384
+	c1.3144,0.3071,2.6773,0.486,4.0839,0.486C340.8428,63.7032,348.9043,55.6416,348.9043,45.7325z M304.2461,129.5279
+	c-13.7871,0-25.0039-11.2168-25.0039-25.0039s11.2168-25.0039,25.0039-25.0039S329.25,90.7369,329.25,104.524
+	S318.0332,129.5279,304.2461,129.5279z M330.9336,34.8872c0.645,0,1.2737,0.0671,1.8881,0.1755
+	c5.0818,0.8974,8.9576,5.3347,8.9576,10.6697c0,5.9805-4.8652,10.8457-10.8457,10.8457s-10.8457-4.8652-10.8457-10.8457
+	c0-1.3967,0.2746-2.7282,0.7576-3.9555C322.4306,37.7496,326.35,34.8872,330.9336,34.8872z"/>
+</svg>

docs/logos/Leptos_logo_Solid_Black.svg

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 437.4294 209.6185" style="enable-background:new 0 0 437.4294 209.6185;" xml:space="preserve">
+<path d="M95.1109,128.1089H58.6797V65.6861c0-1.5234-0.8169-2.4331-2.1855-2.4331h-3.1187c-1.3159,0-2.2349,1.0005-2.2349,2.4331
+	v67.4297c0,1.4521,0.8145,2.2852,2.2349,2.2852h41.7353c1.4844,0,2.4819-0.9375,2.4819-2.333v-2.7744
+	C97.5928,128.9253,96.6651,128.1089,95.1109,128.1089z"/>
+<path d="M146.4561,77.1739c-4.8252-3.001-10.3037-4.5249-16.2837-4.5288c-0.0068,0-0.0137,0-0.0205,0
+	c-5.7349,0-11.1377,1.4639-16.0566,4.3511c-4.916,2.8853-8.8721,6.8364-11.7593,11.7456
+	c-2.8975,4.9248-4.3687,10.332-4.3721,16.0713c-0.0034,5.7188,1.4966,11.0654,4.4565,15.8887
+	c2.9893,4.9209,6.8789,8.7334,11.8887,11.6514c4.8657,2.8633,10.2397,4.3174,15.9717,4.3203c0.0073,0,0.0146,0,0.022,0
+	c8.123,0,14.7441-2.5869,21.4683-8.3906c0.5493-0.4805,0.8516-1.1201,0.8516-1.8008c0.001-0.6074-0.1743-1.1035-0.5205-1.4756
+	l-1.3569-1.8428l-0.0732-0.0859c-0.2637-0.2637-0.6929-0.6152-1.3716-0.6152c-0.6421,0-1.2549,0.2217-1.7124,0.6143
+	c-1.9346,1.585-3.5459,2.8008-4.7969,3.6182c-1.7979,1.208-5.8218,3.2314-12.5986,3.2314c-0.0073,0-0.0142,0-0.021,0
+	c-0.1357,0.0029-0.269,0.0039-0.4043,0.0039c-12.2642,0-23.4736-10.3262-24.5088-22.4814l53.0127,0.0322c0.0015,0,0.0024,0,0.0034,0
+	c2.2373,0,3.4697-1.1621,3.4712-3.2715c0.0034-5.2588-1.3574-10.3945-4.0464-15.2705
+	C155.0015,84.0953,151.2188,80.1363,146.4561,77.1739z M154.6451,100.4341l-49.1157-0.0293
+	c1.9834-11.6631,13.0181-21.2417,24.5034-21.0117c0.1387-0.0024,0.2754-0.0039,0.4136-0.0039
+	C143.4629,79.3892,152.4722,90.0162,154.6451,100.4341z"/>
+<path d="M204.0386,136.6382c5.7319,0,11.1069-1.4502,15.9746-4.3115c4.938-2.9014,8.75-6.7129,11.6533-11.6533
+	c2.8608-4.8672,4.311-10.2578,4.311-16.0244c0-5.7324-1.4502-11.1064-4.311-15.9746c-2.9019-4.9385-6.7134-8.75-11.6533-11.6533
+	c-4.8687-2.8618-10.2437-4.3125-15.9746-4.3125c-9.938,0-19.2021,4.7583-24.3516,12.3174v-9.438
+	c0-0.5946-0.1465-1.0788-0.411-1.4511c-0.3815-0.5369-1.0157-0.834-1.8727-0.834h-2.6738c-1.4521,0-2.2852,0.833-2.2852,2.2852
+	v5.6964v46.4791v23.9676c0,1.2568,0.7808,2.0371,2.0371,2.0371h3.3667c0.9209,0,1.6421-0.6992,1.6421-1.5908v-17.098v-10.984
+	C185.0884,131.8892,194.2749,136.6382,204.0386,136.6382z M186.6358,122.5591c-4.9346-4.9346-7.6831-11.4932-7.542-18.0254
+	c-0.1367-6.3506,2.5439-12.751,7.3545-17.5605c4.8521-4.8521,11.3037-7.5547,17.7383-7.417c4.3691,0,8.4863,1.1465,12.2314,3.4043
+	c3.7344,2.2979,6.7456,5.4053,8.9492,9.2354c2.1699,3.9072,3.2695,8.0967,3.2695,12.4697
+	c0.1396,6.4619-2.5967,12.9844-7.5083,17.8955c-4.7617,4.7617-11.0469,7.3857-17.2544,7.2803
+	C197.6856,129.9712,191.396,127.3208,186.6358,122.5591z"/>
+<path d="M241.8955,80.3975h7.5669v42.0259c0,6.8174,4.5674,12.1309,11.0825,12.9189c0.6836,0.1055,1.8379,0.1572,3.5303,0.1572
+	c2.0078,0,3.0273-0.3535,3.0273-2.2842v-2.377c0-1.7891-1.334-2.0371-2.7568-2.0371c0,0-0.001,0-0.002,0l-1.7871-0.0488
+	c-2.0117-0.0439-3.4883-0.7627-4.3896-2.1367c-0.9697-1.4805-1.4619-3.1738-1.4619-5.0352V80.3975h10.0928
+	c1.3076,0,2.2852-1.3628,2.2852-2.5815v-1.9312c0-1.3999-0.8359-2.2354-2.2354-2.2354h-10.1426V60.6861
+	c0-1.4619-0.7969-2.4829-1.9375-2.4829c-0.1865,0-0.4121,0-0.6392,0.0884l-2.6489,0.6865
+	c-1.2109,0.3682-2.0171,0.9263-2.0171,2.4507v12.2207h-7.5669c-1.4185,0-2.335,0.897-2.335,2.2852v1.8813
+	C239.5606,79.2393,240.6079,80.3975,241.8955,80.3975z"/>
+<path d="M379.1182,106.2691c-4.0488-2.9219-8.8545-5.0293-14.291-6.2646c-6.5049-1.3975-13.4473-5.2129-13.3203-10.3066
+	c0-7.5225,6.6367-10.1914,12.3203-10.1914c5.3574,0,10.2207,3.002,13.001,8.0146c0.6729,1.2861,1.4785,1.9375,2.3955,1.9375
+	c0.3311,0,0.7061-0.1113,0.9922-0.2832l2.2021-1.1523c0.5947-0.3408,0.9229-0.9414,0.9229-1.6924
+	c0-0.5205-0.0908-0.9541-0.2617-1.292c-3.6367-8.2466-10.0967-12.4282-19.2021-12.4282c-11.7305,0-19.6123,6.9263-19.6123,17.2349
+	c0,4.3125,1.8438,7.9746,5.4756,10.8809c3.4482,2.7979,7.9121,4.8623,13.2705,6.1377c4.5859,1.085,8.3193,2.5654,11.0977,4.4023
+	c1.4159,0.9354,2.4412,2.0535,3.106,3.3672c0.6053,1.1962,0.9135,2.5535,0.9135,4.1005c0.0742,2.3857-0.79,4.5176-2.5684,6.3389
+	c-3.1445,3.2178-8.4053,4.6689-12.0205,4.6689c-0.0361,0-0.0723,0-0.1074,0c-3.4268,0-6.4893-0.8438-9.1035-2.5068
+	c-2.5918-1.6484-4.2363-3.8076-5.0293-6.6064c-0.3203-1.0996-0.751-2.1738-2.1553-2.1738c-0.0742,0-0.2109,0.0146-0.4062,0.0449
+	c-0.1133,0.0166-0.2559,0.0381-0.5088,0.0742l-1.8818,0.4463l-0.1045,0.0332c-1.0244,0.4082-1.6113,1.1846-1.6113,2.1309
+	c0,0.2285,0.0625,0.6592,0.2178,1.1094c1.9707,8.5801,10.2432,14.3447,20.5732,14.3447c0.125,0.002,0.249,0.002,0.374,0.002
+	c6.5947,0,12.6748-2.3193,16.7275-6.3945c3.1895-3.208,4.8311-7.2363,4.748-11.6357c0-2.8187-0.6185-5.3109-1.8062-7.481
+	C382.4437,109.2624,381.0062,107.631,379.1182,106.2691z"/>
+<path d="M348.9043,45.7325c0-6.3157-3.2826-11.8699-8.2238-15.0756c-2.811-1.8237-6.1537-2.8947-9.7469-2.8947
+	c-9.9092,0-17.9707,8.0615-17.9707,17.9702c0,4.7659,1.8775,9.0925,4.9157,12.3123c-3.6619,4.3709-6.6334,9.3336-8.7663,14.7186
+	c-1.5873-0.2422-3.2123-0.3683-4.8662-0.3683c-17.7158,0-32.1289,14.4131-32.1289,32.1289c0,14.6854,9.9077,27.0922,23.3869,30.9101
+	c-6.7762,17.3461-23.6572,29.6719-43.3742,29.6719c-16.8195,0-31.583-8.9662-39.7656-22.369
+	c-2.4778,0.5446-5.0429,0.8519-7.6721,0.9023c9.0226,16.99,26.8969,28.5917,47.4377,28.5917
+	c23.2646,0,43.1121-14.8788,50.5461-35.6179c0.5204,0.0251,1.0435,0.0398,1.5701,0.0398c17.7158,0,32.1289-14.4131,32.1289-32.1289
+	c0-13.557-8.4446-25.1712-20.3465-29.8811c1.9001-4.5678,4.5115-8.7646,7.6888-12.4641c0.9996,0.4404,2.0479,0.785,3.1324,1.0384
+	c1.3144,0.3071,2.6773,0.486,4.0839,0.486C340.8428,63.7032,348.9043,55.6416,348.9043,45.7325z M304.2461,129.5279
+	c-13.7871,0-25.0039-11.2168-25.0039-25.0039s11.2168-25.0039,25.0039-25.0039S329.25,90.7369,329.25,104.524
+	S318.0332,129.5279,304.2461,129.5279z M330.9336,34.8872c0.645,0,1.2737,0.0671,1.8881,0.1755
+	c5.0818,0.8974,8.9576,5.3347,8.9576,10.6697c0,5.9805-4.8652,10.8457-10.8457,10.8457s-10.8457-4.8652-10.8457-10.8457
+	c0-1.3967,0.2746-2.7282,0.7576-3.9555C322.4306,37.7496,326.35,34.8872,330.9336,34.8872z"/>
+</svg>

docs/logos/Leptos_logo_Solid_White.svg

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 437.4294 209.6185" style="enable-background:new 0 0 437.4294 209.6185;" xml:space="preserve">
+<path style="fill:#FFFFFF;" d="M95.1109,128.1089H58.6797V65.6861c0-1.5234-0.8169-2.4331-2.1855-2.4331h-3.1187
+	c-1.3159,0-2.2349,1.0005-2.2349,2.4331v67.4297c0,1.4521,0.8145,2.2852,2.2349,2.2852h41.7353c1.4844,0,2.4819-0.9375,2.4819-2.333
+	v-2.7744C97.5928,128.9253,96.6651,128.1089,95.1109,128.1089z"/>
+<path style="fill:#FFFFFF;" d="M146.4561,77.1739c-4.8252-3.001-10.3037-4.5249-16.2837-4.5288c-0.0068,0-0.0137,0-0.0205,0
+	c-5.7349,0-11.1377,1.4639-16.0566,4.3511c-4.916,2.8853-8.8721,6.8364-11.7593,11.7456
+	c-2.8975,4.9248-4.3687,10.332-4.3721,16.0713c-0.0034,5.7188,1.4966,11.0654,4.4565,15.8887
+	c2.9893,4.9209,6.8789,8.7334,11.8887,11.6514c4.8657,2.8633,10.2397,4.3174,15.9717,4.3203c0.0073,0,0.0146,0,0.022,0
+	c8.123,0,14.7441-2.5869,21.4683-8.3906c0.5493-0.4805,0.8516-1.1201,0.8516-1.8008c0.001-0.6074-0.1743-1.1035-0.5205-1.4756
+	l-1.3569-1.8428l-0.0732-0.0859c-0.2637-0.2637-0.6929-0.6152-1.3716-0.6152c-0.6421,0-1.2549,0.2217-1.7124,0.6143
+	c-1.9346,1.585-3.5459,2.8008-4.7969,3.6182c-1.7979,1.208-5.8218,3.2314-12.5986,3.2314c-0.0073,0-0.0142,0-0.021,0
+	c-0.1357,0.0029-0.269,0.0039-0.4043,0.0039c-12.2642,0-23.4736-10.3262-24.5088-22.4814l53.0127,0.0322c0.0015,0,0.0024,0,0.0034,0
+	c2.2373,0,3.4697-1.1621,3.4712-3.2715c0.0034-5.2588-1.3574-10.3945-4.0464-15.2705
+	C155.0015,84.0953,151.2188,80.1363,146.4561,77.1739z M154.6451,100.4341l-49.1157-0.0293
+	c1.9834-11.6631,13.0181-21.2417,24.5034-21.0117c0.1387-0.0024,0.2754-0.0039,0.4136-0.0039
+	C143.4629,79.3892,152.4722,90.0162,154.6451,100.4341z"/>
+<path style="fill:#FFFFFF;" d="M204.0386,136.6382c5.7319,0,11.1069-1.4502,15.9746-4.3115
+	c4.938-2.9014,8.75-6.7129,11.6533-11.6533c2.8608-4.8672,4.311-10.2578,4.311-16.0244c0-5.7324-1.4502-11.1064-4.311-15.9746
+	c-2.9019-4.9385-6.7134-8.75-11.6533-11.6533c-4.8687-2.8618-10.2437-4.3125-15.9746-4.3125
+	c-9.938,0-19.2021,4.7583-24.3516,12.3174v-9.438c0-0.5946-0.1465-1.0788-0.411-1.4511c-0.3815-0.5369-1.0157-0.834-1.8727-0.834
+	h-2.6738c-1.4521,0-2.2852,0.833-2.2852,2.2852v5.6964v46.4791v23.9676c0,1.2568,0.7808,2.0371,2.0371,2.0371h3.3667
+	c0.9209,0,1.6421-0.6992,1.6421-1.5908v-17.098v-10.984C185.0884,131.8892,194.2749,136.6382,204.0386,136.6382z M186.6358,122.5591
+	c-4.9346-4.9346-7.6831-11.4932-7.542-18.0254c-0.1367-6.3506,2.5439-12.751,7.3545-17.5605
+	c4.8521-4.8521,11.3037-7.5547,17.7383-7.417c4.3691,0,8.4863,1.1465,12.2314,3.4043c3.7344,2.2979,6.7456,5.4053,8.9492,9.2354
+	c2.1699,3.9072,3.2695,8.0967,3.2695,12.4697c0.1396,6.4619-2.5967,12.9844-7.5083,17.8955
+	c-4.7617,4.7617-11.0469,7.3857-17.2544,7.2803C197.6856,129.9712,191.396,127.3208,186.6358,122.5591z"/>
+<path style="fill:#FFFFFF;" d="M241.8955,80.3975h7.5669v42.0259c0,6.8174,4.5674,12.1309,11.0825,12.9189
+	c0.6836,0.1055,1.8379,0.1572,3.5303,0.1572c2.0078,0,3.0273-0.3535,3.0273-2.2842v-2.377c0-1.7891-1.334-2.0371-2.7568-2.0371
+	c0,0-0.001,0-0.002,0l-1.7871-0.0488c-2.0117-0.0439-3.4883-0.7627-4.3896-2.1367c-0.9697-1.4805-1.4619-3.1738-1.4619-5.0352
+	V80.3975h10.0928c1.3076,0,2.2852-1.3628,2.2852-2.5815v-1.9312c0-1.3999-0.8359-2.2354-2.2354-2.2354h-10.1426V60.6861
+	c0-1.4619-0.7969-2.4829-1.9375-2.4829c-0.1865,0-0.4121,0-0.6392,0.0884l-2.6489,0.6865
+	c-1.2109,0.3682-2.0171,0.9263-2.0171,2.4507v12.2207h-7.5669c-1.4185,0-2.335,0.897-2.335,2.2852v1.8813
+	C239.5606,79.2393,240.6079,80.3975,241.8955,80.3975z"/>
+<path style="fill:#FFFFFF;" d="M379.1182,106.2691c-4.0488-2.9219-8.8545-5.0293-14.291-6.2646
+	c-6.5049-1.3975-13.4473-5.2129-13.3203-10.3066c0-7.5225,6.6367-10.1914,12.3203-10.1914c5.3574,0,10.2207,3.002,13.001,8.0146
+	c0.6729,1.2861,1.4785,1.9375,2.3955,1.9375c0.3311,0,0.7061-0.1113,0.9922-0.2832l2.2021-1.1523
+	c0.5947-0.3408,0.9229-0.9414,0.9229-1.6924c0-0.5205-0.0908-0.9541-0.2617-1.292c-3.6367-8.2466-10.0967-12.4282-19.2021-12.4282
+	c-11.7305,0-19.6123,6.9263-19.6123,17.2349c0,4.3125,1.8438,7.9746,5.4756,10.8809c3.4482,2.7979,7.9121,4.8623,13.2705,6.1377
+	c4.5859,1.085,8.3193,2.5654,11.0977,4.4023c1.4159,0.9354,2.4412,2.0535,3.106,3.3672c0.6053,1.1962,0.9135,2.5535,0.9135,4.1005
+	c0.0742,2.3857-0.79,4.5176-2.5684,6.3389c-3.1445,3.2178-8.4053,4.6689-12.0205,4.6689c-0.0361,0-0.0723,0-0.1074,0
+	c-3.4268,0-6.4893-0.8438-9.1035-2.5068c-2.5918-1.6484-4.2363-3.8076-5.0293-6.6064c-0.3203-1.0996-0.751-2.1738-2.1553-2.1738
+	c-0.0742,0-0.2109,0.0146-0.4062,0.0449c-0.1133,0.0166-0.2559,0.0381-0.5088,0.0742l-1.8818,0.4463l-0.1045,0.0332
+	c-1.0244,0.4082-1.6113,1.1846-1.6113,2.1309c0,0.2285,0.0625,0.6592,0.2178,1.1094c1.9707,8.5801,10.2432,14.3447,20.5732,14.3447
+	c0.125,0.002,0.249,0.002,0.374,0.002c6.5947,0,12.6748-2.3193,16.7275-6.3945c3.1895-3.208,4.8311-7.2363,4.748-11.6357
+	c0-2.8187-0.6185-5.3109-1.8062-7.481C382.4437,109.2624,381.0062,107.631,379.1182,106.2691z"/>
+<path style="fill:#FFFFFF;" d="M348.9043,45.7325c0-6.3157-3.2826-11.8699-8.2238-15.0756
+	c-2.811-1.8237-6.1537-2.8947-9.7469-2.8947c-9.9092,0-17.9707,8.0615-17.9707,17.9702c0,4.7659,1.8775,9.0925,4.9157,12.3123
+	c-3.6619,4.3709-6.6334,9.3336-8.7663,14.7186c-1.5873-0.2422-3.2123-0.3683-4.8662-0.3683
+	c-17.7158,0-32.1289,14.4131-32.1289,32.1289c0,14.6854,9.9077,27.0922,23.3869,30.9101
+	c-6.7762,17.3461-23.6572,29.6719-43.3742,29.6719c-16.8195,0-31.583-8.9662-39.7656-22.369
+	c-2.4778,0.5446-5.0429,0.8519-7.6721,0.9023c9.0226,16.99,26.8969,28.5917,47.4377,28.5917
+	c23.2646,0,43.1121-14.8788,50.5461-35.6179c0.5204,0.0251,1.0435,0.0398,1.5701,0.0398c17.7158,0,32.1289-14.4131,32.1289-32.1289
+	c0-13.557-8.4446-25.1712-20.3465-29.8811c1.9001-4.5678,4.5115-8.7646,7.6888-12.4641c0.9996,0.4404,2.0479,0.785,3.1324,1.0384
+	c1.3144,0.3071,2.6773,0.486,4.0839,0.486C340.8428,63.7032,348.9043,55.6416,348.9043,45.7325z M304.2461,129.5279
+	c-13.7871,0-25.0039-11.2168-25.0039-25.0039s11.2168-25.0039,25.0039-25.0039S329.25,90.7369,329.25,104.524
+	S318.0332,129.5279,304.2461,129.5279z M330.9336,34.8872c0.645,0,1.2737,0.0671,1.8881,0.1755
+	c5.0818,0.8974,8.9576,5.3347,8.9576,10.6697c0,5.9805-4.8652,10.8457-10.8457,10.8457s-10.8457-4.8652-10.8457-10.8457
+	c0-1.3967,0.2746-2.7282,0.7576-3.9555C322.4306,37.7496,326.35,34.8872,330.9336,34.8872z"/>
+</svg>

docs/logos/Leptos_logo_abbreviation__circle_RGB.svg

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 115.9988 115.9988" style="enable-background:new 0 0 115.9988 115.9988;" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<path style="fill:#180D38;" d="M29.1281,108.2941c9.5736-4.5548,17.1531-12.6456,21.0335-22.5787
+				c-12.0865-3.4232-20.9707-14.548-20.9707-27.7159c0-15.8849,12.9236-28.8085,28.8085-28.8085
+				c1.4832,0,2.9404,0.113,4.3639,0.3303c1.9125-4.8287,4.5771-9.2786,7.8607-13.1979c-2.7243-2.8871-4.4077-6.7665-4.4077-11.0399
+				c0-1.6191,0.2457-3.1808,0.6921-4.6562C63.7305,0.2186,60.8908,0,57.9995,0C25.9672,0,0,25.9672,0,57.9994
+				C0,79.5165,11.7263,98.2828,29.1281,108.2941z"/>
+			<path style="fill:#EF3939;" d="M81.9297,15.0082c3.6788,0,6.886-2.0536,8.5379-5.0742
+				c-5.3185-3.5997-11.2684-6.3339-17.646-8.0151c-0.3903,1.0504-0.6168,2.1798-0.6168,3.3644
+				C72.2049,10.6458,76.5673,15.0082,81.9297,15.0082z"/>
+			<path style="fill:#180D38;" d="M95.5663,13.828c-2.8537,4.5375-7.8918,7.5688-13.6366,7.5688
+				c-1.2614,0-2.4835-0.1604-3.6622-0.4359c-0.9722-0.2272-1.9121-0.5362-2.8083-0.931c-2.8492,3.3173-5.1907,7.0806-6.8945,11.1766
+				c10.6715,4.2233,18.2432,14.6371,18.2432,26.7928c0,15.8849-12.9235,28.8085-28.8085,28.8085
+				c-0.4718,0-0.9406-0.0131-1.4069-0.0357c-3.7532,10.4704-11.0354,19.2744-20.406,24.9696
+				c6.7355,2.7367,14.0948,4.257,21.8129,4.257c32.0322,0,57.9994-25.9672,57.9994-57.9995
+				C115.9988,40.3018,108.0628,24.4664,95.5663,13.828z"/>
+			<circle style="fill:#EF3939;" cx="57.9994" cy="57.9994" r="22.4198"/>
+		</g>
+		<path style="fill:#FFFFFF;" d="M78.2676,20.961c1.1786,0.2755,2.4008,0.4359,3.6622,0.4359
+			c5.7448,0,10.7829-3.0313,13.6366-7.5688c-1.6275-1.3855-3.3236-2.6925-5.0987-3.894c-1.6519,3.0206-4.8591,5.0742-8.5379,5.0742
+			c-5.3624,0-9.7249-4.3624-9.7249-9.7249c0-1.1846,0.2264-2.3141,0.6168-3.3644c-2.062-0.5436-4.1682-0.9763-6.3133-1.2917
+			c-0.4464,1.4753-0.6921,3.0371-0.6921,4.6562c0,4.2734,1.6834,8.1528,4.4077,11.0399c-3.2836,3.9193-5.9482,8.3692-7.8607,13.1979
+			c-1.4235-0.2172-2.8807-0.3303-4.3639-0.3303c-15.8849,0-28.8085,12.9235-28.8085,28.8085
+			c0,13.168,8.8842,24.2928,20.9707,27.7159c-3.8804,9.9332-11.4599,18.0239-21.0335,22.5787
+			c2.2621,1.3013,4.6175,2.456,7.0584,3.4478c9.3706-5.6952,16.6528-14.4992,20.406-24.9696
+			c0.4663,0.0226,0.9351,0.0357,1.4069,0.0357c15.8849,0,28.8085-12.9236,28.8085-28.8085c0-12.1557-7.5717-22.5695-18.2432-26.7928
+			c1.7038-4.0959,4.0453-7.8593,6.8945-11.1766C76.3555,20.4248,77.2953,20.7338,78.2676,20.961z M80.4193,57.9994
+			c0,12.3623-10.0576,22.4199-22.4198,22.4199c-12.3623,0-22.4199-10.0576-22.4199-22.4199
+			c0-12.3622,10.0576-22.4199,22.4199-22.4199C70.3617,35.5795,80.4193,45.6371,80.4193,57.9994z"/>
+	</g>
+</g>
+</svg>

docs/logos/Leptos_logo_abbreviation__square_RGB.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 115.5026 115.5026" style="enable-background:new 0 0 115.5026 115.5026;" xml:space="preserve">
+<path style="fill:#181139;" d="M115.5026,0h-13.957c0.0002,0.0315,0.0031,0.0623,0.0031,0.0938
+	c0,9.718-7.9059,17.6239-17.6239,17.6239c-1.3796,0-2.7163-0.1754-4.0055-0.4767c-1.0634-0.2485-2.0913-0.5864-3.0715-1.0182
+	c-3.1162,3.6283-5.6772,7.7443-7.5408,12.2242c11.6719,4.6192,19.9532,16.0091,19.9532,29.3043
+	c0,17.374-14.1349,31.5089-31.5089,31.5089c-0.5161,0-1.0288-0.0143-1.5388-0.039c-3.8856,10.8397-11.2302,20.0454-20.6959,26.2814
+	h79.986V0z"/>
+<circle style="fill:#EF3939;" cx="57.7513" cy="57.7513" r="24.5214"/>
+<path style="fill:#181139;" d="M49.1788,88.0652c-13.2195-3.744-22.9364-15.9116-22.9364-30.3139
+	c0-17.374,14.1349-31.5089,31.5089-31.5089c1.6223,0,3.2161,0.1237,4.7729,0.3612c2.0918-5.2813,5.0061-10.1484,8.5975-14.4351
+	c-2.9796-3.1577-4.8209-7.4008-4.8209-12.0747c0-0.0317,0.0046-0.0622,0.0048-0.0938H0v115.5026h18.8623
+	C32.7495,111.6378,43.9877,101.3537,49.1788,88.0652z"/>
+<path style="fill:#EF3939;" d="M83.9248,10.7302c5.8651,0,10.6364-4.7714,10.6364-10.6364c0-0.0316-0.004-0.0623-0.0043-0.0938
+	H73.293c-0.0003,0.0316-0.0046,0.0621-0.0046,0.0938C73.2884,5.9589,78.0598,10.7302,83.9248,10.7302z"/>
+<path style="fill:#FFFFFF;" d="M56.2125,89.2212c0.51,0.0247,1.0228,0.039,1.5388,0.039c17.374,0,31.5089-14.1349,31.5089-31.5089
+	c0-13.2952-8.2814-24.6851-19.9532-29.3043c1.8635-4.4799,4.4246-8.5959,7.5408-12.2242c0.9802,0.4318,2.0082,0.7698,3.0715,1.0182
+	c1.2892,0.3013,2.6259,0.4767,4.0055,0.4767c9.718,0,17.6239-7.9059,17.6239-17.6239c0-0.0315-0.0029-0.0623-0.0031-0.0938h-6.9887
+	c0.0003,0.0316,0.0043,0.0622,0.0043,0.0938c0,5.8651-4.7714,10.6364-10.6364,10.6364S73.2884,5.9589,73.2884,0.0938
+	c0-0.0317,0.0043-0.0622,0.0046-0.0938h-6.9874c-0.0002,0.0316-0.0048,0.0621-0.0048,0.0938c0,4.674,1.8413,8.9171,4.8209,12.0747
+	c-3.5914,4.2867-6.5057,9.1537-8.5975,14.4351c-1.5569-0.2375-3.1507-0.3612-4.7729-0.3612
+	c-17.374,0-31.5089,14.1349-31.5089,31.5089c0,14.4023,9.7169,26.5699,22.9364,30.3139
+	c-5.1912,13.2885-16.4293,23.5726-30.3165,27.4374h16.6543C44.9824,109.2666,52.327,100.0609,56.2125,89.2212z M33.2299,57.7513
+	c0-13.5211,11.0004-24.5214,24.5214-24.5214s24.5214,11.0004,24.5214,24.5214S71.2724,82.2727,57.7513,82.2727
+	S33.2299,71.2723,33.2299,57.7513z"/>
+</svg>

examples/counter-isomorphic/TODO.md

@@ -1,5 +0,0 @@
-- output type can't always be `i32` (parse it in macro and use)
-- need to implement `from_form_data` using `form_urlencoded` and mapping each value to `.from_json()` to allow multiple serde formats (and prevent extra quotes on strings)
-- test with a variety of types
-- `<Form method="POST">` in `leptos_router`
-  - import `leptos_router` and use `<Form/>` in this example

examples/counter-isomorphic/client/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "counter-client"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-console_log = "0.2"
-leptos = { path = "../../../leptos", default-features = false, features = ["hydrate", "serde"] }
-counter-isomorphic = { path = "../counter",  default-features = false, features = ["hydrate"] }
-log = "0.4"
-wasm-bindgen = "0.2"
-console_error_panic_hook = "0.1.7"
-

examples/counter-isomorphic/client/build.sh

@@ -1 +0,0 @@
-wasm-pack build --target=web --release

examples/counter-isomorphic/client/src/lib.rs

@@ -1,14 +0,0 @@
-use counter_isomorphic::*;
-use leptos::*;
-use wasm_bindgen::prelude::wasm_bindgen;
-
-#[wasm_bindgen]
-pub fn main() {
-    console_error_panic_hook::set_once();
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-
-    leptos::hydrate(body().unwrap(), |cx| {
-        view! { cx,  <Counters/> }
-    });
-}

examples/counter-isomorphic/counter/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-name = "counter-isomorphic"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-leptos = { path = "../../../leptos", default-features = false, features = ["serde"] }
-leptos_router = { path = "../../../router", default-features = false }
-broadcaster = "1"
-console_log = "0.2"
-futures = "0.3"
-gloo = { git = "https://github.com/rustwasm/gloo" }
-lazy_static = "1"
-log = "0.4"
-console_error_panic_hook = "0.1.7"
-serde = { version = "1", features = ["derive"] }
-
-[dependencies.web-sys]
-version = "0.3"
-
-[features]
-default = ["csr"]
-csr = ["leptos/csr", "leptos_router/csr"]
-hydrate = ["leptos/hydrate", "leptos_router/hydrate"]
-ssr = ["leptos/ssr", "leptos_router/ssr"]

examples/counter-isomorphic/counter/src/lib.rs

@@ -1,209 +0,0 @@
-use leptos::*;
-
-use std::fmt::Debug;
-
-#[cfg(feature = "ssr")]
-use std::sync::atomic::{AtomicI32, Ordering};
-
-#[cfg(feature = "ssr")]
-use broadcaster::BroadcastChannel;
-
-use serde::{Deserialize, Serialize};
-
-#[cfg(feature = "ssr")]
-pub fn register_server_functions() {
-    GetServerCount::register();
-    AdjustServerCount::register();
-    ClearServerCount::register();
-}
-
-#[cfg(feature = "ssr")]
-static COUNT: AtomicI32 = AtomicI32::new(0);
-
-#[cfg(feature = "ssr")]
-lazy_static::lazy_static! {
-    pub static ref COUNT_CHANNEL: BroadcastChannel<i32> = BroadcastChannel::new();
-}
-
-#[server(GetServerCount)]
-pub async fn get_server_count() -> Result<i32, ServerFnError> {
-    Ok(COUNT.load(Ordering::Relaxed))
-}
-
-#[server(AdjustServerCount)]
-pub async fn adjust_server_count(delta: i32, msg: String) -> Result<i32, ServerFnError> {
-    let new = COUNT.load(Ordering::Relaxed) + delta;
-    COUNT.store(new, Ordering::Relaxed);
-    _ = COUNT_CHANNEL.send(&new).await;
-    println!("message = {:?}", msg);
-    Ok(new)
-}
-
-#[server(ClearServerCount)]
-pub async fn clear_server_count() -> Result<i32, ServerFnError> {
-    COUNT.store(0, Ordering::Relaxed);
-    _ = COUNT_CHANNEL.send(&0).await;
-    Ok(0)
-}
-
-#[component]
-pub fn Counters(cx: Scope) -> Element {
-    view! {
-        cx,
-        <div>
-            <h1>"Server-Side Counters"</h1>
-            <p>"Each of these counters stores its data in the same variable on the server."</p>
-            <p>"The value is shared across connections. Try opening this is another browser tab to see what I mean."</p>
-            <div style="display: flex; justify-content: space-around">
-                <div>
-                    <h2>"Simple Counter"</h2>
-                    <p>"This counter sets the value on the server and automatically reloads the new value."</p>
-                    <Counter/>
-                </div>
-                <div>
-                    <h2>"Form Counter"</h2>
-                    <p>"This counter uses forms to set the value on the server. When progressively enhanced, it should behave identically to the “Simple Counter.”"</p>
-                    <FormCounter/>
-                </div>
-                <div>
-                    <h2>"Multi-User Counter"</h2>
-                    <p>"This one uses server-sent events (SSE) to live-update when other users make changes."</p>
-                    <MultiuserCounter/>
-                </div>
-            </div>
-        </div>
-    }
-}
-
-// This is an example of "single-user" server functions
-// The counter value is loaded from the server, and re-fetches whenever
-// it's invalidated by one of the user's own actions
-// This is the typical pattern for a CRUD app
-#[component]
-pub fn Counter(cx: Scope) -> Element {
-    let dec = create_action(cx, || adjust_server_count(-1, "decing".into()));
-    let inc = create_action(cx, || adjust_server_count(1, "incing".into()));
-    let clear = create_action(cx, clear_server_count);
-    let counter = create_resource(
-        cx,
-        move || (dec.version.get(), inc.version.get(), clear.version.get()),
-        |_| get_server_count(),
-    );
-
-    let value = move || counter.read().map(|count| count.unwrap_or(0)).unwrap_or(0);
-    let error_msg = move || {
-        counter
-            .read()
-            .map(|res| match res {
-                Ok(_) => None,
-                Err(e) => Some(e),
-            })
-            .flatten()
-    };
-
-    view! {
-        cx,
-        <div>
-            <button on:click=move |_| clear.dispatch()>"Clear"</button>
-            <button on:click=move |_| dec.dispatch()>"-1"</button>
-            <span>"Value: " {move || value().to_string()} "!"</span>
-            <button on:click=move |_| inc.dispatch()>"+1"</button>
-        </div>
-    }
-}
-
-// This is the <Form/> counter
-// It uses the same invalidation pattern as the plain counter,
-// but uses HTML forms to submit the actions
-#[component]
-pub fn FormCounter(cx: Scope) -> Element {
-    let counter = create_resource(
-        cx,
-        move || (),
-        |_| {
-            log::debug!("FormCounter running fetcher");
-
-            get_server_count()
-        },
-    );
-    let value = move || {
-        log::debug!("FormCounter looking for value");
-        counter
-            .read()
-            .map(|n| n.ok())
-            .flatten()
-            .map(|n| n)
-            .unwrap_or(0)
-    };
-
-    view! {
-        cx,
-        <div>
-            // calling a server function is the same as POSTing to its API URL
-            // so we can just do that with a form and button
-            <form method="POST" action=ClearServerCount::url()>
-                <input type="submit" value="Clear"/>
-            </form>
-            // We can submit named arguments to the server functions
-            // by including them as input values with the same name
-            <form method="POST" action=AdjustServerCount::url()>
-                <input type="hidden" name="delta" value="-1"/>
-                <input type="hidden" name="msg" value="\"form value down\""/>
-                <input type="submit" value="-1"/>
-            </form>
-            <span>"Value: " {move || value().to_string()} "!"</span>
-            <form method="POST" action=AdjustServerCount::url()>
-                <input type="hidden" name="delta" value="1"/>
-                <input type="hidden" name="msg" value="\"form value up\""/>
-                <input type="submit" value="+1"/>
-            </form>
-        </div>
-    }
-}
-
-// This is a kind of "multi-user" counter
-// It relies on a stream of server-sent events (SSE) for the counter's value
-// Whenever another user updates the value, it will update here
-// This is the primitive pattern for live chat, collaborative editing, etc.
-#[component]
-pub fn MultiuserCounter(cx: Scope) -> Element {
-    let dec = create_action(cx, || adjust_server_count(-1, "dec dec goose".into()));
-    let inc = create_action(cx, || adjust_server_count(1, "inc inc moose".into()));
-    let clear = create_action(cx, clear_server_count);
-
-    #[cfg(not(feature = "ssr"))]
-    let multiplayer_value = {
-        use futures::StreamExt;
-
-        let mut source = gloo::net::eventsource::futures::EventSource::new("/api/events")
-            .expect_throw("couldn't connect to SSE stream");
-        let s = create_signal_from_stream(
-            cx,
-            source.subscribe("message").unwrap().map(|value| {
-                value
-                    .expect_throw("no message event")
-                    .1
-                    .data()
-                    .as_string()
-                    .expect_throw("expected string value")
-            }),
-        );
-
-        on_cleanup(cx, move || source.close());
-        s
-    };
-
-    #[cfg(feature = "ssr")]
-    let multiplayer_value =
-        create_signal_from_stream(cx, futures::stream::once(Box::pin(async { 0.to_string() })));
-
-    view! {
-        cx,
-        <div>
-            <button on:click=move |_| clear.dispatch()>"Clear"</button>
-            <button on:click=move |_| dec.dispatch()>"-1"</button>
-            <span>"Multiplayer Value: " {move || multiplayer_value().unwrap_or_default().to_string()}</span>
-            <button on:click=move |_| inc.dispatch()>"+1"</button>
-        </div>
-    }
-}

examples/counter-isomorphic/counter/src/main.rs

@@ -1,8 +0,0 @@
-pub use counter_isomorphic::*;
-use leptos::*;
-
-pub fn main() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(|cx| view! { cx, <Counter/> });
-}

examples/counter-isomorphic/server/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "counter-server"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-actix-files = "0.6"
-actix-web = { version = "4" }
-futures = "0.3"
-leptos = { path = "../../../leptos", default-features = false, features = ["ssr", "serde"] }
-counter-isomorphic = { path = "../counter", default-features = false, features = ["ssr"] }
-lazy_static = "1"

examples/counter-isomorphic/server/src/main.rs

@@ -1,99 +0,0 @@
-use actix_files::Files;
-use actix_web::*;
-use counter_isomorphic::*;
-use leptos::*;
-
-#[get("/")]
-async fn render() -> impl Responder {
-    HttpResponse::Ok().content_type("text/html").body(format!(
-        r#"<!DOCTYPE html>
-        <html lang="en">
-            <head>
-                <meta charset="utf-8"/>
-                <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                <title>Isomorphic Counter</title>
-            </head>
-            <body>
-                {}
-            </body>
-            <script type="module">import init, {{ main }} from './pkg/counter_client.js'; init().then(main);</script>
-        </html>"#,
-        run_scope({
-            |cx| {
-                view! { cx, <Counters/>}
-            }
-        })
-    ))
-}
-
-#[post("{tail:.*}")]
-async fn handle_server_fns(
-    req: HttpRequest,
-    params: web::Path<String>,
-    body: web::Bytes,
-) -> impl Responder {
-    let path = params.into_inner();
-    let accept_header = req
-        .headers()
-        .get("Accept")
-        .and_then(|value| value.to_str().ok());
-
-    if let Some(server_fn) = server_fn_by_path(path.as_str()) {
-        let body: &[u8] = &body;
-        match server_fn(&body).await {
-            Ok(serialized) => {
-                // if this is Accept: application/json then send a serialized JSON response
-                if let Some("application/json") = accept_header {
-                    HttpResponse::Ok().body(serialized)
-                }
-                // otherwise, it's probably a <form> submit or something: redirect back to the referrer
-                else {
-                    HttpResponse::SeeOther()
-                        .insert_header(("Location", "/"))
-                        .content_type("application/json")
-                        .body(serialized)
-                }
-            }
-            Err(e) => {
-                eprintln!("server function error: {e:#?}");
-                HttpResponse::InternalServerError().body(e.to_string())
-            }
-        }
-    } else {
-        HttpResponse::BadRequest().body(format!("Could not find a server function at that route."))
-    }
-}
-
-#[get("/api/events")]
-async fn counter_events() -> impl Responder {
-    use futures::StreamExt;
-
-    let stream =
-        futures::stream::once(async { counter_isomorphic::get_server_count().await.unwrap_or(0) })
-            .chain(COUNT_CHANNEL.clone())
-            .map(|value| {
-                Ok(web::Bytes::from(format!(
-                    "event: message\ndata: {value}\n\n"
-                ))) as Result<web::Bytes>
-            });
-    HttpResponse::Ok()
-        .insert_header(("Content-Type", "text/event-stream"))
-        .streaming(stream)
-}
-
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    counter_isomorphic::register_server_functions();
-
-    HttpServer::new(|| {
-        App::new()
-            .service(render)
-            .service(Files::new("/pkg", "../client/pkg"))
-            .service(counter_events)
-            .service(handle_server_fns)
-        //.wrap(middleware::Compress::default())
-    })
-    .bind(("127.0.0.1", 8081))?
-    .run()
-    .await
-}

examples/counter/Makefile.toml

@@ -0,0 +1,4 @@
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"

examples/counter/README.md

@@ -0,0 +1,5 @@
+# Leptos Counter Example
+
+This example creates a simple counter in a client side rendered app with Rust and WASM!
+
+To run it, just issue the `trunk serve --open` command in the example root. This will build the app, run it, and open a new browser to serve it.

examples/counter/index.html

@@ -2,6 +2,7 @@
 <html>
 	<head>
 		<link data-trunk rel="rust" data-wasm-opt="z"/>
+		<link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico"/>
 	</head>
 	<body></body>
 </html>

examples/counter/src/lib.rs

@@ -1,14 +1,24 @@
 use leptos::*;
 
-pub fn simple_counter(cx: Scope) -> web_sys::Element {
-    let (value, set_value) = create_signal(cx, 0);
+/// A simple counter component.
+/// 
+/// You can use doc comments like this to document your component.
+#[component]
+pub fn SimpleCounter(
+    cx: Scope,
+    /// The starting value for the counter
+    initial_value: i32,
+    /// The change that should be applied each time the button is clicked.
+    step: i32
+) -> impl IntoView {
+    let (value, set_value) = create_signal(cx, initial_value);
 
     view! { cx,
         <div>
             <button on:click=move |_| set_value(0)>"Clear"</button>
-            <button on:click=move |_| set_value.update(|value| *value -= 1)>"-1"</button>
+            <button on:click=move |_| set_value.update(|value| *value -= step)>"-1"</button>
             <span>"Value: " {move || value().to_string()} "!"</span>
-            <button on:click=move |_| set_value.update(|value| *value += 1)>"+1"</button>
+            <button on:click=move |_| set_value.update(|value| *value += step)>"+1"</button>
         </div>
     }
 }

examples/counter/src/main.rs

@@ -1,8 +1,13 @@
-use counter::simple_counter;
+use counter::*;
 use leptos::*;
 
 pub fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
-    mount_to_body(simple_counter)
+    mount_to_body(|cx| view! { cx,
+        <SimpleCounter
+            initial_value=0
+            step=1
+        />
+    })
 }

examples/counter/tests/mod.rs

@@ -3,18 +3,24 @@ use wasm_bindgen_test::*;
 wasm_bindgen_test_configure!(run_in_browser);
 use leptos::*;
 use web_sys::HtmlElement;
+use counter::*;
 
 #[wasm_bindgen_test]
 fn inc() {
-    mount_to_body(counter::simple_counter);
+    mount_to_body(|cx| view! { cx, <SimpleCounter initial_value=0 step=1/> });
 
     let document = leptos::document();
     let div = document.query_selector("div").unwrap().unwrap();
-    let dec = div
+    let clear = div
         .first_child()
         .unwrap()
         .dyn_into::<HtmlElement>()
         .unwrap();
+    let dec = clear
+        .next_sibling()
+        .unwrap()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
     let text = dec
         .next_sibling()
         .unwrap()
@@ -29,12 +35,16 @@ fn inc() {
     inc.click();
     inc.click();
 
-    assert_eq!(text.text_content(), Some("2".to_string()));
+    assert_eq!(text.text_content(), Some("Value: 2!".to_string()));
 
     dec.click();
     dec.click();
     dec.click();
     dec.click();
 
-    assert_eq!(text.text_content(), Some("-2".to_string()));
+    assert_eq!(text.text_content(), Some("Value: -2!".to_string()));
+
+    clear.click();
+
+    assert_eq!(text.text_content(), Some("Value: 0!".to_string()));
 }

examples/counter_isomorphic/.gitignore

@@ -0,0 +1 @@
+.leptos.kdl

examples/counter_isomorphic/Cargo.toml

@@ -0,0 +1,88 @@
+[package]
+name = "counter_isomorphic"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", optional = true, features = ["openssl", "macros"] }
+broadcaster = "1"
+console_log = "0.2"
+console_error_panic_hook = "0.1"
+serde = { version = "1", features = ["derive"] }
+futures = "0.3"
+cfg-if = "1"
+lazy_static = "1"
+leptos = { path = "../../leptos", default-features = false, features = [
+	"serde",
+] }
+leptos_actix = { path = "../../integrations/actix", optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
+log = "0.4"
+simple_logger = "4.0.0"
+gloo-net = { git = "https://github.com/rustwasm/gloo" }
+
+[features]
+default = []
+hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
+ssr = [
+	"dep:actix-files",
+	"dep:actix-web",
+	"leptos/ssr",
+	"leptos_actix",
+	"leptos_meta/ssr",
+	"leptos_router/ssr",
+]
+stable = ["leptos/stable", "leptos_router/stable"]
+
+[package.metadata.cargo-all-features]
+denylist = ["actix-files", "actix-web", "leptos_actix", "stable"]
+skip_feature_sets = [["ssr", "hydrate"]]
+
+[package.metadata.leptos]
+# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name   
+output-name = "counter_isomorphic"
+# The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
+site-root = "target/site"
+# The site-root relative folder where all compiled output (JS, WASM and CSS) is written
+# Defaults to pkg	
+site-pkg-dir = "pkg"
+# [Optional] The source CSS file. If it ends with .sass or .scss then it will be compiled by dart-sass into CSS. The CSS is optimized by Lightning CSS before being written to <site-root>/<site-pkg>/app.css
+# style-file = "src/styles/tailwind.css"
+# [Optional] Files in the asset-dir will be copied to the site-root directory
+assets-dir = "public"
+# The IP and port (ex: 127.0.0.1:3000) where the server serves the content. Use it in your server setup.
+site-address = "127.0.0.1:3000"
+# The port to use for automatic reload monitoring
+reload-port = 3001
+# [Optional] Command to use when running end2end tests. It will run in the end2end dir.
+end2end-cmd = "npx playwright test"
+#  The browserlist query used for optimizing the CSS.
+browserquery = "defaults"
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
+watch = false
+# The environment Leptos will run in, usually either "DEV" or "PROD"
+env = "DEV"
+# The features to use when compiling the bin target
+#
+# Optional. Can be over-ridden with the command line parameter --bin-features
+bin-features = ["ssr"]
+
+# If the --no-default-features flag should be used when compiling the bin target
+#
+# Optional. Defaults to false.
+bin-default-features = false
+
+# The features to use when compiling the lib target
+#
+# Optional. Can be over-ridden with the command line parameter --lib-features
+lib-features = ["hydrate"]
+
+# If the --no-default-features flag should be used when compiling the lib target
+#
+# Optional. Defaults to false.
+lib-default-features = false

examples/counter_isomorphic/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Greg Johnston
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

examples/counter_isomorphic/Makefile.toml

@@ -0,0 +1,4 @@
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"

examples/counter_isomorphic/README.md

@@ -0,0 +1,40 @@
+# Leptos Counter Isomorphic Example
+
+This example demonstrates how to use a function isomorphically, to run a server side function from the browser and receive a result.
+
+## Client Side Rendering
+To run it as a Client Side App, you can issue  `trunk serve --open` in the root. This will build the entire
+app into one CSR bundle. Make sure you have trunk installed with `cargo install trunk`.
+
+## Server Side Rendering with cargo-leptos
+cargo-leptos is now the easiest and most featureful way to build server side rendered apps with hydration. It provides automatic recompilation of client and server code, wasm optimisation, CSS minification, and more! Check out more about it [here](https://github.com/akesson/cargo-leptos)
+
+1. Install cargo-leptos
+```bash
+cargo install --locked cargo-leptos
+``` 
+2. Build the site in watch mode, recompiling on file changes
+```bash
+cargo leptos watch
+```
+3. When ready to deploy, run
+```bash
+cargo leptos build --release
+```
+
+## Server Side Rendering without cargo-leptos
+To run it as a server side app with hydration, you'll need to have wasm-pack installed.
+
+0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"pkg"`. You'll also want to change the path of the `<StyleSheet / >` component in the root component to point towards the CSS file in the root. This tells leptos that the WASM/JS files generated by wasm-pack are available at `./pkg` and that the CSS files are no longer processed by cargo-leptos. Building to alternative folders is not supported at this time.
+1. Install wasm-pack
+```bash
+cargo install wasm-pack
+```
+2. Build the Webassembly used to hydrate the HTML from the server
+```bash
+wasm-pack build --target=web --debug --no-default-features --features=hydrate
+```
+3. Run the server to serve the Webassembly, JS, and HTML 
+```bash
+cargo run --no-default-features --features=ssr
+```

examples/counter_isomorphic/src/counters.rs

@@ -0,0 +1,231 @@
+use leptos::*;
+use leptos_router::*;
+use leptos_meta::*;
+
+#[cfg(feature = "ssr")]
+use std::sync::atomic::{AtomicI32, Ordering};
+
+#[cfg(feature = "ssr")]
+use broadcaster::BroadcastChannel;
+
+#[cfg(feature = "ssr")]
+pub fn register_server_functions() {
+    _ = GetServerCount::register();
+    _ = AdjustServerCount::register();
+    _ = ClearServerCount::register();
+}
+
+#[cfg(feature = "ssr")]
+static COUNT: AtomicI32 = AtomicI32::new(0);
+
+#[cfg(feature = "ssr")]
+lazy_static::lazy_static! {
+    pub static ref COUNT_CHANNEL: BroadcastChannel<i32> = BroadcastChannel::new();
+}
+// "/api" is an optional prefix that allows you to locate server functions wherever you'd like on the server
+#[server(GetServerCount, "/api")]
+pub async fn get_server_count() -> Result<i32, ServerFnError> {
+    Ok(COUNT.load(Ordering::Relaxed))
+}
+
+#[server(AdjustServerCount, "/api")]
+pub async fn adjust_server_count(delta: i32, msg: String) -> Result<i32, ServerFnError> {
+    let new = COUNT.load(Ordering::Relaxed) + delta;
+    COUNT.store(new, Ordering::Relaxed);
+    _ = COUNT_CHANNEL.send(&new).await;
+    println!("message = {:?}", msg);
+    Ok(new)
+}
+
+#[server(ClearServerCount, "/api")]
+pub async fn clear_server_count() -> Result<i32, ServerFnError> {
+    COUNT.store(0, Ordering::Relaxed);
+    _ = COUNT_CHANNEL.send(&0).await;
+    Ok(0)
+}
+#[component]
+pub fn Counters(cx: Scope) -> impl IntoView {
+    provide_meta_context(cx);
+    view! {
+        cx,
+        <Router>
+            <header>
+                <h1>"Server-Side Counters"</h1>
+                <p>"Each of these counters stores its data in the same variable on the server."</p>
+                <p>"The value is shared across connections. Try opening this is another browser tab to see what I mean."</p>
+            </header>
+            <nav>
+                <ul>
+                    <li><A href="">"Simple"</A></li>
+                    <li><A href="form">"Form-Based"</A></li>
+                    <li><A href="multi">"Multi-User"</A></li>
+                </ul>
+            </nav>
+            <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
+            <main>
+                <Routes>
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <Counter/>
+                    }/>
+                    <Route path="form" view=|cx| view! {
+                        cx,
+                        <FormCounter/>
+                    }/>
+                    <Route path="multi" view=|cx| view! {
+                        cx,
+                        <MultiuserCounter/>
+                    }/>
+                </Routes>
+            </main>
+        </Router>
+    }
+}
+
+// This is an example of "single-user" server functions
+// The counter value is loaded from the server, and re-fetches whenever
+// it's invalidated by one of the user's own actions
+// This is the typical pattern for a CRUD app
+#[component]
+pub fn Counter(cx: Scope) -> impl IntoView {
+    let dec = create_action(cx, |_| adjust_server_count(-1, "decing".into()));
+    let inc = create_action(cx, |_| adjust_server_count(1, "incing".into()));
+    let clear = create_action(cx, |_| clear_server_count());
+    let counter = create_resource(
+        cx,
+        move || (dec.version().get(), inc.version().get(), clear.version().get()),
+        |_| get_server_count(),
+    );
+
+    let value = move || counter.read().map(|count| count.unwrap_or(0)).unwrap_or(0);
+    let error_msg = move || {
+        counter
+            .read()
+            .map(|res| match res {
+                Ok(_) => None,
+                Err(e) => Some(e),
+            })
+            .flatten()
+    };
+
+    view! {
+        cx,
+        <div>
+            <h2>"Simple Counter"</h2>
+            <p>"This counter sets the value on the server and automatically reloads the new value."</p>
+            <div>
+                <button on:click=move |_| clear.dispatch(())>"Clear"</button>
+                <button on:click=move |_| dec.dispatch(())>"-1"</button>
+                <span>"Value: " {move || value().to_string()} "!"</span>
+                <button on:click=move |_| inc.dispatch(())>"+1"</button>
+            </div>
+            {move || error_msg().map(|msg| view! { cx, <p>"Error: " {msg.to_string()}</p>})}
+        </div>
+    }
+}
+
+// This is the <Form/> counter
+// It uses the same invalidation pattern as the plain counter,
+// but uses HTML forms to submit the actions
+#[component]
+pub fn FormCounter(cx: Scope) -> impl IntoView {
+    let adjust = create_server_action::<AdjustServerCount>(cx);
+    let clear = create_server_action::<ClearServerCount>(cx);
+
+    let counter = create_resource(
+        cx,
+        move || (adjust.version().get(), clear.version().get()),
+        |_| {
+            log::debug!("FormCounter running fetcher");
+            get_server_count()
+        },
+    );
+    let value = move || {
+        log::debug!("FormCounter looking for value");
+        counter
+            .read()
+            .map(|n| n.ok())
+            .flatten()
+            .map(|n| n)
+            .unwrap_or(0)
+    };
+
+    view! {
+        cx,
+        <div>
+            <h2>"Form Counter"</h2>
+            <p>"This counter uses forms to set the value on the server. When progressively enhanced, it should behave identically to the “Simple Counter.”"</p>
+            <div>
+                // calling a server function is the same as POSTing to its API URL
+                // so we can just do that with a form and button
+                <ActionForm action=clear>
+                    <input type="submit" value="Clear"/>
+                </ActionForm>
+                // We can submit named arguments to the server functions
+                // by including them as input values with the same name
+                <ActionForm action=adjust>
+                    <input type="hidden" name="delta" value="-1"/>
+                    <input type="hidden" name="msg" value="form value down"/>
+                    <input type="submit" value="-1"/>
+                </ActionForm>
+                <span>"Value: " {move || value().to_string()} "!"</span>
+                <ActionForm action=adjust>
+                    <input type="hidden" name="delta" value="1"/>
+                    <input type="hidden" name="msg" value="form value up"/>
+                    <input type="submit" value="+1"/>
+                </ActionForm>
+            </div>
+        </div>
+    }
+}
+
+// This is a kind of "multi-user" counter
+// It relies on a stream of server-sent events (SSE) for the counter's value
+// Whenever another user updates the value, it will update here
+// This is the primitive pattern for live chat, collaborative editing, etc.
+#[component]
+pub fn MultiuserCounter(cx: Scope) -> impl IntoView {
+    let dec = create_action(cx, |_| adjust_server_count(-1, "dec dec goose".into()));
+    let inc = create_action(cx, |_| adjust_server_count(1, "inc inc moose".into()));
+    let clear = create_action(cx, |_| clear_server_count());
+
+    #[cfg(not(feature = "ssr"))]
+    let multiplayer_value = {
+        use futures::StreamExt;
+
+        let mut source = gloo_net::eventsource::futures::EventSource::new("/api/events")
+            .expect_throw("couldn't connect to SSE stream");
+        let s = create_signal_from_stream(
+            cx,
+            source.subscribe("message").unwrap().map(|value| {
+                value
+                    .expect_throw("no message event")
+                    .1
+                    .data()
+                    .as_string()
+                    .expect_throw("expected string value")
+            }),
+        );
+
+        on_cleanup(cx, move || source.close());
+        s
+    };
+
+    #[cfg(feature = "ssr")]
+    let (multiplayer_value, _) =
+        create_signal(cx, None::<i32>);
+
+    view! {
+        cx,
+        <div>
+            <h2>"Multi-User Counter"</h2>
+            <p>"This one uses server-sent events (SSE) to live-update when other users make changes."</p>
+            <div>
+                <button on:click=move |_| clear.dispatch(())>"Clear"</button>
+                <button on:click=move |_| dec.dispatch(())>"-1"</button>
+                <span>"Multiplayer Value: " {move || multiplayer_value.get().unwrap_or_default().to_string()}</span>
+                <button on:click=move |_| inc.dispatch(())>"+1"</button>
+            </div>
+        </div>
+    }
+}

examples/counter_isomorphic/src/lib.rs

@@ -0,0 +1,22 @@
+use cfg_if::cfg_if;
+use leptos::*;
+pub mod counters;
+
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use wasm_bindgen::prelude::wasm_bindgen;
+        use crate::counters::*;
+
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            console_error_panic_hook::set_once();
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+
+            mount_to_body(|cx| {
+                view! { cx,  <Counters/> }
+            });
+        }
+    }
+}

examples/counter_isomorphic/src/main.rs

@@ -0,0 +1,67 @@
+use cfg_if::cfg_if;
+use leptos::*;
+mod counters;
+
+// boilerplate to run in different modes
+cfg_if! {
+    // server-only stuff
+    if #[cfg(feature = "ssr")] {
+        use actix_files::{Files};
+        use actix_web::*;
+        use crate::counters::*;
+        use leptos_actix::{generate_route_list, LeptosRoutes};
+
+        #[get("/api/events")]
+        async fn counter_events() -> impl Responder {
+            use futures::StreamExt;
+
+            let stream =
+                futures::stream::once(async { crate::counters::get_server_count().await.unwrap_or(0) })
+                    .chain(COUNT_CHANNEL.clone())
+                    .map(|value| {
+                        Ok(web::Bytes::from(format!(
+                            "event: message\ndata: {value}\n\n"
+                        ))) as Result<web::Bytes>
+                    });
+            HttpResponse::Ok()
+                .insert_header(("Content-Type", "text/event-stream"))
+                .streaming(stream)
+        }
+
+        #[actix_web::main]
+        async fn main() -> std::io::Result<()> {
+
+            crate::counters::register_server_functions();
+
+            let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
+            let addr = conf.leptos_options.site_address.clone();
+            let routes = generate_route_list(|cx| view! { cx, <Counters/> });
+
+            HttpServer::new(move || {
+                let leptos_options = &conf.leptos_options;
+                let site_root = &leptos_options.site_root;
+
+                App::new()
+                    .service(counter_events)
+                    .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+                    .leptos_routes(leptos_options.to_owned(), routes.to_owned(), |cx| view! { cx, <Counters/> })
+                    .service(Files::new("/", &site_root))
+                    //.wrap(middleware::Compress::default())
+            })
+            .bind(&addr)?
+            .run()
+            .await
+        }
+        }
+
+    // client-only stuff for Trunk
+    else {
+        use counter_isomorphic::counters::*;
+
+        pub fn main() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            mount_to_body(|cx| view! { cx, <Counter/> });
+        }
+    }
+}

examples/counters-stable/tests/mod.rs

@@ -1,111 +0,0 @@
-use wasm_bindgen_test::*;
-
-wasm_bindgen_test_configure!(run_in_browser);
-use leptos::{wasm_bindgen::JsValue, *};
-use web_sys::HtmlElement;
-
-use counters::{Counters, CountersProps};
-
-#[wasm_bindgen_test]
-fn inc() {
-    mount_to_body(|cx| view! { cx,  <Counters/> });
-
-    let document = leptos::document();
-    let div = document.query_selector("div").unwrap().unwrap();
-    let add_counter = div
-        .first_child()
-        .unwrap()
-        .dyn_into::<HtmlElement>()
-        .unwrap();
-
-    // add 3 counters
-    add_counter.click();
-    add_counter.click();
-    add_counter.click();
-
-    // check HTML
-    assert_eq!(div.inner_html(), "<button>Add Counter</button><button>Add 1000 Counters</button><button>Clear Counters</button><p>Total: <span>0</span> from <span>3</span> counters.</p><ul><li><button>-1</button><input type=\"text\"><span>0</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>0</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>0</span><button>+1</button><button>x</button></li></ul>");
-
-    let counters = div
-        .query_selector("ul")
-        .unwrap()
-        .unwrap()
-        .unchecked_into::<HtmlElement>()
-        .children();
-
-    // click first counter once, second counter twice, etc.
-    // `NodeList` isn't a `Vec` so we iterate over it in this slightly awkward way
-    for idx in 0..counters.length() {
-        let counter = counters.item(idx).unwrap();
-        let inc_button = counter
-            .first_child()
-            .unwrap()
-            .next_sibling()
-            .unwrap()
-            .next_sibling()
-            .unwrap()
-            .next_sibling()
-            .unwrap()
-            .unchecked_into::<HtmlElement>();
-        for _ in 0..=idx {
-            inc_button.click();
-        }
-    }
-
-    assert_eq!(div.inner_html(), "<button>Add Counter</button><button>Add 1000 Counters</button><button>Clear Counters</button><p>Total: <span>6</span> from <span>3</span> counters.</p><ul><li><button>-1</button><input type=\"text\"><span>1</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>2</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>3</span><button>+1</button><button>x</button></li></ul>");
-
-    // remove the first counter
-    counters
-        .item(0)
-        .unwrap()
-        .last_child()
-        .unwrap()
-        .unchecked_into::<HtmlElement>()
-        .click();
-
-    assert_eq!(div.inner_html(), "<button>Add Counter</button><button>Add 1000 Counters</button><button>Clear Counters</button><p>Total: <span>5</span> from <span>2</span> counters.</p><ul><li><button>-1</button><input type=\"text\"><span>2</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>3</span><button>+1</button><button>x</button></li></ul>");
-
-    // decrement all by 1
-    for idx in 0..counters.length() {
-        let counter = counters.item(idx).unwrap();
-        let dec_button = counter
-            .first_child()
-            .unwrap()
-            .unchecked_into::<HtmlElement>();
-        dec_button.click();
-    }
-
-    // we can use RSX in test comparisons!
-    // note that if RSX template creation is bugged, this probably won't catch it
-    // (because the same bug will be reproduced in both sides of the assertion)
-    // so I use HTML tests for most internal testing like this
-    // but in user-land testing, RSX comparanda are cool
-    assert_eq!(
-        div.outer_html(),
-        view! { cx,
-            <div>
-            <button>"Add Counter"</button>
-            <button>"Add 1000 Counters"</button>
-            <button>"Clear Counters"</button>
-            <p>"Total: "<span>"3"</span>" from "<span>"2"</span>" counters."</p>
-            <ul>
-                <li>
-                    <button>"-1"</button>
-                    <input type="text"/>
-                    <span>"1"</span>
-                    <button>"+1"</button>
-                    <button>"x"</button>
-                </li>
-                <li>
-                    <button>"-1"</button>
-                    <input type="text"/>
-                    <span>"2"</span>
-                    <button>"+1"</button>
-                    <button>"x"</button>
-                </li>
-            </ul>
-            </div>
-        }
-        .outer_html()
-    );
-}

examples/counters/Makefile.toml

@@ -0,0 +1,4 @@
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"

examples/counters/src/lib.rs

@@ -1,6 +1,8 @@
 use leptos::*;
 use leptos::{For, ForProps};
 
+const MANY_COUNTERS: usize = 1000;
+
 type CounterHolder = Vec<(usize, (ReadSignal<i32>, WriteSignal<i32>))>;
 
 #[derive(Copy, Clone)]
@@ -9,7 +11,7 @@ struct CounterUpdater {
 }
 
 #[component]
-pub fn Counters(cx: Scope) -> web_sys::Element {
+pub fn Counters(cx: Scope) -> impl IntoView {
     let (next_counter_id, set_next_counter_id) = create_signal(cx, 0);
     let (counters, set_counters) = create_signal::<CounterHolder>(cx, vec![]);
     provide_context(cx, CounterUpdater { set_counters });
@@ -22,12 +24,14 @@ pub fn Counters(cx: Scope) -> web_sys::Element {
     };
 
     let add_many_counters = move |_| {
-        let mut new_counters = vec![];
-        for next_id in 0..1000 {
+        let next_id = next_counter_id();
+        let new_counters = (next_id..next_id + MANY_COUNTERS).map(|id| {
             let signal = create_signal(cx, 0);
-            new_counters.push((next_id, signal));
-        }
-        set_counters.update(move |counters| counters.extend(new_counters.iter()));
+            (id, signal)
+        });
+
+        set_counters.update(move |counters| counters.extend(new_counters));
+        set_next_counter_id.update(|id| *id += MANY_COUNTERS);
     };
 
     let clear_counters = move |_| {
@@ -35,12 +39,12 @@ pub fn Counters(cx: Scope) -> web_sys::Element {
     };
 
     view! { cx,
-        <div>
+        <>
             <button on:click=add_counter>
                 "Add Counter"
             </button>
             <button on:click=add_many_counters>
-                "Add 1000 Counters"
+                {format!("Add {MANY_COUNTERS} Counters")}
             </button>
             <button on:click=clear_counters>
                 "Clear Counters"
@@ -59,16 +63,18 @@ pub fn Counters(cx: Scope) -> web_sys::Element {
                 " counters."
             </p>
             <ul>
-                <For each=counters key=|counter| counter.0>{
-                    |cx, (id, (value, set_value)): &(usize, (ReadSignal<i32>, WriteSignal<i32>))| {
+                <For
+                    each=counters
+                    key=|counter| counter.0
+                    view=move |(id, (value, set_value)): (usize, (ReadSignal<i32>, WriteSignal<i32>))| {
                         view! {
                             cx,
-                            <Counter id=*id value=*value set_value=*set_value/>
+                            <Counter id value set_value/>
                         }
                     }
-                }</For>
+                />
             </ul>
-        </div>
+        </>
     }
 }
 
@@ -78,7 +84,7 @@ fn Counter(
     id: usize,
     value: ReadSignal<i32>,
     set_value: WriteSignal<i32>,
-) -> web_sys::Element {
+) -> impl IntoView {
     let CounterUpdater { set_counters } = use_context(cx).unwrap_throw();
 
     let input = move |ev| set_value(event_target_value(&ev).parse::<i32>().unwrap_or_default());

examples/counters/tests/mod.rs

@@ -1,7 +1,7 @@
 use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
-use leptos::{wasm_bindgen::JsValue, *};
+use leptos::*;
 use web_sys::HtmlElement;
 
 use counters::{Counters, CountersProps};
@@ -75,37 +75,39 @@ fn inc() {
         dec_button.click();
     }
 
-    // we can use RSX in test comparisons!
-    // note that if RSX template creation is bugged, this probably won't catch it
-    // (because the same bug will be reproduced in both sides of the assertion)
-    // so I use HTML tests for most internal testing like this
-    // but in user-land testing, RSX comparanda are cool
-    assert_eq!(
-        div.outer_html(),
-        view! { cx,
-            <div>
-            <button>"Add Counter"</button>
-            <button>"Add 1000 Counters"</button>
-            <button>"Clear Counters"</button>
-            <p>"Total: "<span>"3"</span>" from "<span>"2"</span>" counters."</p>
-            <ul>
-                <li>
-                    <button>"-1"</button>
-                    <input type="text"/>
-                    <span>"1"</span>
-                    <button>"+1"</button>
-                    <button>"x"</button>
-                </li>
-                <li>
-                    <button>"-1"</button>
-                    <input type="text"/>
-                    <span>"2"</span>
-                    <button>"+1"</button>
-                    <button>"x"</button>
-                </li>
-            </ul>
-            </div>
-        }
-        .outer_html()
-    );
+    run_scope(create_runtime(), move |cx| {
+        // we can use RSX in test comparisons!
+        // note that if RSX template creation is bugged, this probably won't catch it
+        // (because the same bug will be reproduced in both sides of the assertion)
+        // so I use HTML tests for most internal testing like this
+        // but in user-land testing, RSX comparanda are cool
+        assert_eq!(
+            div.outer_html(),
+            view! { cx,
+                <div>
+                    <button>"Add Counter"</button>
+                    <button>"Add 1000 Counters"</button>
+                    <button>"Clear Counters"</button>
+                    <p>"Total: "<span>"3"</span>" from "<span>"2"</span>" counters."</p>
+                    <ul>
+                        <li>
+                            <button>"-1"</button>
+                            <input type="text"/>
+                            <span>"1"</span>
+                            <button>"+1"</button>
+                            <button>"x"</button>
+                        </li>
+                        <li>
+                            <button>"-1"</button>
+                            <input type="text"/>
+                            <span>"2"</span>
+                            <button>"+1"</button>
+                            <button>"x"</button>
+                        </li>
+                    </ul>
+                </div>
+            }
+            .outer_html()
+        );
+    });
 }

examples/counters_stable/Makefile.toml

@@ -0,0 +1,4 @@
+[tasks.build]
+command = "cargo"
+args = ["+stable", "build-all-features"]
+install_crate = "cargo-all-features"

examples/counters_stable/src/main.rs

@@ -7,6 +7,8 @@ fn main() {
     mount_to_body(|cx| view! { cx,  <Counters/> })
 }
 
+const MANY_COUNTERS: usize = 1000;
+
 type CounterHolder = Vec<(usize, (ReadSignal<i32>, WriteSignal<i32>))>;
 
 #[derive(Copy, Clone)]
@@ -15,7 +17,7 @@ struct CounterUpdater {
 }
 
 #[component]
-pub fn Counters(cx: Scope) -> web_sys::Element {
+pub fn Counters(cx: Scope) -> impl IntoView {
     let (next_counter_id, set_next_counter_id) = create_signal(cx, 0);
     let (counters, set_counters) = create_signal::<CounterHolder>(cx, vec![]);
     provide_context(cx, CounterUpdater { set_counters });
@@ -28,12 +30,14 @@ pub fn Counters(cx: Scope) -> web_sys::Element {
     };
 
     let add_many_counters = move |_| {
-        let mut new_counters = vec![];
-        for next_id in 0..1000 {
+        let next_id = next_counter_id.get();
+        let new_counters = (next_id..next_id + MANY_COUNTERS).map(|id| {
             let signal = create_signal(cx, 0);
-            new_counters.push((next_id, signal));
-        }
-        set_counters.update(|counters| counters.extend(new_counters.iter()));
+            (id, signal)
+        });
+
+        set_counters.update(move |counters| counters.extend(new_counters));
+        set_next_counter_id.update(|id| *id += MANY_COUNTERS);
     };
 
     let clear_counters = move |_| {
@@ -46,7 +50,7 @@ pub fn Counters(cx: Scope) -> web_sys::Element {
                 "Add Counter"
             </button>
             <button on:click=add_many_counters>
-                "Add 1000 Counters"
+                {format!("Add {MANY_COUNTERS} Counters")}
             </button>
             <button on:click=clear_counters>
                 "Clear Counters"
@@ -65,14 +69,16 @@ pub fn Counters(cx: Scope) -> web_sys::Element {
                 " counters."
             </p>
             <ul>
-                <For each={move || counters.get()} key={|counter| counter.0}>{
-                    |cx, (id, (value, set_value)): &(usize, (ReadSignal<i32>, WriteSignal<i32>))| {
+                <For
+                    each={move || counters.get()}
+                    key={|counter| counter.0}
+                    view=move |(id, (value, set_value))| {
                         view! {
                             cx,
-                            <Counter id=*id value=*value set_value=*set_value/>
+                            <Counter id value set_value/>
                         }
                     }
-                }</For>
+                />
             </ul>
         </div>
     }
@@ -84,14 +90,14 @@ fn Counter(
     id: usize,
     value: ReadSignal<i32>,
     set_value: WriteSignal<i32>,
-) -> web_sys::Element {
+) -> impl IntoView {
     let CounterUpdater { set_counters } = use_context(cx).unwrap_throw();
 
     let input = move |ev| set_value.set(event_target_value(&ev).parse::<i32>().unwrap_or_default());
 
     view! { cx,
         <li>
-            <button on:click={move |_| set_value.update(move |value| *value -= 1)}>"-1"</button>
+            <button on:click=move |_| set_value.update(move |value| *value -= 1)>"-1"</button>
             <input type="text"
                 prop:value={move || value.get().to_string()}
                 on:input=input

examples/fetch/Makefile.toml

@@ -0,0 +1,4 @@
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"

examples/fetch/index.html

@@ -2,6 +2,7 @@
 <html>
 	<head>
 		<link data-trunk rel="rust" data-wasm-opt="z"/>
+		<link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico"/>
 	</head>
 	<style>
 		img {

examples/fetch/src/lib.rs

@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use leptos::*;
 use serde::{Deserialize, Serialize};
 
@@ -29,7 +27,7 @@ async fn fetch_cats(count: u32) -> Result<Vec<String>, ()> {
     }
 }
 
-pub fn fetch_example(cx: Scope) -> web_sys::Element {
+pub fn fetch_example(cx: Scope) -> impl IntoView {
     let (cat_count, set_cat_count) = create_signal::<u32>(cx, 1);
     let cats = create_resource(cx, cat_count, |count| fetch_cats(count));
 
@@ -38,34 +36,32 @@ pub fn fetch_example(cx: Scope) -> web_sys::Element {
             <label>
                 "How many cats would you like?"
                 <input type="number"
-                    value={move || cat_count.get().to_string()}
+                    prop:value={move || cat_count.get().to_string()}
                     on:input=move |ev| {
                         let val = event_target_value(&ev).parse::<u32>().unwrap_or(0);
                         set_cat_count(val);
                     }
                 />
             </label>
-            <div>
-                <Suspense fallback={"Loading (Suspense Fallback)...".to_string()}>
-                    {move || {
-                            cats.read().map(|data| match data {
-                                Err(_) => view! { cx,  <pre>"Error"</pre> },
-                                Ok(cats) => view! { cx, 
-                                    <div>{
-                                        cats.iter()
-                                            .map(|src| {
-                                                view! { cx, 
-                                                    <img src={src}/>
-                                                }
-                                            })
-                                            .collect::<Vec<_>>()
-                                    }</div>
-                                },
-                            })
-                        }
+            <Transition fallback=move || view! { cx, <div>"Loading (Suspense Fallback)..."</div>}>
+                {move || {
+                        cats.read().map(|data| match data {
+                            Err(_) => view! { cx, <pre>"Error"</pre> }.into_view(cx),
+                            Ok(cats) => view! { cx, 
+                                <div>{
+                                    cats.iter()
+                                        .map(|src| {
+                                            view! { cx, 
+                                                <img src={src}/>
+                                            }
+                                        })
+                                        .collect::<Vec<_>>()
+                                }</div>
+                            }.into_view(cx),
+                        })
                     }
-                </Suspense>
-            </div>
+                }
+            </Transition>
         </div>
     }
 }

examples/hackernews/Cargo.toml

@@ -0,0 +1,90 @@
+[package]
+name = "hackernews"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+anyhow = "1"
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", optional = true, features = ["openssl", "macros"] }
+console_log = "0.2"
+console_error_panic_hook = "0.1"
+futures = "0.3"
+cfg-if = "1"
+leptos = { path = "../../leptos", default-features = false, features = ["serde"] }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_actix = { path = "../../integrations/actix", default-features = false, optional = true }
+leptos_router = { path = "../../router", default-features = false }
+log = "0.4"
+simple_logger = "4.0.0"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+gloo-net = { version = "0.2", features = ["http"] }
+reqwest = { version = "0.11", features = ["json"] }
+# openssl = { version = "0.10", features = ["v110"] }
+wasm-bindgen = "0.2"
+web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
+tracing = "0.1"
+
+[features]
+csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
+hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
+ssr = [
+	"dep:actix-files",
+	"dep:actix-web",
+	"dep:leptos_actix",
+	"leptos/ssr",
+	"leptos_meta/ssr",
+	"leptos_router/ssr",
+]
+
+[package.metadata.cargo-all-features]
+denylist = ["actix-files", "actix-web", "leptos_actix"]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
+
+[package.metadata.leptos]
+# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name   
+output-name = "hackernews"	
+# The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
+site-root = "target/site"
+# The site-root relative folder where all compiled output (JS, WASM and CSS) is written
+# Defaults to pkg	
+site-pkg-dir = "pkg" 	
+# [Optional] The source CSS file. If it ends with .sass or .scss then it will be compiled by dart-sass into CSS. The CSS is optimized by Lightning CSS before being written to <site-root>/<site-pkg>/app.css
+style-file = "./style.css"
+# [Optional] Files in the asset-dir will be copied to the site-root directory
+assets-dir = "public"
+# The IP and port (ex: 127.0.0.1:3000) where the server serves the content. Use it in your server setup.
+site-address = "127.0.0.1:3000"	
+# The port to use for automatic reload monitoring
+reload-port = 3001	
+# [Optional] Command to use when running end2end tests. It will run in the end2end dir.
+end2end-cmd = "npx playwright test"
+#  The browserlist query used for optimizing the CSS.
+browserquery = "defaults" 	
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
+watch = false 	
+# The environment Leptos will run in, usually either "DEV" or "PROD"
+env = "DEV"
+# The features to use when compiling the bin target
+#
+# Optional. Can be over-ridden with the command line parameter --bin-features
+bin-features = ["ssr"]
+
+# If the --no-default-features flag should be used when compiling the bin target
+#
+# Optional. Defaults to false.
+bin-default-features = false
+
+# The features to use when compiling the lib target
+#
+# Optional. Can be over-ridden with the command line parameter --lib-features
+lib-features = ["hydrate"]
+
+# If the --no-default-features flag should be used when compiling the lib target
+#
+# Optional. Defaults to false.
+lib-default-features = false

examples/hackernews/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Greg Johnston
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

examples/hackernews/Makefile.toml

@@ -0,0 +1,4 @@
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"

examples/hackernews/README.md

@@ -0,0 +1,40 @@
+# Leptos Hacker News Example
+
+This example creates a basic clone of the Hacker News site. It showcases Leptos' ability to create both a client-side rendered app, and a server side rendered app with hydration, in a single repository
+
+## Client Side Rendering
+To run it as a Client Side App, you can issue  `trunk serve --open` in the root. This will build the entire
+app into one CSR bundle. Make sure you have trunk installed with `cargo install trunk`.
+
+## Server Side Rendering with cargo-leptos
+cargo-leptos is now the easiest and most featureful way to build server side rendered apps with hydration. It provides automatic recompilation of client and server code, wasm optimisation, CSS minification, and more! Check out more about it [here](https://github.com/akesson/cargo-leptos)
+
+1. Install cargo-leptos
+```bash
+cargo install --locked cargo-leptos
+``` 
+2. Build the site in watch mode, recompiling on file changes
+```bash
+cargo leptos watch
+```
+3. When ready to deploy, run
+```bash
+cargo leptos build --release
+```
+
+## Server Side Rendering without cargo-leptos
+To run it as a server side app with hydration, you'll need to have wasm-pack installed.
+
+0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"pkg"`. You'll also want to change the path of the `<StyleSheet / >` component in the root component to point towards the CSS file in the root. This tells leptos that the WASM/JS files generated by wasm-pack are available at `./pkg` and that the CSS files are no longer processed by cargo-leptos. Building to alternative folders is not supported at this time.
+1. Install wasm-pack
+```bash
+cargo install wasm-pack
+```
+2. Build the Webassembly used to hydrate the HTML from the server
+```bash
+wasm-pack build --target=web --debug --no-default-features --features=hydrate
+```
+3. Run the server to serve the Webassembly, JS, and HTML 
+```bash
+cargo run --no-default-features --features=ssr
+```

examples/hackernews/hackernews-app/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "hackernews-app"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow = "1"
-console_log = "0.2"
-leptos = { path = "../../../leptos", default-features = false, features = ["serde"] }
-leptos_meta = { path = "../../../meta", default-features = false }
-leptos_router = { path = "../../../router", default-features = false }
-log = "0.4"
-gloo-net = { version = "0.2", features = ["http"] }
-reqwest = { version = "0.11", features = ["json"], optional = true }
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-console_error_panic_hook = "0.1.7"
-
-
-[features]
-default = ["csr"]
-csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
-hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
-ssr = ["leptos/ssr", "leptos_meta/ssr", "leptos_router/ssr", "dep:reqwest"]

examples/hackernews/hackernews-app/src/lib.rs

@@ -1,38 +0,0 @@
-// This is essentially a port of a Solid Hacker News demo
-// https://github.com/solidjs/solid-hackernews
-
-use leptos::*;
-use leptos_meta::*;
-use leptos_router::*;
-
-mod api;
-mod nav;
-mod stories;
-mod story;
-mod users;
-use nav::*;
-use stories::*;
-use story::*;
-use users::*;
-
-#[component]
-pub fn App(cx: Scope) -> Element {
-    provide_context(cx, MetaContext::default());
-
-    view! {
-        cx,
-        <div>
-            <Stylesheet href="/static/style.css".into()/>
-            <Router>
-                <Nav />
-                <main>
-                    <Routes>
-                        <Route path="users/:id" element=|cx| view! { cx,  <User/> }/>
-                        <Route path="stories/:id" element=|cx| view! { cx,  <Story/> }/>
-                        <Route path="*stories" element=|cx| view! { cx,  <Stories/> }/>
-                    </Routes>
-                </main>
-            </Router>
-        </div>
-    }
-}

examples/hackernews/hackernews-app/src/main.rs

@@ -1,11 +0,0 @@
-use hackernews_app::*;
-use leptos::*;
-
-pub fn main() {
-    console_error_panic_hook::set_once();
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(|cx| {
-        view! { cx, <App/> }
-    });
-}

examples/hackernews/hackernews-app/src/story.rs

@@ -1,103 +0,0 @@
-use crate::api;
-use leptos::*;
-use leptos_router::*;
-
-#[component]
-pub fn Story(cx: Scope) -> Element {
-    let params = use_params_map(cx);
-    let story = create_resource(
-        cx,
-        move || params().get("id").cloned().unwrap_or_default(),
-        move |id| async move { api::fetch_api::<api::Story>(&api::story(&format!("item/{id}"))).await },
-    );
-
-    view! { cx,
-        <div>
-            {move || story.read().map(|story| match story {
-                None => view! { cx,  <div class="item-view">"Error loading this story."</div> },
-                Some(story) => view! { cx,
-                    <div class="item-view">
-                        <div class="item-view-header">
-                        <a href=story.url target="_blank">
-                            <h1>{story.title}</h1>
-                        </a>
-                        <span class="host">
-                            "("{story.domain}")"
-                        </span>
-                        {story.user.map(|user| view! { cx,  <p class="meta">
-                            {story.points}
-                            " points | by "
-                            <A href=format!("/users/{}", user)>{user.clone()}</A>
-                            {format!(" {}", story.time_ago)}
-                        </p>})}
-                        </div>
-                        <div class="item-view-comments">
-                        <p class="item-view-comments-header">
-                            {if story.comments_count.unwrap_or_default() > 0 {
-                                format!("{} comments", story.comments_count.unwrap_or_default())
-                            } else {
-                                "No comments yet.".into()
-                            }}
-                        </p>
-                        <ul class="comment-children">
-                            <For each=move || story.comments.clone().unwrap_or_default() key=|comment| comment.id>
-                                {move |cx, comment: &api::Comment| view! { cx,  <Comment comment=comment.clone() /> }}
-                            </For>
-                        </ul>
-                    </div>
-                </div>
-            }})}
-        </div>
-    }
-}
-
-#[component]
-pub fn Comment(cx: Scope, comment: api::Comment) -> Element {
-    let (open, set_open) = create_signal(cx, true);
-
-    view! { cx,
-        <li class="comment">
-        <div class="by">
-            <A href=format!("/users/{}", comment.user.clone().unwrap_or_default())>{comment.user.clone()}</A>
-            {format!(" {}", comment.time_ago)}
-        </div>
-        <div class="text" inner_html=comment.content></div>
-        {(!comment.comments.is_empty()).then(|| {
-            view! { cx,
-                <div>
-                    <div class="toggle" class:open=open>
-                        <a on:click=move |_| set_open.update(|n| *n = !*n)>
-                            {
-                                let comments_len = comment.comments.len();
-                                move || if open() {
-                                    "[-]".into()
-                                } else {
-                                    format!("[+] {}{} collapsed", comments_len, pluralize(comments_len))
-                                }
-                            }
-                        </a>
-                    </div>
-                    {move || open().then({
-                        let comments = comment.comments.clone();
-                        move || view! { cx,
-                            <ul class="comment-children">
-                                <For each=move || comments.clone() key=|comment| comment.id>
-                                    {|cx, comment: &api::Comment| view! { cx, <Comment comment=comment.clone() /> }}
-                                </For>
-                            </ul>
-                        }
-                    })}
-                </div>
-            }
-        })}
-        </li>
-    }
-}
-
-fn pluralize(n: usize) -> &'static str {
-    if n == 1 {
-        " reply"
-    } else {
-        " replies"
-    }
-}

examples/hackernews/hackernews-app/src/users.rs

@@ -1,39 +0,0 @@
-use crate::api::{self, User};
-use leptos::*;
-use leptos_router::*;
-
-#[component]
-pub fn User(cx: Scope) -> Element {
-    let params = use_params_map(cx);
-    let user = create_resource(
-        cx,
-        move || params().get("id").cloned().unwrap_or_default(),
-        move |id| async move { api::fetch_api::<User>(&api::user(&id)).await },
-    );
-    view! { cx,
-        <div class="user-view">
-            {move || user.read().map(|user| match user {
-                None => view! { cx,  <h1>"User not found."</h1> },
-                Some(user) => view! { cx,
-                    <div>
-                        <h1>"User: " {&user.id}</h1>
-                        <ul class="meta">
-                            <li>
-                                <span class="label">"Created: "</span> {user.created}
-                            </li>
-                            <li>
-                            <span class="label">"Karma: "</span> {user.karma}
-                            </li>
-                            {user.about.as_ref().map(|about| view! { cx,  <li inner_html=about class="about"></li> })}
-                        </ul>
-                        <p class="links">
-                            <a href=format!("https://news.ycombinator.com/submitted?id={}", user.id)>"submissions"</a>
-                            " | "
-                            <a href=format!("https://news.ycombinator.com/threads?id={}", user.id)>"comments"</a>
-                        </p>
-                    </div>
-                }
-            })}
-        </div>
-    }
-}

examples/hackernews/hackernews-client/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "hackernews-client"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-console_log = "0.2"
-console_error_panic_hook = "0.1"
-hackernews-app = { path = "../hackernews-app", default-features = false, features = ["hydrate"] }
-leptos = { path = "../../../leptos", default-features = false, features = ["hydrate", "serde"] }
-log = "0.4"

examples/hackernews/hackernews-client/build.sh

@@ -1 +0,0 @@
-wasm-pack build --target=web --release

examples/hackernews/hackernews-client/src/lib.rs

@@ -1,12 +0,0 @@
-use hackernews_app::*;
-use leptos::*;
-use wasm_bindgen::prelude::wasm_bindgen;
-
-#[wasm_bindgen]
-pub fn main() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    leptos::hydrate(body().unwrap(), move |cx| {
-        view! { cx, <App/> }
-    });
-}

examples/hackernews/hackernews-server/.gitignore

@@ -1,2 +0,0 @@
-key.pem
-cert.pem

examples/hackernews/hackernews-server/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "hackernews-server"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-actix-files = "0.6"
-actix-web = { version = "4", features = ["openssl", "macros"] }
-futures = "0.3"
-leptos = { path = "../../../leptos", default-features = false, features = ["ssr", "serde"] }
-leptos_router = { path = "../../../router", default-features = false, features = ["ssr"] }
-leptos_meta = { path = "../../../meta", default-features = false, features = ["ssr"] }
-log = "0.4"
-hackernews-app = { path = "../hackernews-app", default-features = false, features = ["ssr"] }
-openssl = { version = "0.10", features = ["v110"] }
-simple_logger = "2"
-serde_json = "1.0.85"

examples/hackernews/hackernews-server/src/main.rs

@@ -1,135 +0,0 @@
-use actix_files::{Files, NamedFile};
-use actix_web::*;
-use futures::StreamExt;
-use hackernews_app::*;
-use leptos::*;
-use leptos_meta::*;
-use leptos_router::*;
-use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
-
-#[derive(Copy, Clone, Debug)]
-struct ActixIntegration {
-    path: ReadSignal<String>,
-}
-
-impl History for ActixIntegration {
-    fn location(&self, cx: leptos::Scope) -> ReadSignal<LocationChange> {
-        create_signal(
-            cx,
-            LocationChange {
-                value: self.path.get(),
-                replace: false,
-                scroll: true,
-                state: State(None),
-            },
-        )
-        .0
-    }
-
-    fn navigate(&self, _loc: &LocationChange) {}
-}
-
-#[get("/static/style.css")]
-async fn css() -> impl Responder {
-    NamedFile::open_async("../hackernews-app/style.css").await
-}
-
-// match every path — our router will handle actual dispatch
-#[get("{tail:.*}")]
-async fn render_app(req: HttpRequest) -> impl Responder {
-    let path = req.path();
-
-    let query = req.query_string();
-    let path = if query.is_empty() {
-        "http://leptos".to_string() + path
-    } else {
-        "http://leptos".to_string() + path + "?" + query
-    };
-
-    let app = move |cx| {
-        let integration = ActixIntegration {
-            path: create_signal(cx, path.clone()).0,
-        };
-        provide_context(cx, RouterIntegrationContext(std::rc::Rc::new(integration)));
-
-        view! { cx, <App/> }
-    };
-
-    let accepts_type = req.headers().get("Accept").map(|h| h.to_str());
-    match accepts_type {
-        // if asks for JSON, send the loader function JSON or 404
-        Some(Ok("application/json")) => {
-            let json = loader_to_json(app).await;
-
-            let res = if let Some(json) = json {
-                HttpResponse::Ok()
-                    .content_type("application/json")
-                    .body(json)
-            } else {
-                HttpResponse::NotFound().body(())
-            };
-
-            res
-        }
-        // otherwise, send HTML
-        _ => {
-            let head = r#"<!DOCTYPE html>
-            <html lang="en">
-                <head>
-                    <meta charset="utf-8"/>
-                    <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                    <script type="module">import init, { main } from '/pkg/hackernews_client.js'; init().then(main);</script>"#;
-            let tail = "</body></html>";
-
-            HttpResponse::Ok().content_type("text/html").streaming(
-                futures::stream::once(async { head.to_string() })
-                    .chain(render_to_stream(move |cx| {
-                        let app = app(cx);
-                        let head = use_context::<MetaContext>(cx)
-                            .map(|meta| meta.dehydrate())
-                            .unwrap_or_default();
-                        format!("{head}</head><body>{app}")
-                    }))
-                    .chain(futures::stream::once(async { tail.to_string() }))
-                    .map(|html| Ok(web::Bytes::from(html)) as Result<web::Bytes>),
-            )
-        }
-    }
-}
-
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    let host = std::env::var("HOST").unwrap_or_else(|_| "127.0.0.1".to_string());
-    let port = std::env::var("PORT").unwrap_or_else(|_| "8080".to_string());
-    log::debug!("serving at {host}:{port}");
-
-    simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
-
-    // uncomment these lines (and .bind_openssl() below) to enable HTTPS, which is sometimes
-    // necessary for proper HTTP/2 streaming
-
-    // load TLS keys
-    // to create a self-signed temporary cert for testing:
-    // `openssl req -x509 -newkey rsa:4096 -nodes -keyout key.pem -out cert.pem -days 365 -subj '/CN=localhost'`
-    // let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
-    // builder
-    //     .set_private_key_file("key.pem", SslFiletype::PEM)
-    //     .unwrap();
-    // builder.set_certificate_chain_file("cert.pem").unwrap();
-
-    HttpServer::new(|| {
-        App::new()
-            .service(css)
-            .service(
-                web::scope("/pkg")
-                    .service(Files::new("", "../hackernews-client/pkg"))
-                    .wrap(middleware::Compress::default()),
-            )
-            .service(render_app)
-    })
-    .bind(("127.0.0.1", 8080))?
-    // replace .bind with .bind_openssl to use HTTPS
-    //.bind_openssl(&format!("{}:{}", host, port), builder)?
-    .run()
-    .await
-}

examples/hackernews/src/api.rs

@@ -1,4 +1,4 @@
-use leptos::Serializable;
+use leptos::{Scope, Serializable};
 use serde::{Deserialize, Serialize};
 
 pub fn story(path: &str) -> String {
@@ -10,11 +10,15 @@ pub fn user(path: &str) -> String {
 }
 
 #[cfg(not(feature = "ssr"))]
-pub async fn fetch_api<T>(path: &str) -> Option<T>
+pub async fn fetch_api<T>(cx: Scope, path: &str) -> Option<T>
 where
     T: Serializable,
 {
+    let abort_controller = web_sys::AbortController::new().ok();
+    let abort_signal = abort_controller.as_ref().map(|a| a.signal());
+
     let json = gloo_net::http::Request::get(path)
+        .abort_signal(abort_signal.as_ref())
         .send()
         .await
         .map_err(|e| log::error!("{e}"))
@@ -22,11 +26,19 @@ where
         .text()
         .await
         .ok()?;
+
+    // abort in-flight requests if the Scope is disposed
+    // i.e., if we've navigated away from this page
+    leptos::on_cleanup(cx, move || {
+        if let Some(abort_controller) = abort_controller {
+            abort_controller.abort()
+        }
+    });
     T::from_json(&json).ok()
 }
 
 #[cfg(feature = "ssr")]
-pub async fn fetch_api<T>(path: &str) -> Option<T>
+pub async fn fetch_api<T>(_cx: Scope, path: &str) -> Option<T>
 where
     T: Serializable,
 {

examples/hackernews/src/lib.rs

@@ -0,0 +1,49 @@
+use cfg_if::cfg_if;
+use leptos::{component, view, IntoView, Scope};
+use leptos_meta::*;
+use leptos_router::*;
+mod api;
+mod routes;
+use routes::nav::*;
+use routes::stories::*;
+use routes::story::*;
+use routes::users::*;
+
+#[component]
+pub fn App(cx: Scope) -> impl IntoView {
+    provide_meta_context(cx);
+    view! {
+        cx,
+        <>
+            <Stylesheet id="leptos" href="/pkg/hackernews.css"/>
+            <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
+            <Meta name="description" content="Leptos implementation of a HackerNews demo."/>
+            <Router>
+                <Nav />
+                <main>
+                    <Routes>
+                        <Route path="users/:id" view=|cx| view! { cx,  <User/> }/>
+                        <Route path="stories/:id" view=|cx| view! { cx,  <Story/> }/>
+                        <Route path=":stories?" view=|cx| view! { cx,  <Stories/> }/>
+                    </Routes>
+                </main>
+            </Router>
+        </>
+    }
+}
+
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use wasm_bindgen::prelude::wasm_bindgen;
+
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            leptos::mount_to_body(move |cx| {
+                view! { cx, <App/> }
+            });
+        }
+    }
+}

examples/hackernews/src/main.rs

@@ -0,0 +1,50 @@
+use cfg_if::cfg_if;
+use leptos::*;
+
+// boilerplate to run in different modes
+cfg_if! {
+    // server-only stuff
+    if #[cfg(feature = "ssr")] {
+        use actix_files::{Files};
+        use actix_web::*;
+        use hackernews::{App,AppProps};
+        use leptos_actix::{LeptosRoutes, generate_route_list};
+
+        #[get("/style.css")]
+        async fn css() -> impl Responder {
+            actix_files::NamedFile::open_async("./style.css").await
+        }
+        #[get("/favicon.ico")]
+        async fn favicon() -> impl Responder {
+            actix_files::NamedFile::open_async("./target/site//favicon.ico").await
+        }
+
+        #[actix_web::main]
+        async fn main() -> std::io::Result<()> {
+            let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
+            let addr = conf.leptos_options.site_address.clone();
+            // Generate the list of routes in your Leptos App
+            let routes = generate_route_list(|cx| view! { cx, <App/> });
+
+            HttpServer::new(move || {
+                let leptos_options = &conf.leptos_options;
+                let site_root = &leptos_options.site_root;
+
+                App::new()
+                    .service(css)
+                    .service(favicon)
+                    .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+                    .leptos_routes(leptos_options.to_owned(), routes.to_owned(), |cx| view! { cx, <App/> })
+                    .service(Files::new("/", &site_root))
+                //.wrap(middleware::Compress::default())
+            })
+            .bind(&addr)?
+            .run()
+            .await
+        }
+    } else {
+        fn main() {
+            // no client-side main function
+        }
+    }
+}

examples/hackernews/src/routes.rs

@@ -0,0 +1,4 @@
+pub mod nav;
+pub mod stories;
+pub mod story;
+pub mod users;

examples/hackernews/src/routes/nav.rs

@@ -1,8 +1,8 @@
-use leptos::*;
+use leptos::{component, Scope, IntoView, view};
 use leptos_router::*;
 
 #[component]
-pub fn Nav(cx: Scope) -> Element {
+pub fn Nav(cx: Scope) -> impl IntoView {
     view! { cx,
         <header class="header">
             <nav class="inner">

examples/hackernews/src/routes/stories.rs

@@ -14,7 +14,7 @@ fn category(from: &str) -> &'static str {
 }
 
 #[component]
-pub fn Stories(cx: Scope) -> Element {
+pub fn Stories(cx: Scope) -> impl IntoView {
     let query = use_query_map(cx);
     let params = use_params_map(cx);
     let page = move || {
@@ -32,11 +32,13 @@ pub fn Stories(cx: Scope) -> Element {
         move || (page(), story_type()),
         move |(page, story_type)| async move {
             let path = format!("{}?page={}", category(&story_type), page);
-            api::fetch_api::<Vec<api::Story>>(&api::story(&path)).await
+            api::fetch_api::<Vec<api::Story>>(cx, &api::story(&path)).await
         },
     );
+    let (pending, set_pending) = create_signal(cx, false);
 
-    let hide_more_link = move || stories.read().unwrap_or(None).unwrap_or_default().len() < 28;
+    let hide_more_link =
+        move || pending() || stories.read().unwrap_or(None).unwrap_or_default().len() < 28;
 
     view! {
         cx,
@@ -52,14 +54,14 @@ pub fn Stories(cx: Scope) -> Element {
                             >
                                 "< prev"
                             </a>
-                        }
+                        }.into_any()
                     } else {
                         view! {
                             cx,
                             <span class="page-link disabled" aria-hidden="true">
                                 "< prev"
                             </span>
-                        }
+                        }.into_any()
                     }}
                 </span>
                 <span>"page " {page}</span>
@@ -76,25 +78,30 @@ pub fn Stories(cx: Scope) -> Element {
             </div>
             <main class="news-list">
                 <div>
-                    <Suspense fallback=view! { cx,  <p>"Loading..."</p> }>
+                    <Transition
+                        fallback=move || view! { cx,  <p>"Loading..."</p> }
+                        set_pending=set_pending.into()
+                    >
                         {move || match stories.read() {
                             None => None,
-                            Some(None) => Some(view! { cx,  <p>"Error loading stories."</p> }),
+                            Some(None) => Some(view! { cx,  <p>"Error loading stories."</p> }.into_any()),
                             Some(Some(stories)) => {
                                 Some(view! { cx,
                                     <ul>
-                                        <For each=move || stories.clone() key=|story| story.id>{
-                                            move |cx: Scope, story: &api::Story| {
+                                        <For
+                                            each=move || stories.clone()
+                                            key=|story| story.id
+                                            view=move |story: api::Story| {
                                                 view! { cx,
-                                                    <Story story=story.clone() />
+                                                    <Story story/>
                                                 }
                                             }
-                                        }</For>
+                                        />
                                     </ul>
-                                })
+                                }.into_any())
                             }
                         }}
-                    </Suspense>
+                    </Transition>
                 </div>
             </main>
         </div>
@@ -102,7 +109,7 @@ pub fn Stories(cx: Scope) -> Element {
 }
 
 #[component]
-fn Story(cx: Scope, story: api::Story) -> Element {
+fn Story(cx: Scope, story: api::Story) -> impl IntoView {
     view! { cx,
          <li class="news-item">
             <span class="score">{story.points}</span>
@@ -115,10 +122,10 @@ fn Story(cx: Scope, story: api::Story) -> Element {
                             </a>
                             <span class="host">"("{story.domain}")"</span>
                         </span>
-                    }
+                    }.into_view(cx)
                 } else {
                     let title = story.title.clone();
-                    view! { cx,  <A href=format!("/stories/{}", story.id)>{title.clone()}</A> }
+                    view! { cx,  <A href=format!("/stories/{}", story.id)>{title.clone()}</A> }.into_view(cx)
                 }}
             </span>
             <br />
@@ -127,7 +134,7 @@ fn Story(cx: Scope, story: api::Story) -> Element {
                     view! { cx,
                         <span>
                             {"by "}
-                            {story.user.map(|user| view ! { cx, <A href=format!("/users/{}", user)>{user.clone()}</A>})}
+                            {story.user.map(|user| view ! { cx, <A href=format!("/users/{user}")>{user.clone()}</A>})}
                             {format!(" {} | ", story.time_ago)}
                             <A href=format!("/stories/{}", story.id)>
                                 {if story.comments_count.unwrap_or_default() > 0 {
@@ -137,17 +144,15 @@ fn Story(cx: Scope, story: api::Story) -> Element {
                                 }}
                             </A>
                         </span>
-                    }
+                    }.into_view(cx)
                 } else {
                     let title = story.title.clone();
-                    view! { cx,  <A href=format!("/item/{}", story.id)>{title.clone()}</A> }
+                    view! { cx,  <A href=format!("/item/{}", story.id)>{title.clone()}</A> }.into_view(cx)
                 }}
             </span>
             {(story.story_type != "link").then(|| view! { cx,
-                <span>
-                    //{" "}
-                    <span class="label">{story.story_type}</span>
-                </span>
+                " "
+                <span class="label">{story.story_type}</span>
             })}
         </li>
     }

examples/hackernews/src/routes/story.rs

@@ -0,0 +1,119 @@
+use crate::api;
+use leptos::*;
+use leptos_meta::*;
+use leptos_router::*;
+
+#[component]
+pub fn Story(cx: Scope) -> impl IntoView {
+    let params = use_params_map(cx);
+    let story = create_resource(
+        cx,
+        move || params().get("id").cloned().unwrap_or_default(),
+        move |id| async move {
+            if id.is_empty() {
+                None
+            } else {
+                api::fetch_api::<api::Story>(cx, &api::story(&format!("item/{id}"))).await
+            }
+        },
+    );
+    let meta_description = move || story.read().and_then(|story| story.map(|story| story.title)).unwrap_or_else(|| "Loading story...".to_string());
+
+    view! { cx,
+        <>
+            <Meta name="description" content=meta_description/>
+                <Suspense fallback=|| view! { cx, "Loading..." }>
+                    {move || story.read().map(|story| match story {
+                        None => view! { cx,  <div class="item-view">"Error loading this story."</div> },
+                        Some(story) => view! { cx,
+                            <div class="item-view">
+                                <div class="item-view-header">
+                                <a href=story.url target="_blank">
+                                    <h1>{story.title}</h1>
+                                </a>
+                                <span class="host">
+                                    "("{story.domain}")"
+                                </span>
+                                {story.user.map(|user| view! { cx,  <p class="meta">
+                                    {story.points}
+                                    " points | by "
+                                    <A href=format!("/users/{user}")>{user.clone()}</A>
+                                    {format!(" {}", story.time_ago)}
+                                </p>})}
+                                </div>
+                                <div class="item-view-comments">
+                                <p class="item-view-comments-header">
+                                    {if story.comments_count.unwrap_or_default() > 0 {
+                                        format!("{} comments", story.comments_count.unwrap_or_default())
+                                    } else {
+                                        "No comments yet.".into()
+                                    }}
+                                </p>
+                                <ul class="comment-children">
+                                    <For
+                                        each=move || story.comments.clone().unwrap_or_default()
+                                        key=|comment| comment.id
+                                        view=move |comment| view! { cx,  <Comment comment /> }
+                                    />
+                                </ul>
+                            </div>
+                        </div>
+                    }})
+                }
+            </Suspense>
+        </>
+    }
+}
+
+#[component]
+pub fn Comment(cx: Scope, comment: api::Comment) -> impl IntoView {
+    let (open, set_open) = create_signal(cx, true);
+
+    view! { cx,
+        <li class="comment">
+        <div class="by">
+            <A href=format!("/users/{}", comment.user.clone().unwrap_or_default())>{comment.user.clone()}</A>
+            {format!(" {}", comment.time_ago)}
+        </div>
+        <div class="text" inner_html=comment.content></div>
+        {(!comment.comments.is_empty()).then(|| {
+            view! { cx,
+                <div>
+                    <div class="toggle" class:open=open>
+                        <a on:click=move |_| set_open.update(|n| *n = !*n)>
+                            {
+                                let comments_len = comment.comments.len();
+                                move || if open() {
+                                    "[-]".into()
+                                } else {
+                                    format!("[+] {}{} collapsed", comments_len, pluralize(comments_len))
+                                }
+                            }
+                        </a>
+                    </div>
+                    {move || open().then({
+                        let comments = comment.comments.clone();
+                        move || view! { cx,
+                            <ul class="comment-children">
+                                <For
+                                    each=move || comments.clone()
+                                    key=|comment| comment.id
+                                    view=move |comment: api::Comment| view! { cx, <Comment comment /> }
+                                />
+                            </ul>
+                        }
+                    })}
+                </div>
+            }
+        })}
+        </li>
+    }
+}
+
+fn pluralize(n: usize) -> &'static str {
+    if n == 1 {
+        " reply"
+    } else {
+        " replies"
+    }
+}