Use local observers

* Check uniqueness of server function names at registration time, and stop leaking src file path in release mode

* Fix missing dev-dependency

.github/FUNDING.yml

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

.github/workflows/test.yml

@@ -28,6 +28,7 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           override: true
+          components: rustfmt
 
       - name: Setup cargo-make
         uses: davidB/rust-cargo-make@v1
@@ -35,16 +36,10 @@ jobs:
       - name: Cargo generate-lockfile
         run: cargo generate-lockfile
 
-      - 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 Rustfmt
+        run: cargo fmt -- --check
+
+      - uses: Swatinem/rust-cache@v2
 
       - name: Run tests with all features
         run: cargo make ci

.gitignore

@@ -6,3 +6,4 @@ blob.rs
 Cargo.lock
 **/*.rs.bk
 .DS_Store
+.idea

CODE_OF_CONDUCT.md

@@ -0,0 +1,51 @@
+# Contributor Covenant Code of Conduct
+
+_This Code of Conduct is based on the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct)
+and the [Bevy Code of Conduct](https://raw.githubusercontent.com/bevyengine/bevy/main/CODE_OF_CONDUCT.md),
+which are adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) 
+and the [Contributor Covenant](https://www.contributor-covenant.org)._
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+We are a community of people learning and exploring how to build better web applications
+with Rust. When interacting with one another, please remember that there are no experts and there are
+no stupid questions. Assume the best in other people's communication, and take a step back if
+you find yourself getting defensive.
+
+Please note the following guidelines as well:
+
+* Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly, safe and welcoming environment for all.
+* Please be kind and courteous. There’s no need to be mean or rude.
+* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
+* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
+* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term “harassment” as including the definition in the [Citizen Code of Conduct](https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.
+* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact the maintainers immediately. Whether you’re a regular contributor or a newcomer, we care about making this community a safe place for you and we’ve got your back.
+* Do not make casual mention of slavery or indentured servitude and/or false comparisons of one's occupation or situation to slavery. Please consider using or asking about alternate terminology when referring to such metaphors in technology.
+* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
+
+## Moderation
+
+These are the policies for upholding [our community’s standards of conduct](#our-standards). If you feel that a thread needs moderation, please contact the maintainers.
+
+1. Remarks that violate the community standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner).
+2. Remarks that maintainers find inappropriate, whether listed in the code of conduct or not, are also not allowed.
+3. Maintainers will first respond to such remarks with a warning.
+4. If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off.
+5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
+6. Maintainers may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
+7. If a maintainer bans someone and you think it was unjustified, please take it up with that maintainer, or with a different maintainer, in private. Complaints about bans in-channel are not allowed.
+8. Maintainers are held to a higher standard than other community members. If a maintainer creates an inappropriate situation, they should expect less leeway than others.
+
+The enforcement policies in the code of conduct apply to all official venues, including Discord channels, GitHub repositories, and all other forums.

Cargo.toml

@@ -24,17 +24,17 @@ members = [
 exclude = ["benchmarks", "examples"]
 
 [workspace.package]
-version = "0.1.0-beta"
+version = "0.1.1"
 
 [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" }
+leptos = { path = "./leptos", default-features = false, version = "0.1.1" }
+leptos_dom = { path = "./leptos_dom", default-features = false, version = "0.1.1" }
+leptos_macro = { path = "./leptos_macro", default-features = false, version = "0.1.1" }
+leptos_reactive = { path = "./leptos_reactive", default-features = false, version = "0.1.1" }
+leptos_server = { path = "./leptos_server", default-features = false, version = "0.1.1" }
+leptos_config = { path = "./leptos_config", default-features = false, version = "0.1.1" }
+leptos_router = { path = "./router", version = "0.1.1" }
+leptos_meta = { path = "./meta", default-feature = false, version = "0.1.1" }
 
 [profile.release]
 codegen-units = 1

README.md

@@ -1,6 +1,7 @@
-**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/Leptos_logo_RGB.png" alt="Leptos Logo" style="width: 400px; height: auto">
+<picture>
+    <source srcset="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_pref_dark_RGB.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)
@@ -28,7 +29,7 @@ pub fn SimpleCounter(cx: Scope, initial_value: i32) -> impl IntoView {
         <div>
             <button on:click=clear>"Clear"</button>
             <button on:click=decrement>"-1"</button>
-            <span>"Value: " {move || value().to_string()} "!"</span>
+            <span>"Value: " {value} "!"</span>
             <button on:click=increment>"+1"</button>
         </div>
     }
@@ -58,9 +59,9 @@ 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)
+- [Examples](https://github.com/leptos-rs/leptos/tree/main/examples)
 - [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!)
+- [Common Bugs](https://github.com/leptos-rs/leptos/tree/main/docs/COMMON_BUGS.md) (and how to fix them!)
 - Leptos Guide (in progress)
 
 ## `nightly` Note
@@ -80,12 +81,12 @@ 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)
+   [`counters_stable` example](https://github.com/leptos-rs/leptos/blob/main/examples/counters_stable/src/main.rs)
    for examples of the correct API.
 
 ## `cargo-leptos`
 
-[`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).
+[`cargo-leptos`](https://github.com/leptos-rs/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).
 
 ```bash
 cargo install cargo-leptos
@@ -94,8 +95,28 @@ cd [your project name]
 cargo leptos watch
 ```
 
+Open browser on [http://localhost:3000/](http://localhost:3000/)
+
 ## FAQs
 
+### Is it production ready?
+
+People usually mean one of three things by this question.
+
+1. **Are the APIs stable?** i.e., will I have to rewrite my whole app from Leptos 0.1 to 0.2 to 0.3 to 0.4, or can I write it now and benefit from new features and updates as new versions come?
+
+With 0.1 the APIs are basically settled. We’re adding new features, but we’re very happy with where the type system and patterns have landed. I would not expect major breaking changes to your code to adapt to, for example, a 0.2.0 release.
+
+2. **Are there bugs?**
+
+Yes, I’m sure there are. You can see from the state of our issue tracker over time that there aren’t that _many_ bugs and they’re usually resolved pretty quickly. But for sure, there may be moments where you encounter something that requires a fix at the framework level, which may not be immediately resolved.
+
+3. **Am I a consumer or a contributor?**
+
+This may be the big one: “production ready” implies a certain orientation to a library: that you can basically use it, without any special knowledge of its internals or ability to contribute. Everyone has this at some level in their stack: for example I (@gbj) don’t have the capacity or knowledge to contribute to something like `wasm-bindgen` at this point: I simply rely on it to work.
+
+There are several people in this community using Leptos right now for internal apps at work, who have also become significant contributors. I think this is the right level of production use for now. There may be missing features that you need, and you may end up building them! But for internal apps, if you’re willing to build and contribute missing pieces along the way, the framework is definitely usable right now.
+
 ### 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:
@@ -105,7 +126,7 @@ Sure! Obviously the `view` macro is for generating DOM nodes but you can use the
 - Use event listeners to update signals
 - Create effects to update the UI
 
-I've put together a [very simple GTK example](https://github.com/gbj/leptos/blob/main/examples/gtk/src/main.rs) so you can see what I mean.
+I've put together a [very simple GTK example](https://github.com/leptos-rs/leptos/blob/main/examples/gtk/src/main.rs) so you can see what I mean.
 
 ### How is this different from Yew/Dioxus?
 
@@ -123,7 +144,6 @@ 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, 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:
 

benchmarks/src/ssr.rs

@@ -2,9 +2,9 @@ use test::Bencher;
 
 #[bench]
 fn leptos_ssr_bench(b: &mut Bencher) {
-	b.iter(|| {
+    b.iter(|| {
 		use leptos::*;
-
+		HydrationCtx::reset_id();
 		_ = create_scope(create_runtime(), |cx| {
 			#[component]
 			fn Counter(cx: Scope, initial: i32) -> impl IntoView {
@@ -32,18 +32,17 @@ fn leptos_ssr_bench(b: &mut Bencher) {
 
 			assert_eq!(
 				rendered,
-				"<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>"
-			);
+				"<main id=\"_0-1\"><h1 id=\"_0-2\">Welcome to our benchmark page.</h1><p id=\"_0-3\">Here's some introductory text.</p><div id=\"_0-3-1\"><button id=\"_0-3-2\">-1</button><span id=\"_0-3-3\">Value: <!>1<!--hk=_0-3-4-->!</span><button id=\"_0-3-5\">+1</button></div><!--hk=_0-3-0--><div id=\"_0-3-5-1\"><button id=\"_0-3-5-2\">-1</button><span id=\"_0-3-5-3\">Value: <!>2<!--hk=_0-3-5-4-->!</span><button id=\"_0-3-5-5\">+1</button></div><!--hk=_0-3-5-0--><div id=\"_0-3-5-5-1\"><button id=\"_0-3-5-5-2\">-1</button><span id=\"_0-3-5-5-3\">Value: <!>3<!--hk=_0-3-5-5-4-->!</span><button id=\"_0-3-5-5-5\">+1</button></div><!--hk=_0-3-5-5-0--></main>"			);
 		});
 	});
 }
-/* 
+
 #[bench]
 fn tera_ssr_bench(b: &mut Bencher) {
-	use tera::*;
-	use serde::{Serialize, Deserialize};
+    use serde::{Deserialize, Serialize};
+    use tera::*;
 
-	static TEMPLATE: &str = r#"<main>
+    static TEMPLATE: &str = r#"<main>
 	<h1>Welcome to our benchmark page.</h1>
 	<p>Here's some introductory text.</p>
 	{% for counter in counters %}
@@ -55,37 +54,40 @@ fn tera_ssr_bench(b: &mut Bencher) {
 	{% endfor %}
 	</main>"#;
 
-	lazy_static::lazy_static! { 
-		static ref TERA: Tera = {
-			let mut tera = Tera::default();
-			tera.add_raw_templates(vec![("template.html", TEMPLATE)]).unwrap();
-			tera
-		};
-	}
+    lazy_static::lazy_static! {
+        static ref TERA: Tera = {
+            let mut tera = Tera::default();
+            tera.add_raw_templates(vec![("template.html", TEMPLATE)]).unwrap();
+            tera
+        };
+    }
 
-	#[derive(Serialize, Deserialize)]
-	struct Counter {
-		value: i32
-	}
+    #[derive(Serialize, Deserialize)]
+    struct Counter {
+        value: i32,
+    }
 
-	b.iter(|| {
-		let mut ctx = Context::new();
-		ctx.insert("counters", &vec![
-			Counter { value: 0 },
-			Counter { value: 1},
-			Counter { value: 2 }
-		]);
+    b.iter(|| {
+        let mut ctx = Context::new();
+        ctx.insert(
+            "counters",
+            &vec![
+                Counter { value: 0 },
+                Counter { value: 1 },
+                Counter { value: 2 },
+            ],
+        );
 
-		let _ = TERA.render("template.html", &ctx).unwrap();
-	});
+        let _ = TERA.render("template.html", &ctx).unwrap();
+    });
 }
 
 #[bench]
 fn sycamore_ssr_bench(b: &mut Bencher) {
-	use sycamore::*;
-	use sycamore::prelude::*;
+    use sycamore::prelude::*;
+    use sycamore::*;
 
-	b.iter(|| {
+    b.iter(|| {
 		_ = create_scope(|cx| {
 			#[derive(Prop)]
 			struct CounterProps {
@@ -139,10 +141,10 @@ fn sycamore_ssr_bench(b: &mut Bencher) {
 
 #[bench]
 fn yew_ssr_bench(b: &mut Bencher) {
-	use yew::prelude::*;
-	use yew::ServerRenderer;
+    use yew::prelude::*;
+    use yew::ServerRenderer;
 
-	b.iter(|| {
+    b.iter(|| {
 		#[derive(Properties, PartialEq, Eq, Debug)]
 		struct CounterProps {
 			initial: i32
@@ -194,4 +196,3 @@ fn yew_ssr_bench(b: &mut Bencher) {
 		});
 	});
 }
- */

benchmarks/src/todomvc/leptos.rs

@@ -8,171 +8,165 @@ 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);
+    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);
+            }
         }
-      }
     }
-    // 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_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(cx: Scope, id: usize, title: String) -> Self {
+        Self::new_with_completed(cx, id, title, false)
     }
-  }
 
-  pub fn toggle(&self) {
-    self
-      .set_completed
-      .update(|completed| *completed = !*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);
+    }
 }
 
 const ESCAPE_KEY: u32 = 27;
 const ENTER_KEY: u32 = 13;
 
 #[component]
-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
+pub fn TodoMVC(cx: Scope, todos: Todos) -> impl IntoView {
+    let mut next_id = todos
         .0
         .iter()
-        .filter(|todo| !todo.completed.get())
-        .cloned()
-        .collect(),
-      Mode::Completed => todos
-        .0
-        .iter()
-        .filter(|todo| todo.completed.get())
-        .cloned()
-        .collect(),
-    })
-  });
+        .map(|todo| todo.id)
+        .max()
+        .map(|last| last + 1)
+        .unwrap_or(0);
 
-  // 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");
-      }
-    }
-  });
+    let (todos, set_todos) = create_signal(cx, todos);
+    provide_context(cx, set_todos);
 
-  view! { cx,
+    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()
+                .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">
@@ -228,100 +222,100 @@ pub fn TodoMVC(cx: Scope,todos: Todos) -> impl IntoView {
 
 #[component]
 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 (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());
+    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);
+    };
+
+    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>
     }
-    set_editing(false);
-  };
-
-  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>
-  }
 }
 
 #[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

@@ -14,7 +14,9 @@ fn leptos_todomvc_ssr(b: &mut Bencher) {
             let rendered = view! {
                 cx,
                 <TodoMVC todos=Todos::new(cx)/>
-            }.into_view(cx).render_to_string(cx);
+            }
+            .into_view(cx)
+            .render_to_string(cx);
 
             assert!(rendered.len() > 1);
         });
@@ -55,7 +57,7 @@ fn yew_todomvc_ssr(b: &mut Bencher) {
         });
     });
 }
-
+/*
 #[bench]
 fn leptos_todomvc_ssr_with_1000(b: &mut Bencher) {
     b.iter(|| {
@@ -107,3 +109,4 @@ fn yew_todomvc_ssr_with_1000(b: &mut Bencher) {
         });
     });
 }
+ */

docs/book/src/01_introduction.md

@@ -1,6 +1,6 @@
 # Introduction
 
-This book is intended as an introduction to the [Leptos](https://github.com/gbj/leptos) Web framework. Together, we’ll build a simple todo app—first as a client-side app, then as a full-stack app.
+This book is intended as an introduction to the [Leptos](https://github.com/leptos-rs/leptos) Web framework. Together, we’ll build a simple todo app—first as a client-side app, then as a full-stack app.
 
 The guide doesn’t assume you know anything about fine-grained reactivity or the details of modern Web frameworks. It does assume you are familiar with the Rust programming language, HTML, CSS, and the DOM and other Web APIs.
 

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/ch02_getting_started).
+> The code for this chapter can be found [here](https://github.com/leptos-rs/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. (Trunk is a simple build tool that includes a dev server.)
+The easiest way to get started using Leptos is to use [Trunk](https://trunkrs.dev/), as many of our [examples](https://github.com/leptos-rs/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
 

docs/book/src/03_building_ui.md

@@ -1,6 +1,6 @@
 # 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).
+> The code for this chapter can be found [here](https://github.com/leptos-rs/leptos/tree/main/docs/book/project/ch03_building_ui).
 
 ## RSX and the `view!` macro
 

docs/logos/Leptos_logo_pref_dark_RGB.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 437.4 209.6" style="enable-background:new 0 0 437.4 209.6;" xmlns="http://www.w3.org/2000/svg">
+  <style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#EF3939;}
+</style>
+  <path class="st0" d="M95.1,128.1H58.7V65.7c0-1.5-0.8-2.4-2.2-2.4h-3.1c-1.3,0-2.2,1-2.2,2.4v67.4c0,1.5,0.8,2.3,2.2,2.3h41.7 c1.5,0,2.5-0.9,2.5-2.3v-2.8C97.6,128.9,96.7,128.1,95.1,128.1z"/>
+  <path class="st0" d="M146.5,77.2c-4.8-3-10.3-4.5-16.3-4.5c0,0,0,0,0,0c-5.7,0-11.1,1.5-16.1,4.4c-4.9,2.9-8.9,6.8-11.8,11.7 c-2.9,4.9-4.4,10.3-4.4,16.1c0,5.7,1.5,11.1,4.5,15.9c3,4.9,6.9,8.7,11.9,11.7c4.9,2.9,10.2,4.3,16,4.3c0,0,0,0,0,0 c8.1,0,14.7-2.6,21.5-8.4c0.5-0.5,0.9-1.1,0.9-1.8c0-0.6-0.2-1.1-0.5-1.5l-1.4-1.8l-0.1-0.1c-0.3-0.3-0.7-0.6-1.4-0.6 c-0.6,0-1.3,0.2-1.7,0.6c-1.9,1.6-3.5,2.8-4.8,3.6c-1.8,1.2-5.8,3.2-12.6,3.2c0,0,0,0,0,0c-0.1,0-0.3,0-0.4,0 c-12.3,0-23.5-10.3-24.5-22.5l53,0c0,0,0,0,0,0c2.2,0,3.5-1.2,3.5-3.3c0-5.3-1.4-10.4-4-15.3C155,84.1,151.2,80.1,146.5,77.2z M154.6,100.4l-49.1,0c2-11.7,13-21.2,24.5-21c0.1,0,0.3,0,0.4,0C143.5,79.4,152.5,90,154.6,100.4z"/>
+  <path class="st0" d="M204,136.6c5.7,0,11.1-1.5,16-4.3c4.9-2.9,8.8-6.7,11.7-11.7c2.9-4.9,4.3-10.3,4.3-16c0-5.7-1.5-11.1-4.3-16 c-2.9-4.9-6.7-8.8-11.7-11.7c-4.9-2.9-10.2-4.3-16-4.3c-9.9,0-19.2,4.8-24.4,12.3v-9.4c0-0.6-0.1-1.1-0.4-1.5 c-0.4-0.5-1-0.8-1.9-0.8h-2.7c-1.5,0-2.3,0.8-2.3,2.3v5.7v46.5v24c0,1.3,0.8,2,2,2h3.4c0.9,0,1.6-0.7,1.6-1.6v-17.1v-11 C185.1,131.9,194.3,136.6,204,136.6z M186.6,122.6c-4.9-4.9-7.7-11.5-7.5-18c-0.1-6.4,2.5-12.8,7.4-17.6c4.9-4.9,11.3-7.6,17.7-7.4 c4.4,0,8.5,1.1,12.2,3.4c3.7,2.3,6.7,5.4,8.9,9.2c2.2,3.9,3.3,8.1,3.3,12.5c0.1,6.5-2.6,13-7.5,17.9c-4.8,4.8-11,7.4-17.3,7.3 C197.7,130,191.4,127.3,186.6,122.6z"/>
+  <path class="st0" d="M241.9,80.4h7.6v42c0,6.8,4.6,12.1,11.1,12.9c0.7,0.1,1.8,0.2,3.5,0.2c2,0,3-0.4,3-2.3v-2.4c0-1.8-1.3-2-2.8-2 c0,0,0,0,0,0l-1.8,0c-2,0-3.5-0.8-4.4-2.1c-1-1.5-1.5-3.2-1.5-5V80.4h10.1c1.3,0,2.3-1.4,2.3-2.6v-1.9c0-1.4-0.8-2.2-2.2-2.2h-10.1 v-13c0-1.5-0.8-2.5-1.9-2.5c-0.2,0-0.4,0-0.6,0.1l-2.6,0.7c-1.2,0.4-2,0.9-2,2.5v12.2h-7.6c-1.4,0-2.3,0.9-2.3,2.3v1.9 C239.6,79.2,240.6,80.4,241.9,80.4z"/>
+  <path class="st0" d="M379.1,106.3c-4-2.9-8.9-5-14.3-6.3c-6.5-1.4-13.4-5.2-13.3-10.3c0-7.5,6.6-10.2,12.3-10.2c5.4,0,10.2,3,13,8 c0.7,1.3,1.5,1.9,2.4,1.9c0.3,0,0.7-0.1,1-0.3l2.2-1.2c0.6-0.3,0.9-0.9,0.9-1.7c0-0.5-0.1-1-0.3-1.3c-3.6-8.2-10.1-12.4-19.2-12.4 c-11.7,0-19.6,6.9-19.6,17.2c0,4.3,1.8,8,5.5,10.9c3.4,2.8,7.9,4.9,13.3,6.1c4.6,1.1,8.3,2.6,11.1,4.4c1.4,0.9,2.4,2.1,3.1,3.4 c0.6,1.2,0.9,2.6,0.9,4.1c0.1,2.4-0.8,4.5-2.6,6.3c-3.1,3.2-8.4,4.7-12,4.7c0,0-0.1,0-0.1,0c-3.4,0-6.5-0.8-9.1-2.5 c-2.6-1.6-4.2-3.8-5-6.6c-0.3-1.1-0.8-2.2-2.2-2.2c-0.1,0-0.2,0-0.4,0c-0.1,0-0.3,0-0.5,0.1l-1.9,0.4l-0.1,0c-1,0.4-1.6,1.2-1.6,2.1 c0,0.2,0.1,0.7,0.2,1.1c2,8.6,10.2,14.3,20.6,14.3c0.1,0,0.2,0,0.4,0c6.6,0,12.7-2.3,16.7-6.4c3.2-3.2,4.8-7.2,4.7-11.6 c0-2.8-0.6-5.3-1.8-7.5C382.4,109.3,381,107.6,379.1,106.3z"/>
+  <path class="st1" d="M348.9,45.7c0-6.3-3.3-11.9-8.2-15.1c-2.8-1.8-6.2-2.9-9.7-2.9c-9.9,0-18,8.1-18,18c0,4.8,1.9,9.1,4.9,12.3 c-3.7,4.4-6.6,9.3-8.8,14.7c-1.6-0.2-3.2-0.4-4.9-0.4c-17.7,0-32.1,14.4-32.1,32.1c0,14.7,9.9,27.1,23.4,30.9 c-6.8,17.3-23.7,29.7-43.4,29.7c-16.8,0-31.6-9-39.8-22.4c-2.5,0.5-5,0.9-7.7,0.9c9,17,26.9,28.6,47.4,28.6 c23.3,0,43.1-14.9,50.5-35.6c0.5,0,1,0,1.6,0c17.7,0,32.1-14.4,32.1-32.1c0-13.6-8.4-25.2-20.3-29.9c1.9-4.6,4.5-8.8,7.7-12.5 c1,0.4,2,0.8,3.1,1c1.3,0.3,2.7,0.5,4.1,0.5C340.8,63.7,348.9,55.6,348.9,45.7z M304.2,129.5c-13.8,0-25-11.2-25-25s11.2-25,25-25 s25,11.2,25,25S318,129.5,304.2,129.5z M330.9,34.9c0.6,0,1.3,0.1,1.9,0.2c5.1,0.9,9,5.3,9,10.7c0,6-4.9,10.8-10.8,10.8 s-10.8-4.9-10.8-10.8c0-1.4,0.3-2.7,0.8-4C322.4,37.7,326.4,34.9,330.9,34.9z"/>
+</svg>

examples/counter/README.md

@@ -3,3 +3,5 @@
 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.
+
+> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

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

@@ -17,7 +17,7 @@ pub fn SimpleCounter(
         <div>
             <button on:click=move |_| set_value(0)>"Clear"</button>
             <button on:click=move |_| set_value.update(|value| *value -= step)>"-1"</button>
-            <span>"Value: " {move || value().to_string()} "!"</span>
+            <span>"Value: " {value} "!"</span>
             <button on:click=move |_| set_value.update(|value| *value += step)>"+1"</button>
         </div>
     }

examples/counter_isomorphic/Cargo.toml

@@ -47,6 +47,7 @@ skip_feature_sets = [["ssr", "hydrate"]]
 # 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.
+# When NOT using cargo-leptos this must be updated to "." or the counters will not work. The above warning still applies if you do switch to cargo-leptos later.
 site-root = "target/site"
 # The site-root relative folder where all compiled output (JS, WASM and CSS) is written
 # Defaults to pkg	
@@ -54,9 +55,9 @@ 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 = "static/assets"
+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"
+site-addr = "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.

examples/counter_isomorphic/README.md

@@ -3,8 +3,8 @@
 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`.
+For this example the server must store the counter state since it can be modified by many users.
+This means it is not possible to produce a working CSR-only version as a non-static server is required.
 
 ## 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)
@@ -17,6 +17,9 @@ cargo install --locked cargo-leptos
 ```bash
 cargo leptos watch
 ```
+
+Open browser on [http://localhost:3000/](http://localhost:3000/)
+
 3. When ready to deploy, run
 ```bash
 cargo leptos build --release
@@ -25,7 +28,7 @@ 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.
+0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. For examples with CSS you 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. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes.
 1. Install wasm-pack
 ```bash
 cargo install wasm-pack

examples/counter_isomorphic/src/counters.rs

@@ -1,5 +1,6 @@
 use leptos::*;
 use leptos_router::*;
+use leptos_meta::*;
 
 #[cfg(feature = "ssr")]
 use std::sync::atomic::{AtomicI32, Ordering};
@@ -44,6 +45,7 @@ pub async fn clear_server_count() -> Result<i32, ServerFnError> {
 }
 #[component]
 pub fn Counters(cx: Scope) -> impl IntoView {
+    provide_meta_context(cx);
     view! {
         cx,
         <Router>
@@ -59,6 +61,7 @@ pub fn Counters(cx: Scope) -> impl IntoView {
                     <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! {
@@ -113,7 +116,7 @@ pub fn Counter(cx: Scope) -> impl IntoView {
             <div>
                 <button on:click=move |_| clear.dispatch(())>"Clear"</button>
                 <button on:click=move |_| dec.dispatch(())>"-1"</button>
-                <span>"Value: " {move || value().to_string()} "!"</span>
+                <span>"Value: " {value} "!"</span>
                 <button on:click=move |_| inc.dispatch(())>"+1"</button>
             </div>
             {move || error_msg().map(|msg| view! { cx, <p>"Error: " {msg.to_string()}</p>})}

examples/counter_isomorphic/src/main.rs

@@ -33,7 +33,10 @@ cfg_if! {
 
             crate::counters::register_server_functions();
 
-            let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
+            // Setting this to None means we'll be using cargo-leptos and its env vars.
+            // when not using cargo-leptos None must be replaced with Some("Cargo.toml")
+            let conf = get_configuration(None).await.unwrap();
+
             let addr = conf.leptos_options.site_address.clone();
             let routes = generate_route_list(|cx| view! { cx, <Counters/> });
 
@@ -54,14 +57,11 @@ cfg_if! {
         }
         }
 
-    // client-only stuff for Trunk
+    // client-only main 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/> });
+            // isomorphic counters cannot work in a Client-Side-Rendered only
+            // app as a server is required to maintain state
         }
     }
 }

examples/counter_without_macros/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "counter_without_macros"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+leptos = { path = "../../leptos", features = ["stable"] }
+console_log = "0.2"
+log = "0.4"
+console_error_panic_hook = "0.1.7"
+
+[dev-dependencies]
+wasm-bindgen-test = "0.3.0"

examples/counter_without_macros/README.md

@@ -0,0 +1,5 @@
+# Leptos Counter Example
+
+This example is the same like the `counter` but it's written without using macros and can be build with stable Rust.
+
+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_without_macros/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_without_macros/src/lib.rs

@@ -0,0 +1,44 @@
+use leptos::{ev, *};
+
+pub struct Props {
+    /// The starting value for the counter
+    pub initial_value: i32,
+    /// The change that should be applied each time the button is clicked.
+    pub step: i32,
+}
+
+/// A simple counter view.
+pub fn view(cx: Scope, props: Props) -> impl IntoView {
+    let Props {
+        initial_value,
+        step,
+    } = props;
+    let (value, set_value) = create_signal(cx, initial_value);
+
+    div(cx)
+        .child((
+            cx,
+            button(cx)
+                .on(ev::click, move |_| set_value.update(|value| *value = 0))
+                .child((cx, "Clear")),
+        ))
+        .child((
+            cx,
+            button(cx)
+                .on(ev::click, move |_| set_value.update(|value| *value -= step))
+                .child((cx, "-1")),
+        ))
+        .child((
+            cx,
+            span(cx)
+                .child((cx, "Value: "))
+                .child((cx, move || value.get()))
+                .child((cx, "!")),
+        ))
+        .child((
+            cx,
+            button(cx)
+                .on(ev::click, move |_| set_value.update(|value| *value += step))
+                .child((cx, "+1")),
+        ))
+}

examples/counter_without_macros/src/main.rs

@@ -0,0 +1,16 @@
+use counter_without_macros as counter;
+use leptos::*;
+
+pub fn main() {
+    _ = console_log::init_with_level(log::Level::Debug);
+    console_error_panic_hook::set_once();
+    mount_to_body(|cx| {
+        counter::view(
+            cx,
+            counter::Props {
+                initial_value: 0,
+                step: 1,
+            },
+        )
+    })
+}

examples/counter_without_macros/tests/mod.rs

@@ -0,0 +1,58 @@
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+use counter_without_macros as counter;
+use leptos::*;
+use web_sys::HtmlElement;
+
+#[wasm_bindgen_test]
+fn inc() {
+    mount_to_body(|cx| {
+        counter::view(
+            cx,
+            counter::Props {
+                initial_value: 0,
+                step: 1,
+            },
+        )
+    });
+
+    let document = leptos::document();
+    let div = document.query_selector("div").unwrap().unwrap();
+    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()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
+    let inc = text
+        .next_sibling()
+        .unwrap()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
+
+    inc.click();
+    inc.click();
+
+    assert_eq!(text.text_content(), Some("Value: 2!".to_string()));
+
+    dec.click();
+    dec.click();
+    dec.click();
+    dec.click();
+
+    assert_eq!(text.text_content(), Some("Value: -2!".to_string()));
+
+    clear.click();
+
+    assert_eq!(text.text_content(), Some("Value: 0!".to_string()));
+}

examples/counters/README.md

@@ -0,0 +1,9 @@
+# Leptos Counters Example
+
+This example showcases a basic leptos app with many counters. It is a good example of how to setup a basic reactive app with signals and effects, and how to interact with browser events.
+
+## 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.
+
+> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

examples/counters/src/lib.rs

@@ -97,10 +97,10 @@ fn Counter(
         <li>
             <button on:click=move |_| set_value.update(move |value| *value -= 1)>"-1"</button>
             <input type="text"
-                prop:value={move || value().to_string()}
+                prop:value={value}
                 on:input=input
             />
-            <span>{move || value().to_string()}</span>
+            <span>{value}</span>
             <button on:click=move |_| set_value.update(move |value| *value += 1)>"+1"</button>
             <button on:click=move |_| set_counters.update(move |counters| counters.retain(|(counter_id, _)| counter_id != &id))>"x"</button>
         </li>

examples/counters_stable/README.md

@@ -0,0 +1,9 @@
+# Leptos Counters Example on Rust Stable
+
+This example showcases a basic Leptos app with many counters. It is a good example of how to setup a basic reactive app with signals and effects, and how to interact with browser events. Unlike the other counters example, it will compile on Rust stable, because it has the `stable` feature enabled.
+
+## 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.
+
+> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

examples/fetch/README.md

@@ -0,0 +1,9 @@
+# Client Side Fetch
+
+This example shows how to fetch data from the client in WebAssembly.
+
+## 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.
+
+> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

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/hackernews/Cargo.toml

@@ -56,9 +56,9 @@ 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 = "static/assets"
+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"	
+site-addr = "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.

examples/hackernews/README.md

@@ -17,6 +17,9 @@ cargo install --locked cargo-leptos
 ```bash
 cargo leptos watch
 ```
+
+Open browser on [http://localhost:3000/](http://localhost:3000/)
+
 3. When ready to deploy, run
 ```bash
 cargo leptos build --release
@@ -25,7 +28,7 @@ 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.
+0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. 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. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes..
 1. Install wasm-pack
 ```bash
 cargo install wasm-pack

examples/hackernews/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<link data-trunk rel="rust" data-wasm-opt="z"/>
+		<link data-trunk rel="rust" data-wasm-opt="z" data-cargo-features="csr"/>
 		<link data-trunk rel="css" href="./style.css"/>
 	</head>
 	<body></body>

examples/hackernews/src/api.rs

@@ -1,4 +1,4 @@
-use leptos::{on_cleanup, Scope, Serializable};
+use leptos::{Scope, Serializable};
 use serde::{Deserialize, Serialize};
 
 pub fn story(path: &str) -> String {
@@ -29,7 +29,7 @@ where
 
     // abort in-flight requests if the Scope is disposed
     // i.e., if we've navigated away from this page
-    on_cleanup(cx, move || {
+    leptos::on_cleanup(cx, move || {
         if let Some(abort_controller) = abort_controller {
             abort_controller.abort()
         }

examples/hackernews/src/lib.rs

@@ -16,6 +16,7 @@ pub fn App(cx: Scope) -> impl IntoView {
         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 />

examples/hackernews/src/main.rs

@@ -14,10 +14,16 @@ cfg_if! {
         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();
+            // Setting this to None means we'll be using cargo-leptos and its env vars.
+            let conf = get_configuration(None).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/> });
@@ -28,6 +34,7 @@ cfg_if! {
 
                 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))
@@ -39,7 +46,11 @@ cfg_if! {
         }
     } else {
         fn main() {
-            // no client-side main function
+            use hackernews::{App, AppProps};
+
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            mount_to_body(|cx| view! { cx, <App/> })
         }
     }
 }

examples/hackernews_axum/Cargo.toml

@@ -64,9 +64,9 @@ 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 = "static/assets"
+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"	
+site-addr = "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.

examples/hackernews_axum/README.md

@@ -17,6 +17,9 @@ cargo install --locked cargo-leptos
 ```bash
 cargo leptos watch
 ```
+
+Open browser on [http://localhost:3000/](http://localhost:3000/)
+
 3. When ready to deploy, run
 ```bash
 cargo leptos build --release
@@ -25,7 +28,7 @@ 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.
+0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. 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. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes..
 1. Install wasm-pack
 ```bash
 cargo install wasm-pack

examples/hackernews_axum/src/error_template.rs

@@ -0,0 +1,28 @@
+use leptos::Errors;
+use leptos::{view, For, ForProps, IntoView, RwSignal, Scope, View};
+
+// A basic function to display errors served by the error boundaries. Feel free to do more complicated things
+// here than just displaying them
+pub fn error_template(cx: Scope, errors: Option<RwSignal<Errors>>) -> View {
+    let Some(errors) = errors else {
+        panic!("No Errors found and we expected errors!");
+    };
+    view! {cx,
+    <h1>"Errors"</h1>
+    <For
+        // a function that returns the items we're iterating over; a signal is fine
+        each= move || {errors.get().0.into_iter()}
+        // a unique key for each item as a reference
+        key=|error| error.0.clone()
+        // renders each item to a view
+        view= move |error| {
+        let error_string = error.1.to_string();
+          view! {
+            cx,
+            <p>"Error: " {error_string}</p>
+          }
+        }
+      />
+    }
+    .into_view(cx)
+}

examples/hackernews_axum/src/fallback.rs

@@ -5,22 +5,26 @@ if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
         extract::Extension,
+        response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
+    use axum::response::Response as AxumResponse;
     use tower::ServiceExt;
     use tower_http::services::ServeDir;
     use std::sync::Arc;
-    use leptos::LeptosOptions;
-
-    pub async fn file_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>) -> Result<Response<BoxBody>, (StatusCode, String)> {
+    use leptos::{LeptosOptions};
+    use crate::error_template::error_template;
 
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
         let options = &*options;
         let root = options.site_root.clone();
-        let res = get_static_file(uri.clone(), &root).await?;
+        let res = get_static_file(uri.clone(), &root).await.unwrap();
 
-        match res.status() {
-            StatusCode::OK => Ok(res),
-            _ => Err((res.status(), "File Not Found".to_string()))
+        if res.status() == StatusCode::OK {
+           res.into_response()
+        } else{
+            let handler = leptos_axum::render_app_to_stream(options.to_owned(), |cx| error_template(cx, None));
+            handler(req).await.into_response()
         }
     }
 
@@ -37,5 +41,7 @@ if #[cfg(feature = "ssr")] {
             )),
         }
     }
+
+
 }
 }

examples/hackernews_axum/src/handlers.rs

@@ -11,7 +11,6 @@ if #[cfg(feature = "ssr")] {
 
     pub async fn file_handler(uri: Uri) -> Result<Response<BoxBody>, (StatusCode, String)> {
         let res = get_static_file(uri.clone(), "/pkg").await?;
-        println!("FIRST URI{:?}", uri);
 
         if res.status() == StatusCode::NOT_FOUND {
             // try with `.html`
@@ -27,7 +26,6 @@ if #[cfg(feature = "ssr")] {
 
     pub async fn get_static_file_handler(uri: Uri) -> Result<Response<BoxBody>, (StatusCode, String)> {
         let res = get_static_file(uri.clone(), "/static").await?;
-        println!("FIRST URI{:?}", uri);
 
         if res.status() == StatusCode::NOT_FOUND {
           Err((StatusCode::INTERNAL_SERVER_ERROR, "Invalid URI".to_string()))
@@ -41,7 +39,6 @@ if #[cfg(feature = "ssr")] {
 
         // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
         // When run normally, the root should be the crate root
-      println!("Base: {:#?}", base);
         if base == "/static" {
             match ServeDir::new("./static").oneshot(req).await {
                 Ok(res) => Ok(res.map(boxed)),

examples/hackernews_axum/src/lib.rs

@@ -3,7 +3,8 @@ use leptos::{component, view, IntoView, Scope};
 use leptos_meta::*;
 use leptos_router::*;
 mod api;
-pub mod file;
+pub mod error_template;
+pub mod fallback;
 pub mod handlers;
 mod routes;
 use routes::nav::*;
@@ -17,6 +18,7 @@ pub fn App(cx: Scope) -> impl IntoView {
     view! {
         cx,
         <>
+            <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
             <Stylesheet id="leptos" href="/pkg/hackernews_axum.css"/>
             <Meta name="description" content="Leptos implementation of a HackerNews demo."/>
             <Router>

examples/hackernews_axum/src/main.rs

@@ -6,11 +6,12 @@ cfg_if! {
 if #[cfg(feature = "ssr")] {
     use axum::{
         Router,
+        routing::get,
         extract::Extension,
     };
     use leptos_axum::{generate_route_list, LeptosRoutes};
     use std::sync::Arc;
-    use hackernews_axum::file::file_handler;
+    use hackernews_axum::fallback::file_and_error_handler;
 
     #[tokio::main]
     async fn main() {
@@ -25,8 +26,9 @@ if #[cfg(feature = "ssr")] {
 
         // build our application with a route
         let app = Router::new()
+        .route("/favicon.ico", get(file_and_error_handler))
         .leptos_routes(leptos_options.clone(), routes, |cx| view! { cx, <App/> } )
-        .fallback(file_handler)
+        .fallback(file_and_error_handler)
         .layer(Extension(Arc::new(leptos_options)));
 
         // run our app with hyper

examples/hackernews_axum/static/style.css

@@ -1,326 +0,0 @@
-body {
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-	font-size: 15px;
-	background-color: #f2f3f5;
-	margin: 0;
-	padding-top: 55px;
-	color: #34495e;
-	overflow-y: scroll
-}
-
-a {
-	color: #34495e;
-	text-decoration: none
-}
-
-.header {
-	background-color: #335d92;
-	position: fixed;
-	z-index: 999;
-	height: 55px;
-	top: 0;
-	left: 0;
-	right: 0
-}
-
-.header .inner {
-	max-width: 800px;
-	box-sizing: border-box;
-	margin: 0 auto;
-	padding: 15px 5px
-}
-
-.header a {
-	color: rgba(255, 255, 255, .8);
-	line-height: 24px;
-	transition: color .15s ease;
-	display: inline-block;
-	vertical-align: middle;
-	font-weight: 300;
-	letter-spacing: .075em;
-	margin-right: 1.8em
-}
-
-.header a:hover {
-	color: #fff
-}
-
-.header a.active {
-	color: #fff;
-	font-weight: 400
-}
-
-.header a:nth-child(6) {
-	margin-right: 0
-}
-
-.header .github {
-	color: #fff;
-	font-size: .9em;
-	margin: 0;
-	float: right
-}
-
-.logo {
-	width: 24px;
-	margin-right: 10px;
-	display: inline-block;
-	vertical-align: middle
-}
-
-.view {
-	max-width: 800px;
-	margin: 0 auto;
-	position: relative
-}
-
-.fade-enter-active,
-.fade-exit-active {
-	transition: all .2s ease
-}
-
-.fade-enter,
-.fade-exit-active {
-	opacity: 0
-}
-
-@media (max-width:860px) {
-	.header .inner {
-		padding: 15px 30px
-	}
-}
-
-@media (max-width:600px) {
-	.header .inner {
-		padding: 15px
-	}
-
-	.header a {
-		margin-right: 1em
-	}
-
-	.header .github {
-		display: none
-	}
-}
-
-.news-view {
-	padding-top: 45px
-}
-
-.news-list,
-.news-list-nav {
-	background-color: #fff;
-	border-radius: 2px
-}
-
-.news-list-nav {
-	padding: 15px 30px;
-	position: fixed;
-	text-align: center;
-	top: 55px;
-	left: 0;
-	right: 0;
-	z-index: 998;
-	box-shadow: 0 1px 2px rgba(0, 0, 0, .1)
-}
-
-.news-list-nav .page-link {
-	margin: 0 1em
-}
-
-.news-list-nav .disabled {
-	color: #aaa
-}
-
-.news-list {
-	position: absolute;
-	margin: 30px 0;
-	width: 100%;
-	transition: all .5s cubic-bezier(.55, 0, .1, 1)
-}
-
-.news-list ul {
-	list-style-type: none;
-	padding: 0;
-	margin: 0
-}
-
-@media (max-width:600px) {
-	.news-list {
-		margin: 10px 0
-	}
-}
-
-.news-item {
-	background-color: #fff;
-	padding: 20px 30px 20px 80px;
-	border-bottom: 1px solid #eee;
-	position: relative;
-	line-height: 20px
-}
-
-.news-item .score {
-	color: #335d92;
-	font-size: 1.1em;
-	font-weight: 700;
-	position: absolute;
-	top: 50%;
-	left: 0;
-	width: 80px;
-	text-align: center;
-	margin-top: -10px
-}
-
-.news-item .host,
-.news-item .meta {
-	font-size: .85em;
-	color: #626262
-}
-
-.news-item .host a,
-.news-item .meta a {
-	color: #626262;
-	text-decoration: underline
-}
-
-.news-item .host a:hover,
-.news-item .meta a:hover {
-	color: #335d92
-}
-
-.item-view-header {
-	background-color: #fff;
-	padding: 1.8em 2em 1em;
-	box-shadow: 0 1px 2px rgba(0, 0, 0, .1)
-}
-
-.item-view-header h1 {
-	display: inline;
-	font-size: 1.5em;
-	margin: 0;
-	margin-right: .5em
-}
-
-.item-view-header .host,
-.item-view-header .meta,
-.item-view-header .meta a {
-	color: #626262
-}
-
-.item-view-header .meta a {
-	text-decoration: underline
-}
-
-.item-view-comments {
-	background-color: #fff;
-	margin-top: 10px;
-	padding: 0 2em .5em
-}
-
-.item-view-comments-header {
-	margin: 0;
-	font-size: 1.1em;
-	padding: 1em 0;
-	position: relative
-}
-
-.item-view-comments-header .spinner {
-	display: inline-block;
-	margin: -15px 0
-}
-
-.comment-children {
-	list-style-type: none;
-	padding: 0;
-	margin: 0
-}
-
-@media (max-width:600px) {
-	.item-view-header h1 {
-		font-size: 1.25em
-	}
-}
-
-.comment-children .comment-children {
-	margin-left: 1.5em
-}
-
-.comment {
-	border-top: 1px solid #eee;
-	position: relative
-}
-
-.comment .by,
-.comment .text,
-.comment .toggle {
-	font-size: .9em;
-	margin: 1em 0
-}
-
-.comment .by {
-	color: #626262
-}
-
-.comment .by a {
-	color: #626262;
-	text-decoration: underline
-}
-
-.comment .text {
-	overflow-wrap: break-word
-}
-
-.comment .text a:hover {
-	color: #335d92
-}
-
-.comment .text pre {
-	white-space: pre-wrap
-}
-
-.comment .toggle {
-	background-color: #fffbf2;
-	padding: .3em .5em;
-	border-radius: 4px
-}
-
-.comment .toggle a {
-	color: #626262;
-	cursor: pointer
-}
-
-.comment .toggle.open {
-	padding: 0;
-	background-color: transparent;
-	margin-bottom: -.5em
-}
-
-.user-view {
-	background-color: #fff;
-	box-sizing: border-box;
-	padding: 2em 3em
-}
-
-.user-view h1 {
-	margin: 0;
-	font-size: 1.5em
-}
-
-.user-view .meta {
-	list-style-type: none;
-	padding: 0
-}
-
-.user-view .label {
-	display: inline-block;
-	min-width: 4em
-}
-
-.user-view .about {
-	margin: 1em 0
-}
-
-.user-view .links a {
-	text-decoration: underline
-}

examples/parent_child/README.md

@@ -0,0 +1,17 @@
+# Parent Child Example
+
+This example highlights four different ways that child components can communicate with their parent:
+
+1. <ButtonA/>: passing a WriteSignal as one of the child component props,
+   for the child component to write into and the parent to read
+2. <ButtonB/>: passing a closure as one of the child component props, for
+   the child component to call
+3. <ButtonC/>: adding a simple event listener on the child component itself
+4. <ButtonD/>: providing a context that is used in the component (rather than prop drilling)
+
+## 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
+
+> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

examples/parent_child/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"/>
 		<style>
 			.red {
 				color: red;

examples/router/README.md

@@ -1,8 +1,11 @@
 # Leptos Router Example
 
-This example demonstrates how Leptos' router works
+This example demonstrates how Leptos’s router works for client side routing.
+
+## Build and Run it
 
-## Run it
 ```bash
 trunk serve --open
 ```
+
+> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

examples/router/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"/>
 		<style>
 			a[aria-current] {
 				font-weight: bold;

examples/router/src/lib.rs

@@ -12,6 +12,11 @@ pub fn RouterExample(cx: Scope) -> impl IntoView {
     view! { cx,
         <Router>
             <nav>
+                // ordinary <a> elements can be used for client-side navigation
+                // using <A> has two effects:
+                // 1) ensuring that relative routing works properly for nested routes
+                // 2) setting the `aria-current` attribute on the current link,
+                //    for a11y and styling purposes
                 <A exact=true href="/">"Contacts"</A>
                 <A href="about">"About"</A>
                 <A href="settings">"Settings"</A>
@@ -105,12 +110,15 @@ pub fn Contact(cx: Scope) -> impl IntoView {
         // Some(None) => has loaded and found no contact
         Some(None) => Some(view! { cx, <p>"No contact with this ID was found."</p> }.into_any()),
         // Some(Some) => has loaded and found a contact
-        Some(Some(contact)) => Some(view! { cx,
-            <section class="card">
-                <h1>{contact.first_name} " " {contact.last_name}</h1>
-                <p>{contact.address_1}<br/>{contact.address_2}</p>
-            </section>
-        }.into_any()),
+        Some(Some(contact)) => Some(
+            view! { cx,
+                <section class="card">
+                    <h1>{contact.first_name} " " {contact.last_name}</h1>
+                    <p>{contact.address_1}<br/>{contact.address_2}</p>
+                </section>
+            }
+            .into_any(),
+        ),
     };
 
     view! { cx,
@@ -125,9 +133,18 @@ pub fn Contact(cx: Scope) -> impl IntoView {
 #[component]
 pub fn About(cx: Scope) -> impl IntoView {
     log::debug!("rendering <About/>");
+    // use_navigate allows you to navigate programmatically by calling a function
+    let navigate = use_navigate(cx);
 
     view! { cx,
         <>
+            // note: this is just an illustration of how to use `use_navigate`
+            // <button on:click> to navigate is an *anti-pattern*
+            // you should ordinarily use a link instead,
+            // both semantically and so your link will work before WASM loads
+            <button on:click=move |_| { _ = navigate("/", Default::default()); }>
+                "Home"
+            </button>
             <h1>"About"</h1>
             <p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."</p>
         </>

examples/tailwind/Cargo.toml

@@ -89,9 +89,9 @@ 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/output.css"
 # [Optional] Files in the asset-dir will be copied to the site-root directory
-assets-dir = "assets"
+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"
+site-addr = "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.

examples/tailwind/README.md

@@ -1,6 +1,6 @@
 # Leptos Starter Template
 
-This is a template demonstrating how to integrate [TailwindCSS](https://tailwindcss.com/) with the [Leptos](https://github.com/gbj/leptos) web framework and the [cargo-leptos](https://github.com/akesson/cargo-leptos) tool.
+This is a template demonstrating how to integrate [TailwindCSS](https://tailwindcss.com/) with the [Leptos](https://github.com/leptos-rs/leptos) web framework and the [cargo-leptos](https://github.com/akesson/cargo-leptos) tool.
 
 If you don't have `cargo-leptos` installed you can install it with
 
@@ -16,6 +16,8 @@ and
 
 in this directory.
 
+Open browser on [http://localhost:3000/](http://localhost:3000/)
+
 You can begin editing your app at `src/app.rs`.
 
 ## Installing Tailwind
@@ -52,13 +54,11 @@ If you're using VS Code, add the following to your `settings.json`
   "css.validate": false,
 ```
 
-
 Install [Tailwind CSS Intellisense](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss).
 
     Install "VS Browser" extension, a browser at the right window.
     Allow vscode Ports forward: 3000, 3001.
 
-
 ## Notes about Tooling
 
 By default, `cargo-leptos` uses `nightly` Rust, `cargo-generate`, and `sass`. If you run into any trouble, you may need to install one or more of these tools.
@@ -72,8 +72,8 @@ By default, `cargo-leptos` uses `nightly` Rust, `cargo-generate`, and `sass`. If
 ## Alternatives to cargo-leptos
 
 This crate can be run without `cargo-leptos`, using `wasm-pack` and `cargo`. To do so, you'll need to install some other tools.
-
-1. `cargo install wasm-pack`
+0. `cargo install wasm-pack`
+1. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. 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. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes.
 
 ### Server Side Rendering With Hydration
 
@@ -91,15 +91,16 @@ Then run the server with `cargo run` to serve the server side rendered HTML and
 cargo run --no-default-features --features=ssr
 ```
 
-> Note that if your hydration code changes, you will have to rerun the wasm-pack command above before running 
+> Note that if your hydration code changes, you will have to rerun the wasm-pack command above before running
 > `cargo run`
 
 ### Client Side Rendering
 
 You'll need to install trunk to client side render this bundle.
+
 1. `cargo install trunk`
-Then the site can be served with `trunk serve --open`
+   Then the site can be served with `trunk serve --open`
 
 ## Attribution
 
-Many thanks to GreatGreg for putting together this guide. You can find the original, with added details, [here](https://github.com/gbj/leptos/discussions/125).
+Many thanks to GreatGreg for putting together this guide. You can find the original, with added details, [here](https://github.com/leptos-rs/leptos/discussions/125).

examples/tailwind/src/app.rs

@@ -11,6 +11,7 @@ pub fn App(cx: Scope) -> impl IntoView {
     view! {
         cx,
         <Stylesheet id="leptos" href="/pkg/tailwind.css"/>
+        <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
         <Router>
             <Routes>
                 <Route path="" view=  move |cx| view! {

examples/tailwind/src/main.rs

@@ -17,7 +17,9 @@ cfg_if! {
         #[actix_web::main]
         async fn main() -> std::io::Result<()> {
 
-            let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
+            // Setting this to None means we'll be using cargo-leptos and its env vars.
+            let conf = get_configuration(None).await.unwrap();
+
             let addr = conf.leptos_options.site_address.clone();
 
             // Generate the list of routes in your Leptos App

examples/todo_app_sqlite/Cargo.toml

@@ -58,9 +58,9 @@ 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 = "static/assets"
+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"	
+site-addr = "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.

examples/todo_app_sqlite/README.md

@@ -17,6 +17,9 @@ cargo install --locked cargo-leptos
 ```bash
 cargo leptos watch
 ```
+
+Open browser on [http://localhost:3000/](http://localhost:3000/)
+
 3. When ready to deploy, run
 ```bash
 cargo leptos build --release
@@ -25,7 +28,7 @@ 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 file is no longer processed by cargo-leptos. Building to alternative folders is not supported at this time
+0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. 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. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes.
 1. Install wasm-pack
 ```bash
 cargo install wasm-pack

examples/todo_app_sqlite/src/main.rs

@@ -26,7 +26,9 @@ cfg_if! {
 
             crate::todo::register_server_functions();
 
-            let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
+            // Setting this to None means we'll be using cargo-leptos and its env vars.
+            let conf = get_configuration(None).await.unwrap();
+
             let addr = conf.leptos_options.site_address.clone();
 
             // Generate the list of routes in your Leptos App

examples/todo_app_sqlite/src/todo.rs

@@ -95,6 +95,7 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
     provide_meta_context(cx);
     view! {
         cx,
+        <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
         <Stylesheet id="leptos" href="/pkg/todo_app_sqlite.css"/>
         <Router>
             <header>

examples/todo_app_sqlite_axum/Cargo.toml

@@ -18,6 +18,7 @@ leptos = { path = "../../../leptos/leptos", default-features = false, features =
 leptos_axum = { path = "../../../leptos/integrations/axum", default-features = false, optional = true }
 leptos_meta = { path = "../../../leptos/meta", default-features = false }
 leptos_router = { path = "../../../leptos/router", default-features = false }
+leptos_reactive = { path = "../../../leptos/leptos_reactive", default-features = false }
 log = "0.4.17"
 simple_logger = "4.0.0"
 serde = { version = "1.0.148", features = ["derive"] }
@@ -38,17 +39,7 @@ sqlx = { version = "0.6.2", features = [
 default = ["csr"]
 csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
-ssr = [
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"dep:sqlx",
-	"leptos/ssr",
-	"leptos_meta/ssr",
-	"leptos_router/ssr",
-	"leptos_axum",
-]
+ssr = ["dep:axum", "dep:tower", "dep:tower-http", "dep:tokio", "dep:sqlx", "leptos/ssr", "leptos_meta/ssr", "leptos_router/ssr", "leptos_axum"]
 
 [package.metadata.cargo-all-features]
 denylist = [
@@ -72,9 +63,9 @@ 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 = "static/assets"
+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"	
+site-addr = "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.
@@ -103,4 +94,4 @@ 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
+lib-default-features = false

examples/todo_app_sqlite_axum/README.md

@@ -17,6 +17,9 @@ cargo install --locked cargo-leptos
 ```bash
 cargo leptos watch
 ```
+
+Open browser on [http://localhost:3000/](http://localhost:3000/)
+
 3. When ready to deploy, run
 ```bash
 cargo leptos build --release
@@ -25,7 +28,7 @@ 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
+0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. 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. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes.
 1. Install wasm-pack
 ```bash
 cargo install wasm-pack

examples/todo_app_sqlite_axum/src/error_template.rs

@@ -0,0 +1,28 @@
+use leptos::Errors;
+use leptos::{view, For, ForProps, IntoView, RwSignal, Scope, View};
+
+// A basic function to display errors served by the error boundaries. Feel free to do more complicated things
+// here than just displaying them
+pub fn error_template(cx: Scope, errors: Option<RwSignal<Errors>>) -> View {
+    let Some(errors) = errors else {
+        panic!("No Errors found and we expected errors!");
+    };
+    view! {cx,
+    <h1>"Errors"</h1>
+    <For
+        // a function that returns the items we're iterating over; a signal is fine
+        each= move || {errors.get().0.into_iter()}
+        // a unique key for each item as a reference
+        key=|error| error.0.clone()
+        // renders each item to a view
+        view= move |error| {
+        let error_string = error.1.to_string();
+          view! {
+            cx,
+            <p>"Error: " {error_string}</p>
+          }
+        }
+      />
+    }
+    .into_view(cx)
+}

examples/todo_app_sqlite_axum/src/fallback.rs

@@ -5,22 +5,26 @@ if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
         extract::Extension,
+        response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
+    use axum::response::Response as AxumResponse;
     use tower::ServiceExt;
     use tower_http::services::ServeDir;
     use std::sync::Arc;
-    use leptos::LeptosOptions;
-
-    pub async fn file_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>) -> Result<Response<BoxBody>, (StatusCode, String)> {
+    use leptos::{LeptosOptions};
+    use crate::error_template::error_template;
 
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
         let options = &*options;
         let root = options.site_root.clone();
-        let res = get_static_file(uri.clone(), &root).await?;
+        let res = get_static_file(uri.clone(), &root).await.unwrap();
 
-        match res.status() {
-            StatusCode::OK => Ok(res),
-            _ => Err((res.status(), "File Not Found".to_string()))
+        if res.status() == StatusCode::OK {
+           res.into_response()
+        } else{
+            let handler = leptos_axum::render_app_to_stream(options.to_owned(), |cx| error_template(cx, None));
+            handler(req).await.into_response()
         }
     }
 
@@ -37,5 +41,7 @@ if #[cfg(feature = "ssr")] {
             )),
         }
     }
+
+
 }
 }

examples/todo_app_sqlite_axum/src/lib.rs

@@ -1,6 +1,7 @@
 use cfg_if::cfg_if;
 use leptos::*;
-pub mod file;
+pub mod error_template;
+pub mod fallback;
 pub mod todo;
 
 // Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.

examples/todo_app_sqlite_axum/src/main.rs

@@ -4,15 +4,31 @@ use leptos::*;
 cfg_if! {
 if #[cfg(feature = "ssr")] {
     use axum::{
-        routing::post,
-        extract::Extension,
+        routing::{post, get},
+        extract::{Extension, Path},
+        http::Request,
+        body::StreamBody,
+        response::{IntoResponse, Response},
         Router,
     };
+    use axum::body::Body as AxumBody;
     use crate::todo::*;
     use todo_app_sqlite_axum::*;
-    use crate::file::file_handler;
+    use crate::fallback::file_and_error_handler;
     use leptos_axum::{generate_route_list, LeptosRoutes};
     use std::sync::Arc;
+    use leptos_reactive::run_scope;
+
+    //Define a handler to test extractor with state
+    async fn custom_handler(Path(id): Path<String>, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<AxumBody>) -> Response{
+            let handler = leptos_axum::render_app_to_stream_with_context((*options).clone(),
+            move |cx| {
+                provide_context(cx, id.clone());
+            },
+            |cx| view! { cx, <TodoApp/> }
+        );
+            handler(req).await.into_response()
+    }
 
     #[tokio::main]
     async fn main() {
@@ -26,7 +42,8 @@ if #[cfg(feature = "ssr")] {
 
         crate::todo::register_server_functions();
 
-        let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
+        // Setting this to None means we'll be using cargo-leptos and its env vars
+        let conf = get_configuration(None).await.unwrap();
         let leptos_options = conf.leptos_options;
         let addr = leptos_options.site_address.clone();
         let routes = generate_route_list(|cx| view! { cx, <TodoApp/> }).await;
@@ -34,8 +51,9 @@ if #[cfg(feature = "ssr")] {
         // build our application with a route
         let app = Router::new()
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
+        .route("/special/:id", get(custom_handler))
         .leptos_routes(leptos_options.clone(), routes, |cx| view! { cx, <TodoApp/> } )
-        .fallback(file_handler)
+        .fallback(file_and_error_handler)
         .layer(Extension(Arc::new(leptos_options)));
 
         // run our app with hyper

examples/todo_app_sqlite_axum/src/todo.rs

@@ -107,10 +107,12 @@ pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
 
 #[component]
 pub fn TodoApp(cx: Scope) -> impl IntoView {
+	let id = use_context::<String>(cx);
     provide_meta_context(cx);
     view! {
         cx,
-        <Stylesheet id="leptos" href="./pkg/todo_app_sqlite_axum.css"/>
+        <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
+        <Stylesheet id="leptos" href="/pkg/todo_app_sqlite_axum.css"/>
         <Router>
             <header>
                 <h1>"My Tasks"</h1>
@@ -119,7 +121,7 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
                 <Routes>
                     <Route path="" view=|cx| view! {
                         cx,
-                        <Todos/>
+                            <Todos/>
                     }/>
                 </Routes>
             </main>

examples/todomvc/README.md

@@ -0,0 +1,10 @@
+# Leptos TodoMVC
+
+This is a Leptos implementation of the TodoMVC example common to many frameworks. This is a relatively-simple application but shows off features like interaction between components and state management.
+
+## 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.
+
+> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

examples/todomvc/index.html

@@ -7,6 +7,7 @@
 		<link data-trunk rel="css" href="./node_modules/todomvc-app-css/index.css">
 		<title>Leptos • TodoMVC</title>
 		<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/todomvc/src/lib.rs

@@ -262,7 +262,7 @@ pub fn Todo(cx: Scope, todo: Todo) -> impl IntoView {
     let set_todos = use_context::<WriteSignal<Todos>>(cx).unwrap();
 
     // this will be filled by _ref=input below
-    let todo_input = NodeRef::new(cx);
+    let todo_input = NodeRef::<HtmlElement<Input>>::new(cx);
 
     let save = move |value: &str| {
         let value = value.trim();
@@ -293,7 +293,7 @@ pub fn Todo(cx: Scope, todo: Todo) -> impl IntoView {
                 />
                 <label on:dblclick=move |_| {
                     set_editing(true);
-            
+
                     if let Some(input) = todo_input.get() {
                         _ = input.focus();
                     }

integrations/actix/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "leptos_actix"
-version.workspace = true
+version = { workspace = true }
 edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
-repository = "https://github.com/gbj/leptos"
+repository = "https://github.com/leptos-rs/leptos"
 description = "Actix integrations for the Leptos web framework."
 
 [dependencies]

integrations/actix/src/lib.rs

@@ -1,10 +1,19 @@
+#![forbid(unsafe_code)]
+
+//! Provides functions to easily integrate Leptos with Actix.
+//!
+//! For more details on how to use the integrations, see the
+//! [`examples`](https://github.com/leptos-rs/leptos/tree/main/examples)
+//! directory in the Leptos repository.
+
 use actix_web::{
+    body::BoxBody,
     dev::{ServiceFactory, ServiceRequest},
     http::header,
     web::Bytes,
     *,
 };
-use futures::StreamExt;
+use futures::{Future, StreamExt};
 use http::StatusCode;
 use leptos::*;
 use leptos_meta::*;
@@ -65,8 +74,8 @@ impl ResponseOptions {
 }
 
 /// Provides an easy way to redirect the user from within a server function. Mimicing the Remix `redirect()`,
-/// it sets a StatusCode of 302 and a LOCATION header with the provided value.
-/// If looking to redirect from the client, `leptos_router::use_navigate()` should be used instead
+/// it sets a [StatusCode] of 302 and a [LOCATION](header::LOCATION) header with the provided value.
+/// If looking to redirect from the client, `leptos_router::use_navigate()` should be used instead.
 pub async fn redirect(cx: leptos::Scope, path: &str) {
     let response_options = use_context::<ResponseOptions>(cx).unwrap();
     response_options.set_status(StatusCode::FOUND).await;
@@ -111,10 +120,39 @@ pub async fn redirect(cx: leptos::Scope, path: &str) {
 /// }
 /// # }
 /// ```
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [ResponseOptions]
+/// - [HttpRequest](actix_web::HttpRequest)
 pub fn handle_server_fns() -> Route {
+    handle_server_fns_with_context(|_cx| {})
+}
+
+/// An Actix [Route](actix_web::Route) that listens for a `POST` request with
+/// Leptos server function arguments in the body, runs the server function if found,
+/// and returns the resulting [HttpResponse].
+///
+/// This provides the [HttpRequest] to the server [Scope](leptos::Scope).
+///
+/// This can then be set up at an appropriate route in your application:
+///
+/// This version allows you to pass in a closure that adds additional route data to the
+/// context, allowing you to pass in info about the route or user from Actix, or other info.
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [ResponseOptions]
+/// - [HttpRequest](actix_web::HttpRequest)
+pub fn handle_server_fns_with_context(
+    additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
+) -> Route {
     web::post().to(
-        |req: HttpRequest, params: web::Path<String>, body: web::Bytes| async move {
-            {
+        move |req: HttpRequest, params: web::Path<String>, body: web::Bytes| {
+            let additional_context = additional_context.clone();
+            async move {
+                let additional_context = additional_context.clone();
+
                 let path = params.into_inner();
                 let accept_header = req
                     .headers()
@@ -126,6 +164,9 @@ pub fn handle_server_fns() -> Route {
 
                     let runtime = create_runtime();
                     let (cx, disposer) = raw_scope_and_disposer(runtime);
+
+                    // Add additional info to the context of the server function
+                    additional_context(cx);
                     let res_options = ResponseOptions::default();
 
                     // provide HttpRequest as context in server scope
@@ -245,145 +286,294 @@ pub fn handle_server_fns() -> Route {
 /// }
 /// # }
 /// ```
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [ResponseOptions]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 pub fn render_app_to_stream<IV>(
     options: LeptosOptions,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
 ) -> Route
+where
+    IV: IntoView,
+{
+    render_app_to_stream_with_context(options, |_cx| {}, app_fn)
+}
+
+/// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
+/// to route it using [leptos_router], serving an HTML stream of your application.
+///
+/// This function allows you to provide additional information to Leptos for your route.
+/// It could be used to pass in Path Info, Connection Info, or anything your heart desires.
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [ResponseOptions]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
+pub fn render_app_to_stream_with_context<IV>(
+    options: LeptosOptions,
+    additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
+    app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
+) -> Route
 where
     IV: IntoView,
 {
     web::get().to(move |req: HttpRequest| {
         let options = options.clone();
         let app_fn = app_fn.clone();
+        let additional_context = additional_context.clone();
         let res_options = ResponseOptions::default();
-        let res_options_default = res_options.clone();
+
         async move {
-            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 = {
                 let app_fn = app_fn.clone();
+                let res_options = res_options.clone();
                 move |cx| {
-                    let integration = ServerIntegration { path: path.clone() };
-                    provide_context(cx, RouterIntegrationContext::new(integration));
-                    provide_context(cx, MetaContext::new());
-                    provide_context(cx, res_options_default.clone());
-                    provide_context(cx, req.clone());
-
+                    provide_contexts(cx, &req, res_options);
                     (app_fn)(cx).into_view(cx)
                 }
             };
 
-                // Because wasm-pack adds _bg to the end of the WASM filename, and we want to mantain compatibility with it's default options
-                // we add _bg to the wasm files if cargo-leptos doesn't set the env var OUTPUT_NAME
-                // Otherwise we need to add _bg because wasm_pack always does. This is not the same as options.output_name, which is set regardless
-                let output_name = &options.output_name;
-                let mut wasm_output_name = output_name.clone();
-                
-                if std::env::var("OUTPUT_NAME").is_err() {
-                    wasm_output_name.push_str("_bg");
-                }
-               
-                let site_ip = &options.site_address.ip().to_string();
-                let reload_port = options.reload_port;
-                let pkg_path = &options.site_pkg_dir;
-
-                let leptos_autoreload = match std::env::var("LEPTOS_WATCH").is_ok() {
-                    true => format!(
-                        r#"
-                        <script crossorigin="">(function () {{
-                            var ws = new WebSocket('ws://{site_ip}:{reload_port}/live_reload');
-                            ws.onmessage = (ev) => {{
-                                let msg = JSON.parse(ev.data);
-                                if (msg.all) window.location.reload();
-                                if (msg.css) {{
-                                    const link = document.querySelector("link#leptos");
-                                    if (link) {{
-                                        let href = link.getAttribute('href').split('?')[0];
-                                        let newHref = href + '?version=' + new Date().getMilliseconds();
-                                        link.setAttribute('href', newHref);
-                                    }} else {{
-                                        console.warn("Could not find link#leptos");
-                                    }}
-                                }};
-                            }};
-                            ws.onclose = () => console.warn('Live-reload stopped. Manual reload necessary.');
-                        }})()
-                        </script>
-                        "#
-                    ),
-                    false => "".to_string(),
-                };
-
-                let head = format!(
-                    r#"<!DOCTYPE html>
-                    <html lang="en">
-                        <head>
-                            <meta charset="utf-8"/>
-                            <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                            <link rel="modulepreload" href="/{pkg_path}/{output_name}.js">
-                            <link rel="preload" href="/{pkg_path}/{wasm_output_name}.wasm" as="fetch" type="application/wasm" crossorigin="">
-                            <script type="module">import init, {{ hydrate }} from '/{pkg_path}/{output_name}.js'; init('/{pkg_path}/{wasm_output_name}.wasm').then(hydrate);</script>
-                            {leptos_autoreload}
-                            "#
-                );
-                let tail = "</body></html>";
-
-            let (stream, runtime, _) = render_to_stream_with_prefix_undisposed(
-                app,
-                move |cx| {
-                    let head = use_context::<MetaContext>(cx)
-                        .map(|meta| meta.dehydrate())
-                        .unwrap_or_default();
-                    format!("{head}</head><body>").into()
-                });
-
-            let mut stream = Box::pin(futures::stream::once(async move { head.clone() }) 
-                .chain(stream)
-                .chain(futures::stream::once(async move {
-                    runtime.dispose();
-                    tail.to_string()
-                }))
-                .map(|html| Ok(web::Bytes::from(html)) as Result<web::Bytes>));
-
-            // Get the first, second, and third chunks in the stream, which renders the app shell, and thus allows Resources to run
-            let first_chunk = stream.next().await;
-            let second_chunk = stream.next().await;
-            let third_chunk = stream.next().await;
-
-            let res_options = res_options.0.read().await;
-
-            let (status, mut headers) = (res_options.status, res_options.headers.clone());
-            let status = status.unwrap_or_default();
-            
-            let complete_stream =
-            futures::stream::iter([first_chunk.unwrap(), second_chunk.unwrap(), third_chunk.unwrap()])
-                .chain(stream);
-            let mut res = HttpResponse::Ok().content_type("text/html").streaming(
-                complete_stream
-            );
-            // Add headers manipulated in the response
-            for (key, value) in headers.drain(){
-                if let Some(key) = key{
-                res.headers_mut().append(key, value);
-                }
-            };
-            // Set status to what is returned in the function
-            let res_status = res.status_mut();
-            *res_status = status;
-            // Return the response
-            res
+            let (head, tail) = html_parts(&options);
 
+            stream_app(app, head, tail, res_options, additional_context).await
         }
     })
 }
 
+/// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
+/// to route it using [leptos_router], serving an HTML stream of your application.
+///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_stream], and includes everything described in
+/// the documentation for that function.
+///
+/// This can then be set up at an appropriate route in your application:
+/// ```
+/// use actix_web::{HttpServer, App};
+/// use leptos::*;
+/// use std::{env,net::SocketAddr};
+/// use leptos_actix::DataResponse;
+///
+/// #[component]
+/// fn MyApp(cx: Scope, data: &'static str) -> impl IntoView {
+///   view! { cx, <main>"Hello, world!"</main> }
+/// }
+///
+/// # if false { // don't actually try to run a server in a doctest...
+/// #[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();
+///     HttpServer::new(move || {
+///         let leptos_options = &conf.leptos_options;
+///     
+///         App::new()
+///             // {tail:.*} passes the remainder of the URL as the route
+///             // the actual routing will be handled by `leptos_router`
+///             .route("/{tail:.*}", leptos_actix::render_preloaded_data_app(
+///                 leptos_options.to_owned(),
+///                 |req| async move { Ok(DataResponse::Data("async func that can preload data")) },
+///                 |cx, data| view! { cx, <MyApp data/> })
+///             )
+///     })
+///     .bind(&addr)?
+///     .run()
+///     .await
+/// }
+/// # }
+/// ```
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [ResponseOptions]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
+pub fn render_preloaded_data_app<Data, Fut, IV>(
+    options: LeptosOptions,
+    data_fn: impl Fn(HttpRequest) -> Fut + Clone + 'static,
+    app_fn: impl Fn(leptos::Scope, Data) -> IV + Clone + Send + 'static,
+) -> Route
+where
+    Data: 'static,
+    Fut: Future<Output = Result<DataResponse<Data>, actix_web::Error>>,
+    IV: IntoView + 'static,
+{
+    web::get().to(move |req: HttpRequest| {
+        let options = options.clone();
+        let app_fn = app_fn.clone();
+        let data_fn = data_fn.clone();
+        let res_options = ResponseOptions::default();
+
+        async move {
+            let data = match data_fn(req.clone()).await {
+                Err(e) => return HttpResponse::from_error(e),
+                Ok(DataResponse::Response(r)) => return r.into(),
+                Ok(DataResponse::Data(d)) => d,
+            };
+
+            let app = {
+                let app_fn = app_fn.clone();
+                let res_options = res_options.clone();
+                move |cx| {
+                    provide_contexts(cx, &req, res_options);
+                    (app_fn)(cx, data).into_view(cx)
+                }
+            };
+
+            let (head, tail) = html_parts(&options);
+
+            stream_app(app, head, tail, res_options, |_cx| {}).await
+        }
+    })
+}
+
+fn provide_contexts(cx: leptos::Scope, req: &HttpRequest, res_options: ResponseOptions) {
+    let path = leptos_corrected_path(req);
+
+    let integration = ServerIntegration { path };
+    provide_context(cx, RouterIntegrationContext::new(integration));
+    provide_context(cx, MetaContext::new());
+    provide_context(cx, res_options);
+    provide_context(cx, req.clone());
+}
+
+fn leptos_corrected_path(req: &HttpRequest) -> String {
+    let path = req.path();
+    let query = req.query_string();
+    if query.is_empty() {
+        "http://leptos".to_string() + path
+    } else {
+        "http://leptos".to_string() + path + "?" + query
+    }
+}
+
+async fn stream_app(
+    app: impl FnOnce(leptos::Scope) -> View + 'static,
+    head: String,
+    tail: String,
+    res_options: ResponseOptions,
+    additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
+) -> HttpResponse<BoxBody> {
+    let (stream, runtime, _) = render_to_stream_with_prefix_undisposed_with_context(
+        app,
+        move |cx| {
+            let head = use_context::<MetaContext>(cx)
+                .map(|meta| meta.dehydrate())
+                .unwrap_or_default();
+            format!("{head}</head><body>").into()
+        },
+        additional_context,
+    );
+
+    let mut stream = Box::pin(
+        futures::stream::once(async move { head.clone() })
+            .chain(stream)
+            .chain(futures::stream::once(async move {
+                runtime.dispose();
+                tail.to_string()
+            }))
+            .map(|html| Ok(web::Bytes::from(html)) as Result<web::Bytes>),
+    );
+
+    // Get the first, second, and third chunks in the stream, which renders the app shell, and thus allows Resources to run
+    let first_chunk = stream.next().await;
+    let second_chunk = stream.next().await;
+    let third_chunk = stream.next().await;
+
+    let res_options = res_options.0.read().await;
+
+    let (status, mut headers) = (res_options.status, res_options.headers.clone());
+    let status = status.unwrap_or_default();
+
+    let complete_stream = futures::stream::iter([
+        first_chunk.unwrap(),
+        second_chunk.unwrap(),
+        third_chunk.unwrap(),
+    ])
+    .chain(stream);
+    let mut res = HttpResponse::Ok()
+        .content_type("text/html")
+        .streaming(complete_stream);
+    // Add headers manipulated in the response
+    for (key, value) in headers.drain() {
+        if let Some(key) = key {
+            res.headers_mut().append(key, value);
+        }
+    }
+    // Set status to what is returned in the function
+    let res_status = res.status_mut();
+    *res_status = status;
+    // Return the response
+    res
+}
+
+fn html_parts(options: &LeptosOptions) -> (String, String) {
+    // Because wasm-pack adds _bg to the end of the WASM filename, and we want to mantain compatibility with it's default options
+    // we add _bg to the wasm files if cargo-leptos doesn't set the env var LEPTOS_OUTPUT_NAME
+    // Otherwise we need to add _bg because wasm_pack always does. This is not the same as options.output_name, which is set regardless
+    let output_name = &options.output_name;
+    let mut wasm_output_name = output_name.clone();
+    if std::env::var("LEPTOS_OUTPUT_NAME").is_err() {
+        wasm_output_name.push_str("_bg");
+    }
+
+    let site_ip = &options.site_address.ip().to_string();
+    let reload_port = options.reload_port;
+    let pkg_path = &options.site_pkg_dir;
+
+    let leptos_autoreload = match std::env::var("LEPTOS_WATCH").is_ok() {
+        true => format!(
+            r#"
+            <script crossorigin="">(function () {{
+                var ws = new WebSocket('ws://{site_ip}:{reload_port}/live_reload');
+                ws.onmessage = (ev) => {{
+                    let msg = JSON.parse(ev.data);
+                    if (msg.all) window.location.reload();
+                    if (msg.css) {{
+                        const link = document.querySelector("link#leptos");
+                        if (link) {{
+                            let href = link.getAttribute('href').split('?')[0];
+                            let newHref = href + '?version=' + new Date().getMilliseconds();
+                            link.setAttribute('href', newHref);
+                        }} else {{
+                            console.warn("Could not find link#leptos");
+                        }}
+                    }};
+                }};
+                ws.onclose = () => console.warn('Live-reload stopped. Manual reload necessary.');
+            }})()
+            </script>
+            "#
+        ),
+        false => "".to_string(),
+    };
+
+    let head = format!(
+        r#"<!DOCTYPE html>
+        <html lang="en">
+            <head>
+                <meta charset="utf-8"/>
+                <meta name="viewport" content="width=device-width, initial-scale=1"/>
+                <link rel="modulepreload" href="/{pkg_path}/{output_name}.js">
+                <link rel="preload" href="/{pkg_path}/{wasm_output_name}.wasm" as="fetch" type="application/wasm" crossorigin="">
+                <script type="module">import init, {{ hydrate }} from '/{pkg_path}/{output_name}.js'; init('/{pkg_path}/{wasm_output_name}.wasm').then(hydrate);</script>
+                {leptos_autoreload}
+                "#
+    );
+    let tail = "</body></html>".to_string();
+
+    (head, tail)
+}
+
 /// Generates a list of all routes defined in Leptos's Router in your app. We can then use this to automatically
 /// create routes in Actix's App without having to use wildcard matching or fallbacks. Takes in your root app Element
 /// as an argument so it can walk you app tree. This version is tailored to generated Actix compatible paths.
@@ -409,11 +599,23 @@ where
     let wildcard_re = Regex::new(r"\*.*").unwrap();
     // Match `:some_word` but only capture `some_word` in the groups to replace with `{some_word}`
     let capture_re = Regex::new(r":((?:[^.,/]+)+)[^/]?").unwrap();
-    routes
+
+    let routes: Vec<String> = routes
         .iter()
         .map(|s| wildcard_re.replace_all(s, "{tail:.*}").to_string())
         .map(|s| capture_re.replace_all(&s, "{$1}").to_string())
-        .collect()
+        .collect();
+
+    if routes.is_empty() {
+        vec!["/".to_string()]
+    } else {
+        routes
+    }
+}
+
+pub enum DataResponse<T> {
+    Data(T),
+    Response(actix_web::dev::Response<BoxBody>),
 }
 
 /// This trait allows one to pass a list of routes and a render function to Axum's router, letting us avoid
@@ -427,7 +629,20 @@ pub trait LeptosRoutes {
     ) -> Self
     where
         IV: IntoView + 'static;
+
+    fn leptos_preloaded_data_routes<Data, Fut, IV>(
+        self,
+        options: LeptosOptions,
+        paths: Vec<String>,
+        data_fn: impl Fn(HttpRequest) -> Fut + Clone + 'static,
+        app_fn: impl Fn(leptos::Scope, Data) -> IV + Clone + Send + 'static,
+    ) -> Self
+    where
+        Data: 'static,
+        Fut: Future<Output = Result<DataResponse<Data>, actix_web::Error>>,
+        IV: IntoView + 'static;
 }
+
 /// The default implementation of `LeptosRoutes` which takes in a list of paths, and dispatches GET requests
 /// to those paths to Leptos's renderer.
 impl<T> LeptosRoutes for actix_web::App<T>
@@ -449,4 +664,27 @@ where
         }
         router
     }
+
+    fn leptos_preloaded_data_routes<Data, Fut, IV>(
+        self,
+        options: LeptosOptions,
+        paths: Vec<String>,
+        data_fn: impl Fn(HttpRequest) -> Fut + Clone + 'static,
+        app_fn: impl Fn(leptos::Scope, Data) -> IV + Clone + Send + 'static,
+    ) -> Self
+    where
+        Data: 'static,
+        Fut: Future<Output = Result<DataResponse<Data>, actix_web::Error>>,
+        IV: IntoView + 'static,
+    {
+        let mut router = self;
+
+        for path in paths.iter() {
+            router = router.route(
+                path,
+                render_preloaded_data_app(options.clone(), data_fn.clone(), app_fn.clone()),
+            );
+        }
+        router
+    }
 }

integrations/axum/Cargo.toml

@@ -1,21 +1,19 @@
 [package]
 name = "leptos_axum"
-version.workspace = true
+version = { workspace = true }
 edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
-repository = "https://github.com/gbj/leptos"
+repository = "https://github.com/leptos-rs/leptos"
 description = "Axum integrations for the Leptos web framework."
 
 [dependencies]
 axum = { version = "0.6", features = ["macros"] }
-derive_builder = "0.12.0"
 futures = "0.3"
 http = "0.2.8"
 hyper = "0.14.23"
-kdl = "4.6.0"
 leptos = { workspace = true, features = ["ssr"] }
 leptos_meta = { workspace = true, features = ["ssr"] }
 leptos_router = { workspace = true, features = ["ssr"] }
-leptos_config.workspace = true
+leptos_config = { workspace = true }
 tokio = { version = "1.0", features = ["full"] }

integrations/axum/src/lib.rs

@@ -1,3 +1,11 @@
+#![forbid(unsafe_code)]
+
+//! Provides functions to easily integrate Leptos with Axum.
+//!
+//! For more details on how to use the integrations, see the
+//! [`examples`](https://github.com/leptos-rs/leptos/tree/main/examples)
+//! directory in the Leptos repository.
+
 use axum::{
     body::{Body, Bytes, Full, StreamBody},
     extract::Path,
@@ -89,6 +97,8 @@ pub async fn redirect(cx: leptos::Scope, path: &str) {
         .await;
 }
 
+/// Decomposes an HTTP request into its parts, allowing you to read its headers
+/// and other data without consuming the body.
 pub async fn generate_request_parts(req: Request<Body>) -> RequestParts {
     // provide request headers as context in server scope
     let (parts, body) = req.into_parts();
@@ -105,8 +115,6 @@ pub async fn generate_request_parts(req: Request<Body>) -> RequestParts {
 /// An Axum handlers to listens for a request with Leptos server function arguments in the body,
 /// run the server function if found, and return the resulting [Response].
 ///
-/// This provides an `Arc<[Request<Body>](axum::http::Request)>` [Scope](leptos::Scope).
-///
 /// This can then be set up at an appropriate route in your application:
 ///
 /// ```
@@ -134,16 +142,53 @@ pub async fn generate_request_parts(req: Request<Body>) -> RequestParts {
 /// ```
 /// Leptos provides a generic implementation of `handle_server_fns`. If access to more specific parts of the Request is desired,
 /// you can specify your own server fn handler based on this one and give it it's own route in the server macro.
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [RequestParts]
+/// - [ResponseOptions]
 pub async fn handle_server_fns(
     Path(fn_name): Path<String>,
     headers: HeaderMap,
     req: Request<Body>,
+) -> impl IntoResponse {
+    handle_server_fns_inner(fn_name, headers, |_| {}, req).await
+}
+
+/// An Axum handlers to listens for a request with Leptos server function arguments in the body,
+/// run the server function if found, and return the resulting [Response].
+///
+/// This can then be set up at an appropriate route in your application:
+///
+/// This version allows you to pass in a closure to capture additional data from the layers above leptos
+/// and store it in context. To use it, you'll need to define your own route, and a handler function
+/// that takes in the data you'd like. See the [render_app_to_stream_with_context] docs for an example
+/// of one that should work much like this one.
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [RequestParts]
+/// - [ResponseOptions]
+pub async fn handle_server_fns_with_context(
+    Path(fn_name): Path<String>,
+    headers: HeaderMap,
+    additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
+    req: Request<Body>,
+) -> impl IntoResponse {
+    handle_server_fns_inner(fn_name, headers, additional_context, req).await
+}
+
+async fn handle_server_fns_inner(
+    fn_name: String,
+    headers: HeaderMap,
+    additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
+    req: Request<Body>,
 ) -> impl IntoResponse {
     // Axum Path extractor doesn't remove the first slash from the path, while Actix does
-    let fn_name: String = match fn_name.strip_prefix('/') {
-        Some(path) => path.to_string(),
-        None => fn_name,
-    };
+    let fn_name = fn_name
+        .strip_prefix('/')
+        .map(|fn_name| fn_name.to_string())
+        .unwrap_or(fn_name);
 
     let (tx, rx) = futures::channel::oneshot::channel();
     spawn_blocking({
@@ -156,6 +201,8 @@ pub async fn handle_server_fns(
                             let runtime = create_runtime();
                             let (cx, disposer) = raw_scope_and_disposer(runtime);
 
+                            additional_context(cx);
+
                             let req_parts = generate_request_parts(req).await;
                             // Add this so we can get details about the Request
                             provide_context(cx, req_parts.clone());
@@ -164,7 +211,7 @@ pub async fn handle_server_fns(
 
                             match server_fn(cx, &req_parts.body).await {
                                 Ok(serialized) => {
-                                    // If ResponseParts are set, add the headers and extension to the request
+                                    // If ResponseOptions are set, add the headers and status to the request
                                     let res_options = use_context::<ResponseOptions>(cx);
 
                                     // clean up the scope, which we only needed to run the server fn
@@ -297,6 +344,12 @@ pub type PinnedHtmlStream = Pin<Box<dyn Stream<Item = io::Result<Bytes>> + Send>
 /// # }
 /// ```
 ///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [RequestParts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 pub fn render_app_to_stream<IV>(
     options: LeptosOptions,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
@@ -308,18 +361,62 @@ pub fn render_app_to_stream<IV>(
        + 'static
 where
     IV: IntoView,
+{
+    render_app_to_stream_with_context(options, |_| {}, app_fn)
+}
+
+/// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
+/// to route it using [leptos_router], serving an HTML stream of your application.
+///
+/// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
+/// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
+/// the data to leptos in a closure. An example is below
+/// ```ignore
+/// async fn custom_handler(Path(id): Path<String>, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> Response{
+///     let handler = leptos_axum::render_app_to_stream_with_context((*options).clone(),
+///     move |cx| {
+///         provide_context(cx, id.clone());
+///     },
+///     |cx| view! { cx, <TodoApp/> }
+/// );
+///     handler(req).await.into_response()
+/// }
+/// ```
+/// Otherwise, this function is identical to [render_app_to_stream].
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [RequestParts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
+pub fn render_app_to_stream_with_context<IV>(
+    options: LeptosOptions,
+    additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
+    app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
+) -> impl Fn(
+    Request<Body>,
+) -> Pin<Box<dyn Future<Output = Response<StreamBody<PinnedHtmlStream>>> + Send + 'static>>
+       + Clone
+       + Send
+       + 'static
+where
+    IV: IntoView,
 {
     move |req: Request<Body>| {
         Box::pin({
             let options = options.clone();
             let app_fn = app_fn.clone();
+            let add_context = additional_context.clone();
             let default_res_options = ResponseOptions::default();
             let res_options2 = default_res_options.clone();
             let res_options3 = default_res_options.clone();
 
             async move {
                 // Need to get the path and query string of the Request
-                let path = req.uri();
+                // For reasons that escape me, if the incoming URI protocol is https, it provides the absolute URI
+                // if http, it returns a relative path. Adding .path() seems to make it explicitly return the relative uri
+                let path = req.uri().path_and_query().unwrap().as_str();
 
                 let full_path = format!("http://leptos.dev{path}");
 
@@ -327,10 +424,10 @@ where
                 let output_name = &options.output_name;
 
                 // Because wasm-pack adds _bg to the end of the WASM filename, and we want to mantain compatibility with it's default options
-                // we add _bg to the wasm files if cargo-leptos doesn't set the env var OUTPUT_NAME
+                // we add _bg to the wasm files if cargo-leptos doesn't set the env var LEPTOS_OUTPUT_NAME
                 // Otherwise we need to add _bg because wasm_pack always does. This is not the same as options.output_name, which is set regardless
                 let mut wasm_output_name = output_name.clone();
-                if std::env::var("OUTPUT_NAME").is_err() {
+                if std::env::var("LEPTOS_OUTPUT_NAME").is_err() {
                     wasm_output_name.push_str("_bg");
                 }
 
@@ -382,11 +479,13 @@ where
 
                 spawn_blocking({
                     let app_fn = app_fn.clone();
+                    let add_context = add_context.clone();
                     move || {
                         tokio::runtime::Runtime::new()
                             .expect("couldn't spawn runtime")
                             .block_on({
                                 let app_fn = app_fn.clone();
+                                let add_context = add_context.clone();
                                 async move {
                                     tokio::task::LocalSet::new()
                                         .run_until(async {
@@ -409,7 +508,7 @@ where
                                             };
 
                                             let (bundle, runtime, scope) =
-                                                render_to_stream_with_prefix_undisposed(
+                                                render_to_stream_with_prefix_undisposed_with_context(
                                                     app,
                                                     |cx| {
                                                         let head = use_context::<MetaContext>(cx)
@@ -417,6 +516,7 @@ where
                                                             .unwrap_or_default();
                                                         format!("{head}</head><body>").into()
                                                     },
+                                                    add_context,
                                                 );
                                             let mut shell = Box::pin(bundle);
                                             while let Some(fragment) = shell.next().await {
@@ -511,15 +611,16 @@ where
 
     let routes = routes.0.read().await.to_owned();
     // Axum's Router defines Root routes as "/" not ""
-    routes
-        .iter()
-        .map(|s| {
-            if s.is_empty() {
-                return "/".to_string();
-            }
-            s.to_string()
-        })
-        .collect()
+    let routes: Vec<String> = routes
+        .into_iter()
+        .map(|s| if s.is_empty() { "/".to_string() } else { s })
+        .collect();
+
+    if routes.is_empty() {
+        vec!["/".to_string()]
+    } else {
+        routes
+    }
 }
 
 /// This trait allows one to pass a list of routes and a render function to Axum's router, letting us avoid

leptos/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos"
-version.workspace = true
+version = { workspace = true }
 edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
@@ -10,43 +10,24 @@ readme = "../README.md"
 
 [dependencies]
 cfg-if = "1"
-leptos_dom.workspace = true
-leptos_macro.workspace = true
-leptos_reactive.workspace = true
-leptos_server.workspace = true
-leptos_config.workspace = true
+leptos_dom = { workspace = true }
+leptos_macro = { workspace = true }
+leptos_reactive = { workspace = true }
+leptos_server = { workspace = true }
+leptos_config = { workspace = true }
 tracing = "0.1"
 typed-builder = "0.11"
+once_cell = "1.17.0"
 
 [dev-dependencies]
 leptos = { path = ".", default-features = false }
 
 [features]
 default = ["csr", "serde"]
-csr = [
-  "leptos_dom/web",
-  "leptos_macro/csr",
-  "leptos_reactive/csr",
-  "leptos_server/csr",
-]
-hydrate = [
-  "leptos_dom/web",
-  "leptos_macro/hydrate",
-  "leptos_reactive/hydrate",
-  "leptos_server/hydrate",
-]
-ssr = [
-  "leptos_dom/ssr",
-  "leptos_macro/ssr",
-  "leptos_reactive/ssr",
-  "leptos_server/ssr",
-]
-stable = [
-  "leptos_dom/stable",
-  "leptos_macro/stable",
-  "leptos_reactive/stable",
-  "leptos_server/stable",
-]
+csr = ["leptos_dom/web", "leptos_macro/csr", "leptos_reactive/csr", "leptos_server/csr"]
+hydrate = ["leptos_dom/web", "leptos_macro/hydrate", "leptos_reactive/hydrate", "leptos_server/hydrate"]
+ssr = ["leptos_dom/ssr", "leptos_macro/ssr", "leptos_reactive/ssr", "leptos_server/ssr"]
+stable = ["leptos_dom/stable", "leptos_macro/stable", "leptos_reactive/stable", "leptos_server/stable"]
 serde = ["leptos_reactive/serde"]
 serde-lite = ["leptos_reactive/serde-lite"]
 miniserde = ["leptos_reactive/miniserde"]

leptos/src/error_boundary.rs

@@ -0,0 +1,28 @@
+use leptos_dom::{Errors, Fragment, IntoView};
+use leptos_macro::component;
+use leptos_reactive::{create_rw_signal, provide_context, RwSignal, Scope};
+
+#[component(transparent)]
+pub fn ErrorBoundary<F, IV>(
+    cx: Scope,
+    /// The components inside the tag which will get rendered
+    children: Box<dyn FnOnce(Scope) -> Fragment>,
+    /// A fallback that will be shown if an error occurs.
+    fallback: F,
+) -> impl IntoView
+where
+    F: Fn(Scope, Option<RwSignal<Errors>>) -> IV + 'static,
+    IV: IntoView,
+{
+    let errors: RwSignal<Errors> = create_rw_signal(cx, Errors::default());
+
+    provide_context(cx, errors);
+
+    // Run children so that they render and execute resources
+    let children = children(cx);
+
+    move || match errors.get().0.is_empty() {
+        true => children.clone().into_view(cx),
+        false => fallback(cx, Some(errors)).into_view(cx),
+    }
+}

leptos/src/lib.rs

@@ -1,4 +1,5 @@
 #![deny(missing_docs)]
+#![forbid(unsafe_code)]
 
 //! # About Leptos
 //!
@@ -7,9 +8,8 @@
 //!   or mutating data via async requests to the server
 //! - multi-page apps (MPAs) rendered on the server, managing navigation, data, and mutations via
 //!   web-standard `<a>` and `<form>` tags
-//! - progressively-enhanced multi-page apps ([PEMPAs](https://www.epicweb.dev/the-webs-next-transition)?)
-//!   that are rendered on the server and then hydrated on the client, enhancing your `<a>` and `<form>`
-//!   navigations and mutations seamlessly when WASM is available.
+//! - progressively-enhanced single-page apps that are rendered on the server and then hydrated on the client,
+//!   enhancing your `<a>` and `<form>` navigations and mutations seamlessly when WASM is available.
 //!
 //! And you can do all three of these **using the same Leptos code.**
 //!
@@ -18,38 +18,51 @@
 //! 1. You need to enable the `"stable"` flag in `Cargo.toml`: `leptos = { version = "0.0", 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)
+//!    [`counters_stable` example](https://github.com/leptos-rs/leptos/blob/main/examples/counters_stable/src/main.rs)
 //!    for examples of the correct API.
 //!
 //! # Learning by Example
 //!
-//! These docs are a work in progress. If you want to see what Leptos is capable of, check out
-//! the [examples](https://github.com/gbj/leptos/tree/main/examples):
-//! - [`counter`](https://github.com/gbj/leptos/tree/main/examples/counter) is the classic
+//! If you want to see what Leptos is capable of, check out
+//! the [examples](https://github.com/leptos-rs/leptos/tree/main/examples):
+//! - [`counter`](https://github.com/leptos-rs/leptos/tree/main/examples/counter) is the classic
 //!   counter example, showing the basics of client-side rendering and reactive DOM updates
-//! - [`counters`](https://github.com/gbj/leptos/tree/main/examples/counter) introduces parent-child
+//! - [`counter_without_macros`](https://github.com/leptos-rs/leptos/tree/main/examples/counter_without_macros)
+//!   adapts the counter example to use the builder pattern for the UI and avoids other macros, instead showing
+//!   the code that Leptos generates.
+//! - [`counters`](https://github.com/leptos-rs/leptos/tree/main/examples/counters) introduces parent-child
 //!   communication via contexts, and the `<For/>` component for efficient keyed list updates.
-//! - [`parent_child`](https://github.com/gbj/leptos/tree/main/examples/parent_child) shows four different
+//! - [`counters_stable`](https://github.com/leptos-rs/leptos/tree/main/examples/counters_stable) adapts the `counters` example
+//!   to show how to use Leptos with `stable` Rust.
+//! - [`parent_child`](https://github.com/leptos-rs/leptos/tree/main/examples/parent_child) shows four different
 //!   ways a parent component can communicate with a child, including passing a closure, context, and more
-//! - [`todomvc`](https://github.com/gbj/leptos/tree/main/examples/todomvc) implements the classic to-do
+//! - [`todomvc`](https://github.com/leptos-rs/leptos/tree/main/examples/todomvc) implements the classic to-do
 //!   app in Leptos. This is a good example of a complete, simple app. In particular, you might want to
-//!   see how we use [create_effect] to [serialize JSON to `localStorage`](https://github.com/gbj/leptos/blob/16f084a71268ac325fbc4a5e50c260df185eadb6/examples/todomvc/src/lib.rs#L164)
-//!   and [reactively call DOM methods](https://github.com/gbj/leptos/blob/6d7c36655c9e7dcc3a3ad33d2b846a3f00e4ae74/examples/todomvc/src/lib.rs#L291)
-//!   on [references to elements](https://github.com/gbj/leptos/blob/6d7c36655c9e7dcc3a3ad33d2b846a3f00e4ae74/examples/todomvc/src/lib.rs#L254).
-//! - [`fetch`](https://github.com/gbj/leptos/tree/main/examples/fetch) introduces
+//!   see how we use [create_effect] to [serialize JSON to `localStorage`](https://github.com/leptos-rs/leptos/blob/16f084a71268ac325fbc4a5e50c260df185eadb6/examples/todomvc/src/lib.rs#L164)
+//!   and [reactively call DOM methods](https://github.com/leptos-rs/leptos/blob/6d7c36655c9e7dcc3a3ad33d2b846a3f00e4ae74/examples/todomvc/src/lib.rs#L291)
+//!   on [references to elements](https://github.com/leptos-rs/leptos/blob/6d7c36655c9e7dcc3a3ad33d2b846a3f00e4ae74/examples/todomvc/src/lib.rs#L254).
+//! - [`fetch`](https://github.com/leptos-rs/leptos/tree/main/examples/fetch) introduces
 //!   [Resource](leptos_reactive::Resource)s, which allow you to integrate arbitrary `async` code like an
 //!   HTTP request within your reactive code.
-//! - [`router`](https://github.com/gbj/leptos/tree/main/examples/router) shows how to use Leptos’s nested router
+//! - [`router`](https://github.com/leptos-rs/leptos/tree/main/examples/router) shows how to use Leptos’s nested router
 //!   to enable client-side navigation and route-specific, reactive data loading.
-//! - [`todomvc`](https://github.com/gbj/leptos/tree/main/examples/todomvc) shows the basics of building an
+//! - [`counter_isomorphic`](https://github.com/leptos-rs/leptos/tree/main/examples/counter_isomorphic) shows
+//!   different methods of interaction with a stateful server, including server functions, server actions, forms,
+//!   and server-sent events (SSE).
+//! - [`todomvc`](https://github.com/leptos-rs/leptos/tree/main/examples/todomvc) shows the basics of building an
 //!   isomorphic web app. Both the server and the client import the same app code from the `todomvc` example.
 //!   The server renders the app directly to an HTML string, and the client hydrates that HTML to make it interactive.
-//! - [`hackernews`](https://github.com/gbj/leptos/tree/main/examples/hackernews) pulls everything together.
-//!   It integrates calls to a real external REST API, routing, server-side rendering and hydration to create
-//!   a fully-functional PEMPA that works as intended even before WASM has loaded and begun to run.
+//! - [`hackernews`](https://github.com/leptos-rs/leptos/tree/main/examples/hackernews)
+//!   and [`hackernews_axum`](https://github.com/leptos-rs/leptos/tree/main/examples/hackernews_axum)
+//!   integrate calls to a real external REST API, routing, server-side rendering and hydration to create
+//!   a fully-functional that works as intended even before WASM has loaded and begun to run.
+//! - [`todo_app_sqlite`](https://github.com/leptos-rs/leptos/tree/main/examples/todo_app_sqlite) and
+//!   [`todo_app_sqlite_axum`](https://github.com/leptos-rs/leptos/tree/main/examples/todo_app_sqlite_axum)
+//!   show how to build a full-stack app using server functions and database connections.
+//! - [`tailwind`](https://github.com/leptos-rs/leptos/tree/main/examples/tailwind) shows how to integrate
+//!   TailwindCSS with `cargo-leptos`.
 //!
-//! (The SPA examples can be run using `trunk serve`. For information about Trunk,
-//! [see here]((https://trunkrs.dev/)).)
+//! Details on how to run each example can be found in its README.
 //!
 //! # Quick Links
 //!
@@ -137,9 +150,12 @@ pub use leptos_server::*;
 
 pub use tracing;
 pub use typed_builder;
-
+mod error_boundary;
+pub use error_boundary::*;
 mod for_loop;
+mod show;
 pub use for_loop::*;
+pub use show::*;
 mod suspense;
 pub use suspense::*;
 mod transition;

leptos/src/show.rs

@@ -0,0 +1,32 @@
+use leptos::component;
+use leptos_dom::{Fragment, IntoView};
+use leptos_reactive::Scope;
+use once_cell::sync::Lazy;
+
+/// A component that will show it's children when the passed in closure is True, and show the fallback
+/// when the closure is false
+#[component]
+pub fn Show<F, W, IV>(
+    /// The scope the component is running in
+    cx: Scope,
+    /// The components Show wraps
+    children: Box<dyn FnOnce(Scope) -> Fragment>,
+    /// A closure that returns a bool that determines whether this thing runs
+    when: W,
+    /// A closure that returns what gets rendered if the when statement is false
+    fallback: F,
+) -> impl IntoView
+where
+    W: Fn() -> bool + 'static,
+    F: Fn(Scope) -> IV + 'static,
+    IV: IntoView,
+{
+    // now you don't render until `when` is actually true
+    let children = Lazy::new(move || children(cx).into_view(cx));
+    let fallback = Lazy::new(move || fallback(cx).into_view(cx));
+
+    move || match when() {
+        true => children.clone(),
+        false => fallback.clone(),
+    }
+}

leptos/src/suspense.rs

@@ -1,7 +1,6 @@
 use cfg_if::cfg_if;
-use leptos_dom::{Component, DynChild, Fragment, IntoView};
-#[cfg(not(any(feature = "csr", feature = "hydrate")))]
-use leptos_dom::{HydrationCtx, HydrationKey};
+use leptos_dom::HydrationCtx;
+use leptos_dom::{DynChild, Fragment, IntoView};
 use leptos_macro::component;
 use leptos_reactive::{provide_context, Scope, SuspenseContext};
 use std::rc::Rc;
@@ -73,11 +72,12 @@ where
 
     let orig_child = Rc::new(children);
 
-    Component::new("Suspense", move |cx| {
-        #[cfg(not(any(feature = "csr", feature = "hydrate")))]
-        let current_id = HydrationCtx::peek();
+    let current_id = HydrationCtx::peek();
 
-        DynChild::new(move || {
+    let child = DynChild::new({
+        #[cfg(not(any(feature = "csr", feature = "hydrate")))]
+        let current_id = current_id.clone();
+        move || {
             cfg_if! {
                 if #[cfg(any(feature = "csr", feature = "hydrate"))] {
                     if context.ready() {
@@ -104,13 +104,9 @@ where
                                 &current_id.to_string(),
                                 {
                                     let current_id = current_id.clone();
-                                    let fragment_id = HydrationKey {
-                                        previous: current_id.previous,
-                                        offset: current_id.offset + 1
-                                    };
                                     move || {
-                                        HydrationCtx::continue_from(fragment_id);
-                                        orig_child(cx)
+                                        HydrationCtx::continue_from(current_id.clone());
+                                        DynChild::new(move || orig_child(cx))
                                             .into_view(cx)
                                             .render_to_string(cx)
                                             .to_string()
@@ -128,6 +124,13 @@ where
                     initial
                 }
             }
-        })
+        }
     })
+    .into_view(cx);
+    let core_component = match child {
+        leptos_dom::View::CoreComponent(repr) => repr,
+        _ => unreachable!(),
+    };
+
+    leptos_dom::View::Suspense(current_id, core_component)
 }

leptos/tests/ssr.rs

@@ -16,7 +16,7 @@ fn simple_ssr_test() {
 
         assert_eq!(
             rendered.into_view(cx).render_to_string(cx),
-            "<div id=\"_0-1\"><button id=\"_0-2\">-1</button><span id=\"_0-3\">Value: <leptos-dyn-child-start leptos id=\"_0-4o\"></leptos-dyn-child-start>0<leptos-dyn-child-end leptos id=\"_0-4c\"></leptos-dyn-child-end>!</span><button id=\"_0-5\">+1</button></div>"
+            "<div id=\"_0-1\"><button id=\"_0-2\">-1</button><span id=\"_0-3\">Value: <!--hk=_0-4o|leptos-dyn-child-start-->0<!--hk=_0-4c|leptos-dyn-child-end-->!</span><button id=\"_0-5\">+1</button></div>"
         );
     });
 }
@@ -50,7 +50,41 @@ fn ssr_test_with_components() {
 
         assert_eq!(
             rendered.into_view(cx).render_to_string(cx),
-            "<div class=\"counters\" id=\"_0-1\"><leptos-counter-start leptos id=\"_0-1-0o\"></leptos-counter-start><div id=\"_0-1-1\"><button id=\"_0-1-2\">-1</button><span id=\"_0-1-3\">Value: <leptos-dyn-child-start leptos id=\"_0-1-4o\"></leptos-dyn-child-start>1<leptos-dyn-child-end leptos id=\"_0-1-4c\"></leptos-dyn-child-end>!</span><button id=\"_0-1-5\">+1</button></div><leptos-counter-end leptos id=\"_0-1-0c\"></leptos-counter-end><leptos-counter-start leptos id=\"_0-1-5-0o\"></leptos-counter-start><div id=\"_0-1-5-1\"><button id=\"_0-1-5-2\">-1</button><span id=\"_0-1-5-3\">Value: <leptos-dyn-child-start leptos id=\"_0-1-5-4o\"></leptos-dyn-child-start>2<leptos-dyn-child-end leptos id=\"_0-1-5-4c\"></leptos-dyn-child-end>!</span><button id=\"_0-1-5-5\">+1</button></div><leptos-counter-end leptos id=\"_0-1-5-0c\"></leptos-counter-end></div>"
+            "<div id=\"_0-1\" class=\"counters\"><!--hk=_0-1-0o|leptos-counter-start--><div id=\"_0-1-1\"><button id=\"_0-1-2\">-1</button><span id=\"_0-1-3\">Value: <!--hk=_0-1-4o|leptos-dyn-child-start-->1<!--hk=_0-1-4c|leptos-dyn-child-end-->!</span><button id=\"_0-1-5\">+1</button></div><!--hk=_0-1-0c|leptos-counter-end--><!--hk=_0-1-5-0o|leptos-counter-start--><div id=\"_0-1-5-1\"><button id=\"_0-1-5-2\">-1</button><span id=\"_0-1-5-3\">Value: <!--hk=_0-1-5-4o|leptos-dyn-child-start-->2<!--hk=_0-1-5-4c|leptos-dyn-child-end-->!</span><button id=\"_0-1-5-5\">+1</button></div><!--hk=_0-1-5-0c|leptos-counter-end--></div>"
+        );
+    });
+}
+
+#[cfg(not(any(feature = "csr", feature = "hydrate")))]
+#[test]
+fn ssr_test_with_snake_case_components() {
+    use leptos::*;
+
+    #[component]
+    fn snake_case_counter(cx: Scope, initial_value: i32) -> impl IntoView {
+        let (value, set_value) = create_signal(cx, initial_value);
+        view! {
+            cx,
+            <div>
+                <button on:click=move |_| set_value.update(|value| *value -= 1)>"-1"</button>
+                <span>"Value: " {move || value.get().to_string()} "!"</span>
+                <button on:click=move |_| set_value.update(|value| *value += 1)>"+1"</button>
+            </div>
+        }
+    }
+
+    _ = create_scope(create_runtime(), |cx| {
+        let rendered = view! {
+            cx,
+            <div class="counters">
+                <SnakeCaseCounter initial_value=1/>
+                <SnakeCaseCounter initial_value=2/>
+            </div>
+        };
+
+        assert_eq!(
+            rendered.into_view(cx).render_to_string(cx),
+            "<div id=\"_0-1\" class=\"counters\"><!--hk=_0-1-0o|leptos-snake-case-counter-start--><div id=\"_0-1-1\"><button id=\"_0-1-2\">-1</button><span id=\"_0-1-3\">Value: <!--hk=_0-1-4o|leptos-dyn-child-start-->1<!--hk=_0-1-4c|leptos-dyn-child-end-->!</span><button id=\"_0-1-5\">+1</button></div><!--hk=_0-1-0c|leptos-snake-case-counter-end--><!--hk=_0-1-5-0o|leptos-snake-case-counter-start--><div id=\"_0-1-5-1\"><button id=\"_0-1-5-2\">-1</button><span id=\"_0-1-5-3\">Value: <!--hk=_0-1-5-4o|leptos-dyn-child-start-->2<!--hk=_0-1-5-4c|leptos-dyn-child-end-->!</span><button id=\"_0-1-5-5\">+1</button></div><!--hk=_0-1-5-0c|leptos-snake-case-counter-end--></div>"
         );
     });
 }
@@ -69,7 +103,29 @@ fn test_classes() {
 
         assert_eq!(
             rendered.into_view(cx).render_to_string(cx),
-            "<div class=\"my big red car\" id=\"_0-1\"></div>"
+            "<div id=\"_0-1\" class=\"my big  red car\"></div>"
+        );
+    });
+}
+
+#[cfg(not(any(feature = "csr", feature = "hydrate")))]
+#[test]
+fn ssr_with_styles() {
+    use leptos::*;
+
+    _ = create_scope(create_runtime(), |cx| {
+        let (value, set_value) = create_signal(cx, 0);
+        let styles = "myclass";
+        let rendered = view! {
+            cx, class = styles,
+            <div>
+                <button class="btn" on:click=move |_| set_value.update(|value| *value -= 1)>"-1"</button>
+            </div>
+        };
+
+        assert_eq!(
+            rendered.into_view(cx).render_to_string(cx),
+            "<div id=\"_0-1\" class=\" myclass\"><button id=\"_0-2\" class=\"btn myclass\">-1</button></div>"
         );
     });
 }

leptos_config/Cargo.toml

@@ -1,11 +1,12 @@
 [package]
 name = "leptos_config"
-version = "0.1.0-beta"
+version = { workspace = true }
 edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
-repository = "https://github.com/gbj/leptos"
+repository = "https://github.com/leptos-rs/leptos"
 description = "Configuraiton for the Leptos web framework."
+readme = "../README.md"
 
 [dependencies]
 config = "0.13.3"
@@ -13,5 +14,4 @@ fs = "0.0.5"
 regex = "1.7.0"
 serde = { version = "1.0.151", features = ["derive"] }
 thiserror = "1.0.38"
-typed-builder = "0.11.0"
-
+typed-builder = "0.11"

leptos_config/src/errors.rs

@@ -1,3 +1,5 @@
+use std::{net::AddrParseError, num::ParseIntError};
+
 use thiserror::Error;
 
 #[derive(Debug, Error, Clone)]
@@ -10,9 +12,23 @@ pub enum LeptosConfigError {
     EnvError,
     #[error("Config Error: {0}")]
     ConfigError(String),
+    #[error("Config Error: {0}")]
+    EnvVarError(String),
 }
 impl From<config::ConfigError> for LeptosConfigError {
     fn from(e: config::ConfigError) -> Self {
         Self::ConfigError(e.to_string())
     }
 }
+
+impl From<ParseIntError> for LeptosConfigError {
+    fn from(e: ParseIntError) -> Self {
+        Self::ConfigError(e.to_string())
+    }
+}
+
+impl From<AddrParseError> for LeptosConfigError {
+    fn from(e: AddrParseError) -> Self {
+        Self::ConfigError(e.to_string())
+    }
+}

leptos_config/src/lib.rs

@@ -1,3 +1,5 @@
+#![forbid(unsafe_code)]
+
 pub mod errors;
 
 use crate::errors::LeptosConfigError;
@@ -14,6 +16,7 @@ use typed_builder::TypedBuilder;
 pub struct ConfFile {
     pub leptos_options: LeptosOptions,
 }
+
 /// This struct serves as a convenient place to store details used for configuring Leptos.
 /// It's used in our actix and axum integrations to generate the
 /// correct path for WASM, JS, and Websockets, as well as other configuration tasks.
@@ -23,8 +26,9 @@ pub struct LeptosOptions {
     /// The name of the WASM and JS files generated by wasm-bindgen. Defaults to the crate name with underscores instead of dashes
     #[builder(setter(into))]
     pub output_name: String,
-    /// The path of the all the files generated by cargo-leptos
-    #[builder(setter(into), default="target/site".to_string())]
+    /// The path of the all the files generated by cargo-leptos. This defaults to '.' for convenience when integrating with other
+    /// tools.
+    #[builder(setter(into), default=".".to_string())]
     pub site_root: String,
     /// The path of the WASM and JS files generated by wasm-bindgen from the root of your app
     /// By default, wasm-bindgen puts them in `pkg`.
@@ -46,8 +50,30 @@ pub struct LeptosOptions {
     pub reload_port: u32,
 }
 
-/// An enum that can be used to define the environment Leptos is running in. Can be passed to [RenderOptions].
-/// Setting this to the `PROD` variant will not include the websockets code for `cargo-leptos` watch mode.
+impl LeptosOptions {
+    fn try_from_env() -> Result<Self, LeptosConfigError> {
+        Ok(LeptosOptions {
+            output_name: std::env::var("LEPTOS_OUTPUT_NAME")
+                .map_err(|e| LeptosConfigError::EnvVarError(format!("LEPTOS_OUTPUT_NAME: {e}")))?,
+            site_root: env_w_default("LEPTOS_SITE_ROOT", "target/site")?,
+            site_pkg_dir: env_w_default("LEPTOS_SITE_PKG_DIR", "pkg")?,
+            env: Env::default(),
+            site_address: env_w_default("LEPTOS_SITE_ADDR", "127.0.0.1:3000")?.parse()?,
+            reload_port: env_w_default("LEPTOS_RELOAD_PORT", "3001")?.parse()?,
+        })
+    }
+}
+
+fn env_w_default(key: &str, default: &str) -> Result<String, LeptosConfigError> {
+    match std::env::var(key) {
+        Ok(val) => Ok(val),
+        Err(VarError::NotPresent) => Ok(default.to_string()),
+        Err(e) => Err(LeptosConfigError::EnvVarError(format!("{key}: {e}"))),
+    }
+}
+
+/// An enum that can be used to define the environment Leptos is running in.
+/// Setting this to the `PROD` variant will not include the WebSocket code for `cargo-leptos` watch mode.
 /// Defaults to `DEV`.
 #[derive(Debug, Clone, serde::Deserialize)]
 pub enum Env {
@@ -124,40 +150,43 @@ impl TryFrom<String> for Env {
         }
     }
 }
+
 /// Loads [LeptosOptions] from a Cargo.toml with layered overrides. If an env var is specified, like `LEPTOS_ENV`,
-/// it will override a setting in the file.
+/// it will override a setting in the file. It takes in an optional path to a Cargo.toml file. If None is provided,
+/// you'll need to set the options as environment variables or rely on the defaults. This is the preferred
+/// approach for cargo-leptos. If Some("./Cargo.toml") is provided, Leptos will read in the settings itself. This
+/// option currently does not allow dashes in file or foldernames, as all dashes become underscores
 pub async fn get_configuration(path: Option<&str>) -> Result<ConfFile, LeptosConfigError> {
-    // Allow Cargo.toml path to be specified in case of workspace wonkiness
-    let text = match path {
-        Some(p) => fs::read_to_string(p).map_err(|_| LeptosConfigError::ConfigNotFound)?,
-        None => fs::read_to_string("Cargo.toml").map_err(|_| LeptosConfigError::ConfigNotFound)?,
-    };
+    if let Some(path) = path {
+        let text = fs::read_to_string(path).map_err(|_| LeptosConfigError::ConfigNotFound)?;
 
-    let re: Regex =
-        Regex::new(r#"(?m)^\[package.metadata.leptos\]|(?m)^\[\[workspace.metadata.leptos\]\]"#)
-            .unwrap();
-    let start = match re.find(&text) {
-        Some(found) => found.start(),
-        None => return Err(LeptosConfigError::ConfigSectionNotFound),
-    };
+        let re: Regex = Regex::new(r#"(?m)^\[package.metadata.leptos\]"#).unwrap();
+        let start = match re.find(&text) {
+            Some(found) => found.start(),
+            None => return Err(LeptosConfigError::ConfigSectionNotFound),
+        };
 
-    // so that serde error messages have right line number
-    let newlines = text[..start].matches('\n').count();
-    let input = "\n".repeat(newlines) + &text[start..];
-    let toml = input
-        .replace("[package.metadata.leptos]", "[leptos_options]")
-        .replace("[[workspace.metadata.leptos]]", "[leptos_options]")
-        .replace('-', "_");
-    let settings = Config::builder()
-        // Read the "default" configuration file
-        .add_source(File::from_str(&toml, FileFormat::Toml))
-        // Layer on the environment-specific values.
-        // Add in settings from environment variables (with a prefix of LEPTOS and '_' as separator)
-        // E.g. `LEPTOS_RELOAD_PORT=5001 would set `LeptosOptions.reload_port`
-        .add_source(config::Environment::with_prefix("LEPTOS").separator("_"))
-        .build()?;
+        // so that serde error messages have right line number
+        let newlines = text[..start].matches('\n').count();
+        let input = "\n".repeat(newlines) + &text[start..];
+        let toml = input
+            .replace("[package.metadata.leptos]", "[leptos_options]")
+            .replace('-', "_");
+        let settings = Config::builder()
+            // Read the "default" configuration file
+            .add_source(File::from_str(&toml, FileFormat::Toml))
+            // Layer on the environment-specific values.
+            // Add in settings from environment variables (with a prefix of LEPTOS and '_' as separator)
+            // E.g. `LEPTOS_RELOAD_PORT=5001 would set `LeptosOptions.reload_port`
+            .add_source(config::Environment::with_prefix("LEPTOS").separator("_"))
+            .build()?;
 
-    settings
-        .try_deserialize()
-        .map_err(|e| LeptosConfigError::ConfigError(e.to_string()))
+        settings
+            .try_deserialize()
+            .map_err(|e| LeptosConfigError::ConfigError(e.to_string()))
+    } else {
+        Ok(ConfFile {
+            leptos_options: LeptosOptions::try_from_env()?,
+        })
+    }
 }

leptos_dom/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "leptos_dom"
-version.workspace = true
+version = { workspace = true }
 edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
-repository = "https://github.com/gbj/leptos"
+repository = "https://github.com/leptos-rs/leptos"
 description = "DOM operations for the Leptos web framework."
 
 [dependencies]
@@ -17,7 +17,7 @@ html-escape = "0.2"
 indexmap = "1.9"
 itertools = "0.10"
 js-sys = "0.3"
-leptos_reactive.workspace = true
+leptos_reactive = { workspace = true }
 once_cell = "1"
 pad-adapter = "0.1"
 paste = "1"
@@ -39,6 +39,7 @@ features = [
   "Range",
   "Text",
   "HtmlCollection",
+  "TreeWalker",
 
   # Events we cast to in leptos_macro -- added here so we don't force users to import them
   "AnimationEvent",

leptos_dom/src/components.rs

@@ -1,5 +1,6 @@
 mod dyn_child;
 mod each;
+mod errors;
 mod fragment;
 mod unit;
 
@@ -11,6 +12,7 @@ use crate::{
 use crate::{mount_child, prepare_to_move, MountKind, Mountable};
 pub use dyn_child::*;
 pub use each::*;
+pub use errors::*;
 pub use fragment::*;
 use leptos_reactive::Scope;
 #[cfg(all(target_arch = "wasm32", feature = "web"))]
@@ -26,12 +28,12 @@ use wasm_bindgen::JsCast;
 #[derive(educe::Educe)]
 #[educe(Default, Clone, PartialEq, Eq)]
 pub enum CoreComponent {
-  /// The [`Unit`] component.
+  /// The [Unit] component.
   #[educe(Default)]
   Unit(UnitRepr),
-  /// The [`DynChild`] component.
+  /// The [DynChild] component.
   DynChild(DynChildRepr),
-  /// The [`EachKey`] component.
+  /// The [Each] component.
   Each(EachRepr),
 }
 

leptos_dom/src/components/errors.rs

@@ -0,0 +1,68 @@
+use crate::{HydrationCtx, HydrationKey, IntoView};
+use cfg_if::cfg_if;
+use leptos_reactive::{use_context, RwSignal};
+use std::{collections::HashMap, error::Error, sync::Arc};
+
+/// A struct to hold all the possible errors that could be provided by child Views
+#[derive(Debug, Clone, Default)]
+pub struct Errors(pub HashMap<HydrationKey, Arc<dyn Error>>);
+
+impl<T, E> IntoView for Result<T, E>
+where
+  T: IntoView + 'static,
+  E: std::error::Error + Send + Sync + 'static,
+{
+  fn into_view(self, cx: leptos_reactive::Scope) -> crate::View {
+    match self {
+      Ok(stuff) => stuff.into_view(cx),
+      Err(error) => {
+        match use_context::<RwSignal<Errors>>(cx) {
+          Some(errors) => {
+            let id = HydrationCtx::id();
+            errors.update(move |errors: &mut Errors| errors.insert(id, error));
+
+            // remove the error from the list if this drops,
+            // i.e., if it's in a DynChild that switches from Err to Ok
+            // Only can run on the client, will panic on the server
+            cfg_if! {
+                  if #[cfg(any(feature = "hydrate", feature="csr"))] {
+            use leptos_reactive::{on_cleanup, queue_microtask};
+            on_cleanup(cx, move || {
+              queue_microtask(move || {
+                errors.update(|errors: &mut Errors| {
+                errors.remove::<E>(&id);
+                });
+              });
+            });
+                }
+              }
+          }
+          None => {
+            #[cfg(debug_assertions)]
+            warn!(
+              "No ErrorBoundary components found! Returning errors will not \
+               be handled and will silently disappear"
+            );
+          }
+        }
+        ().into_view(cx)
+      }
+    }
+  }
+}
+impl Errors {
+  /// Add an error to Errors that will be processed by `<ErrorBoundary/>`
+  pub fn insert<E>(&mut self, key: HydrationKey, error: E)
+  where
+    E: Error + 'static,
+  {
+    self.0.insert(key, Arc::new(error));
+  }
+  /// Remove an error to Errors that will be processed by `<ErrorBoundary/>`
+  pub fn remove<E>(&mut self, key: &HydrationKey)
+  where
+    E: Error + 'static,
+  {
+    self.0.remove(key);
+  }
+}

leptos_dom/src/helpers.rs

@@ -15,6 +15,15 @@ pub fn set_property(
   };
 }
 
+/// Gets the value of a property set on a DOM element.
+pub fn get_property(
+  el: &web_sys::Element,
+  prop_name: &str,
+) -> Result<JsValue, JsValue> {
+  let key = JsValue::from_str(prop_name);
+  js_sys::Reflect::get(el, &key)
+}
+
 /// Returns the current [`window.location`](https://developer.mozilla.org/en-US/docs/Web/API/Window/location).
 pub fn location() -> web_sys::Location {
   window().location()

leptos_dom/src/html.rs

@@ -165,6 +165,66 @@ pub struct Custom {
   id: HydrationKey,
 }
 
+impl Custom {
+  pub fn new(name: impl Into<Cow<'static, str>>) -> Self {
+    let name = name.into();
+    let id = HydrationCtx::id();
+
+    #[cfg(all(target_arch = "wasm32", feature = "web"))]
+    let element = if HydrationCtx::is_hydrating() {
+      if let Some(el) = crate::document().get_element_by_id(&format!("_{id}")) {
+        #[cfg(debug_assertions)]
+        assert_eq!(
+          el.node_name().to_ascii_uppercase(),
+          name.to_ascii_uppercase(),
+          "SSR and CSR elements have the same `TopoId` but different node \
+           kinds. This is either a discrepancy between SSR and CSR rendering
+                    logic, which is considered a bug, or it can also be a \
+           leptos hydration issue."
+        );
+
+        el.remove_attribute("id").unwrap();
+
+        el.unchecked_into()
+      } else if let Ok(Some(el)) =
+        crate::document().query_selector(&format!("[leptos-hk=_{id}]"))
+      {
+        #[cfg(debug_assertions)]
+        assert_eq!(
+          el.node_name().to_ascii_uppercase(),
+          name.to_ascii_uppercase(),
+          "SSR and CSR elements have the same `TopoId` but different node \
+           kinds. This is either a discrepancy between SSR and CSR rendering
+                    logic, which is considered a bug, or it can also be a \
+           leptos hydration issue."
+        );
+
+        el.remove_attribute("leptos-hk").unwrap();
+
+        el.unchecked_into()
+      } else {
+        gloo::console::warn!(
+          "element with id",
+          format!("_{id}"),
+          "not found, ignoring it for hydration"
+        );
+
+        crate::document().create_element(&name).unwrap()
+      }
+    } else {
+      crate::document().create_element(&name).unwrap()
+    };
+
+    Self {
+      name,
+      #[cfg(all(target_arch = "wasm32", feature = "web"))]
+      element: element.unchecked_into(),
+      #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+      id,
+    }
+  }
+}
+
 #[cfg(all(target_arch = "wasm32", feature = "web"))]
 impl std::ops::Deref for Custom {
   type Target = web_sys::HtmlElement;
@@ -922,14 +982,19 @@ macro_rules! generate_html_tags {
 #[cfg(all(debug_assertions, target_arch = "wasm32", feature = "web"))]
 fn warn_on_ambiguous_a(parent: &web_sys::Element, child: &View) {
   if let View::Element(el) = &child {
-    if el.name == "a" {
+    if el.name == "a"
+      || el.name == "script"
+      || el.name == "style"
+      || el.name == "title"
+    {
       if parent.namespace_uri() != el.element.namespace_uri() {
         crate::warn!(
-          "Warning: you are appending an SVG <a/> to an HTML element, or an \
-           HTML <a/> to an SVG. Typically, this occurs when you create an \
-           <a/> with the `view` macro and append it to an SVG, but the \
-           framework assumed it was HTML when you created it. To specify that \
-           it is an SVG <a/>, use <svg::a/> in the view macro."
+          "Warning: you are appending an SVG element to an HTML element, or \
+           an HTML element to an SVG. Typically, this occurs when you create \
+           an <a/> or <script/> with the `view` macro and append it to an \
+           SVG, but the framework assumed it was HTML when you created it. To \
+           specify that it is an SVG element, use <svg::{{tag name}}/> in the \
+           view macro."
         )
       }
     }
@@ -978,6 +1043,8 @@ generate_html_tags![
   footer HtmlElement,
   /// The `<header>` HTML element represents introductory content, typically a group of introductory or navigational aids. It may contain some heading elements but also a logo, a search form, an author name, and other elements.
   header HtmlElement,
+  /// The `<hgroup>` HTML element represents a heading and related content. It groups a single `<h1>–<h6>` element with one or more `<p>`.
+  hgroup HtmlElement,
   /// The `<h1>` to `<h6>` HTML elements represent six levels of section headings. `<h1>` is the highest section level and `<h6>` is the lowest.
   h1 HtmlHeadingElement,
   /// The `<h1>` to `<h6>` HTML elements represent six levels of section headings. `<h1>` is the highest section level and `<h6>` is the lowest.

leptos_dom/src/hydration.rs

@@ -1,25 +1,55 @@
+use cfg_if::cfg_if;
 use std::{cell::RefCell, fmt::Display};
 
-#[cfg(all(target_arch = "wasm32", feature = "web"))]
-use once_cell::unsync::Lazy as LazyCell;
+cfg_if! {
+  if #[cfg(all(target_arch = "wasm32", feature = "web"))] {
+    use once_cell::unsync::Lazy as LazyCell;
+    use std::collections::HashMap;
+    use wasm_bindgen::JsCast;
 
-// We can tell if we start in hydration mode by checking to see if the
-// id "_0-0-0" is present in the DOM. If it is, we know we are hydrating from
-// the server, if not, we are starting off in CSR
-#[cfg(all(target_arch = "wasm32", feature = "web"))]
-thread_local! {
-  static IS_HYDRATING: RefCell<LazyCell<bool>> = RefCell::new(LazyCell::new(|| {
-    #[cfg(debug_assertions)]
-    return crate::document().get_element_by_id("_0-0-0").is_some()
-      || crate::document().get_element_by_id("_0-0-0o").is_some();
+    // We can tell if we start in hydration mode by checking to see if the
+    // id "_0-0-0" is present in the DOM. If it is, we know we are hydrating from
+    // the server, if not, we are starting off in CSR
+    thread_local! {
+      static HYDRATION_COMMENTS: LazyCell<HashMap<String, web_sys::Comment>> = LazyCell::new(|| {
+        let document = crate::document();
+        let body = document.body().unwrap();
+        let walker = document
+          .create_tree_walker_with_what_to_show(&body, 128)
+          .unwrap();
+        let mut map = HashMap::new();
+        while let Ok(Some(node)) = walker.next_node() {
+          if let Some(content) = node.text_content() {
+            if let Some(hk) = content.strip_prefix("hk=") {
+              if let Some(hk) = hk.split("|").next() {
+                map.insert(hk.into(), node.unchecked_into());
+              }
+            }
+          }
+        }
+        map
+      });
 
-    #[cfg(not(debug_assertions))]
-    return crate::document().get_element_by_id("_0-0-0").is_some();
-  }));
+      static IS_HYDRATING: RefCell<LazyCell<bool>> = RefCell::new(LazyCell::new(|| {
+        #[cfg(debug_assertions)]
+        return crate::document().get_element_by_id("_0-0-0").is_some()
+          || crate::document().get_element_by_id("_0-0-0o").is_some()
+          || HYDRATION_COMMENTS.with(|comments| comments.get("_0-0-0o").is_some());
+
+        #[cfg(not(debug_assertions))]
+        return crate::document().get_element_by_id("_0-0-0").is_some()
+          || HYDRATION_COMMENTS.with(|comments| comments.get("_0-0-0").is_some());
+      }));
+    }
+
+    pub(crate) fn get_marker(id: &str) -> Option<web_sys::Comment> {
+      HYDRATION_COMMENTS.with(|comments| comments.get(id).cloned())
+    }
+  }
 }
 
 /// A stable identifer within the server-rendering or hydration process.
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct HydrationKey {
   /// The key of the previous component.
   pub previous: String,
@@ -74,8 +104,9 @@ impl HydrationCtx {
     })
   }
 
+  #[doc(hidden)]
   #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
-  pub(crate) fn reset_id() {
+  pub fn reset_id() {
     ID.with(|id| *id.borrow_mut() = Default::default());
   }