Don't stream down resources not read under a <Suspense/>, fixing rendering issue

Add typed event handlers

Cargo.toml

@@ -3,11 +3,14 @@ members = [
   # core
   "leptos",
   "leptos_dom",
-  "leptos_core",
   "leptos_macro",
   "leptos_reactive",
   "leptos_server",
 
+  # integrations
+  "integrations/actix",
+  "integrations/axum",
+
   # libraries
   "meta",
   "router",
@@ -19,10 +22,12 @@ members = [
   "examples/counters-stable",
   "examples/fetch",
   "examples/hackernews",
+  "examples/hackernews-axum",
   "examples/parent-child",
   "examples/router",
   "examples/todomvc",
-  "examples/view-tests",
+  "examples/todo-app-sqlite",
+  "examples/todo-app-sqlite-axum",
 
   # book
   "docs/book/project/ch02_getting_started",

README.md

@@ -59,7 +59,8 @@ Leptos is a full-stack, isomorphic Rust web framework leveraging fine-grained re
 Here are some resources for learning more about Leptos:
 
 - [Examples](https://github.com/gbj/leptos/tree/main/examples)
-- [API Documentation](https://docs.rs/leptos/latest/leptos/) (in progress)
+- [API Documentation](https://docs.rs/leptos/latest/leptos/)
+- [Common Bugs](https://github.com/gbj/leptos/tree/main/docs/COMMON_BUGS.md) (and how to fix them!)
 - Leptos Guide (in progress)
 
 ## `nightly` Note
@@ -107,6 +108,7 @@ The gold standard for testing raw rendering performance for front-end web framew
 ### Can I use this for native GUI?
 
 Sure! Obviously the `view` macro is for generating DOM nodes but you can use the reactive system to drive native any GUI toolkit that uses the same kind of object-oriented, event-callback-based framework as the DOM pretty easily. The principles are the same:
+
 - Use signals, derived signals, and memos to create your reactive system
 - Create GUI widgets
 - Use event listeners to update signals
@@ -131,7 +133,7 @@ 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.)*
+- **Read-write segregation:** Leptos, like Solid, encourages read-write segregation between signal getters and setters, so you end up accessing signals with tuples like `let (count, set_count) = create_signal(cx, 0);` _(If you prefer or if it's more convenient for your API, you can use `create_rw_signal` to give a unified read/write signal.)_
 - **Signals are functions:** In Leptos, you can call a signal to access it rather than calling a specific method (so, `count()` instead of `count.get()`) This creates a more consistent mental model: accessing a reactive value is always a matter of calling a function. For example:
 
 ```rust

benchmarks/src/ssr.rs

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

benchmarks/src/todomvc/leptos.rs

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

benchmarks/src/todomvc/mod.rs

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

docs/COMMON_BUGS.md

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

docs/book/book.toml

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

docs/book/mermaid-init.js

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

docs/book/project/ch02_getting_started/Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = "0.0"
+leptos = "0.0.18"

docs/book/project/ch03_building_ui/Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = "0.0"
+leptos = "0.0.18"

docs/book/project/ch04_reactivity/Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = "0.0"
+leptos = "0.0.18"

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

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

docs/book/src/04_reactivity.md

@@ -13,6 +13,8 @@ let mut a = 0;
 let mut b = 0;
 let c = a + b;
 
+assert_eq!(c, 0); // sanity check
+
 a = 2;
 b = 2;
 
@@ -25,11 +27,13 @@ But that’s _exactly_ how reactive programming works.
 ```rust
 use leptos::*;
 
-run_scope(|cx| {
+run_scope(create_runtime(), |cx| {
     let (a, set_a) = create_signal(cx, 0);
     let (b, set_b) = create_signal(cx, 0);
     let c = move || a() + b();
 
+    assert_eq!(c(), 0); // yep, still true
+
     set_a(2);
     set_b(2);
 
@@ -37,8 +41,73 @@ run_scope(|cx| {
 });
 ```
 
+Hopefully, this makes some intuitive sense. After all, `c` is a closure. Calling it again causes it to access its values a second time. This isn’t _that_ cool.
+
+```rust
+use leptos::*;
+
+run_scope(create_runtime(), |cx| {
+    let (a, set_a) = create_signal(cx, 0);
+    let (b, set_b) = create_signal(cx, 0);
+    let c = move || a() + b();
+
+    create_effect(cx, move |_| {
+        println!("c = {}", c()); // prints "c = 0"
+    });
+
+    set_a(2); // prints "c = 2"
+    set_b(2); // prints "c = 4"
+});
+```
+
+This example’s a little different. [`create_effect`](https://docs.rs/leptos/latest/leptos/fn.create_effect.html) defines a “side effect,” a bridge between the reactive system of signals and the outside world. Effects synchronize the reactive system with everything else: the console, the filesystem, an HTTP request, whatever.
+
+Because the closure `c` is called within the effect and in turns calls the signals `a` and `b`, the effect automatically subscribes to the signals `a` and `b`. This means that whenever `a` or `b` is updated, the effect will re-run, logging the value again.
+
+You can picture the reactive graph for this system like this:
+
+```mermaid
+graph TD;
+    A-->C;
+    B-->C;
+    C-->Effect;
+```
+
+This is the foundation on which _everything_ else is built.
+
 ## Reactive Primitives
 
+### Overview
+
+The reactive system is built on the interaction between these two halves: **signals** and **effects**. When a signal is called inside an effect, the effect automatically subscribes to the signal. When a signal’s value is updated, it automatically notifies all its subscribers, and they re-run.
+
+The following simple example contains most of the core reactive concepts:
+
+```rust
+{{#include ../project/ch04_reactivity/src/main.rs}}
+```
+
+This creates a reactive graph like this:
+
+```mermaid
+graph TD;
+    count-->double_count;
+    count-->memoized_square;
+    count-->effect;
+    double_count-->effect;
+    memoized_square-->effect;
+```
+
+**Signals** are reactive values created using [`create_signal`](https://docs.rs/leptos/latest/leptos/fn.create_signal.html) or [`create_rw_signal`](https://docs.rs/leptos/latest/leptos/fn.create_rw_signal.html).
+
+**Derived Signals** computations in ordinary closures that rely on other signals. The computation re-runs whenever you access its value.
+
+**Memos** are computations that are memoized with [create_memo](https://docs.rs/leptos/latest/leptos/fn.create_memo.html). Memos only re-run when one of their signal dependencies has changed.
+
+And **effects** (created with [create_effect](<(https://docs.rs/leptos/latest/leptos/fn.create_effect.html)>) synchronize the reactive system with something outside it.
+
+The rest of this chapter will walk through each of these concepts in more depth.
+
 ### Signals
 
 A **signal** is a piece of data that may change over time, and notifies other code when it has changed. This is the core primitive of Leptos’s reactive system.
@@ -53,7 +122,7 @@ let (value, set_value) = create_signal(cx, 0);
 
 #### `ReadSignal<T>`
 
-The `ReadSignal` half of this tuple allows you to get the current value of the signal. Reading that value in a reactive context automatically subscribes to any further changes. You can access the value by simply calling the `ReadSignal` as a function.
+The [`ReadSignal`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html) half of this tuple allows you to get the current value of the signal. Reading that value in a reactive context automatically subscribes to any further changes. You can access the value by simply calling the `ReadSignal` as a function.
 
 ```rust
 let (value, set_value) = create_signal(cx, 0);
@@ -65,7 +134,7 @@ assert_eq!(value(), 0);
 
 > Here, a **reactive context** means anywhere within an `Effect`. Leptos’s templating system is built on top of its reactive system, so if you’re reading the signal’s value within the template, the template will automatically subscribe to the signal and update exactly the value that needs to change in the DOM.
 
-Calling a `ReadSignal` clones the value it contains. If that’s too expensive, use `ReadSignal::with()` to borrow the value and do whatever you need.
+Calling a `ReadSignal` clones the value it contains. If that’s too expensive, use [`ReadSignal::with()`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html#method.with) to borrow the value and do whatever you need.
 
 ```rust
 struct MySuperExpensiveStruct {
@@ -77,14 +146,12 @@ let (value, set_value) = create_signal(cx, MySuperExpensiveStruct::default());
 // ❌ this is going to clone the `StructThatsSuperExpensiveToClone` unnecessarily!
 let lowercased = move || value().a.to_lowercase();
 // ✅ only use what we need
-let lowercased = move || value.with(|value| value.to_lowercase());
-// 🔥 aaaand there's no need to type "value" three times in a row
-let lowercased = move || value.with(String::to_lowercase);
+let lowercased = move || value.with(|value: &MySuperExpensiveStruct| value.a.to_lowercase());
 ```
 
 #### `WriteSignal<T>`
 
-The `WriteSignal` half of this tuple allows you to update the value of the signal, which will automatically notify anything that’s listening to the value that something has changed. If you simply call the `WriteSignal` as a function, its value will be set to the argument you pass. If you want to mutate the value in place instead of replacing it, you can call `WriteSignal::update` instead.
+The [`WriteSignal`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html) half of this tuple allows you to update the value of the signal, which will automatically notify anything that’s listening to the value that something has changed. If you simply call the `WriteSignal` as a function, its value will be set to the argument you pass. If you want to mutate the value in place instead of replacing it, you can call [`WriteSignal::update`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html#method.update) instead.
 
 ```rust
 // often you just want to replace the value
@@ -99,3 +166,75 @@ assert_eq!(items(), vec![1]);
 ```
 
 > Under the hood, `set_value(1)` is just syntactic sugar for `set_value.update(|n| *n = 1)`.
+
+#### `RwSignal<T>`
+
+This kind of “read-write segregation,” in which the getter and the setter are stored in separate variables, may be familiar from the tuple-based ”hooks” pattern in libraries like React, Solid, Yew, or Dioxus. It encourages clear contracts between components. For example, if a child component only needs to be able to read a signal, but shouldn’t be able to update it (and therefore trigger changes in other parts of the application), you can pass it only the `ReadSignal`.
+
+Sometimes, however, you may prefer to keep the getter and setter combined in one variable. For example, it’s awkward and repetitive to store both halves of a signal in another data structure:
+
+```rust
+# use leptos::*;
+
+// pretty repetitive
+struct AppState {
+    count: ReadSignal<i32>,
+    set_count: WriteSignal<i32>,
+    name: ReadSignal<String>,
+    set_name: WriteSignal<String>
+}
+
+#[component]
+fn App(cx: Scope) {
+    let (count, set_count) = create_signal(cx, 0);
+    let (name, set_name) = create_signal(cx, "Alice".to_string());
+    provide_context(cx, AppState {
+        count,
+        set_count,
+        name,
+        set_name
+    })
+
+    todo!()
+}
+```
+
+Or maybe you just like to keep your getters and setters in one place.
+
+In this case, you can use [`create_rw_signal`](https://docs.rs/leptos/latest/leptos/fn.create_rw_signal.html) and the [`RwSignal`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html) type. This returns a **R**ead-**w**rite Signal, which has the same [`get`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.get), [`with`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.with), [`set`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.set), and [`update`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.update) functions as the `ReadSignal` and `WriteSignal` halves.
+
+```rust
+# use leptos::*;
+
+// better
+struct AppState {
+    count: RwSignal<i32>,
+    name: RwSignal<String>,
+}
+
+#[component]
+fn App(cx: Scope) {
+    let count = create_rw_signal(cx, 0);
+    let name = create_rw_signal(cx, "Alice".to_string());
+    provide_context(cx, AppState {
+        count,
+        name,
+    })
+
+    todo!()
+}
+```
+
+If you still want to hand off read-only access to another part of the app, you can get a `ReadSignal` with [`RwSignal::read_only()`](https://docs.rs/leptos/latest/leptos/struct.RwSignal.html#method.get).
+
+### Derived Signals
+
+(todo)
+
+### Memos
+
+(todo)
+
+### Effects
+
+(todo)

examples/counter-isomorphic/.gitignore

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

examples/counter-isomorphic/Cargo.toml

@@ -16,28 +16,29 @@ serde = { version = "1", features = ["derive"] }
 futures = "0.3"
 cfg-if = "1"
 lazy_static = "1"
-leptos = { path = "../../../leptos/leptos", default-features = false, features = [
+leptos = { path = "../../leptos", default-features = false, features = [
 	"serde",
 ] }
-leptos_meta = { path = "../../../leptos/meta", default-features = false }
-leptos_router = { path = "../../../leptos/router", default-features = false }
+leptos_actix = { path = "../../integrations/actix", optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4"
 simple_logger = "2"
-gloo = { git = "https://github.com/rustwasm/gloo" }
-#counter = { path = "../counter",  default-features = false}
+gloo-net = { git = "https://github.com/rustwasm/gloo" }
 
 [features]
-default = ["csr"]
+default = []
 csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
 	"dep:actix-files",
 	"dep:actix-web",
 	"leptos/ssr",
+	"leptos_actix",
 	"leptos_meta/ssr",
 	"leptos_router/ssr",
 ]
 
 [package.metadata.cargo-all-features]
-denylist = ["actix-files", "actix-web"]
+denylist = ["actix-files", "actix-web", "leptos_actix"]
 skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]

examples/counter-isomorphic/README.md

@@ -3,16 +3,19 @@
 This example demonstrates how to use a function isomorphically, to run a server side function from the browser and receive a result.
 
 ## Server Side Rendering With Hydration
-To run it as a server side app with hydration, first you should run 
+
+To run it as a server side app with hydration, first you should run
+
 ```bash
-wasm-pack build --target=web --no-default-features --features=hydrate
+wasm-pack build --target=web --debug --no-default-features --features=hydrate
 ```
+
 to generate the Webassembly to provide hydration features for the server.
-Then run the server with `cargo run` to serve the server side rendered HTML and the WASM bundle for hydration. 
+Then run the server with `cargo run` to serve the server side rendered HTML and the WASM bundle for hydration.
+
 ```bash
 cargo run --no-default-features --features=ssr
 ```
+
 > Note that if your hydration code changes, you will have to rerun the wasm-pack command above
 > This should be temporary, and vastly improve once cargo-leptos becomes ready for prime time!
-
-If for some reason you want to run it as a fully client side app, that can be done with the instructions below.

examples/counter-isomorphic/src/counters.rs

@@ -43,41 +43,39 @@ pub async fn clear_server_count() -> Result<i32, ServerFnError> {
     Ok(0)
 }
 #[component]
-pub fn Counters(cx: Scope) -> Element {
+pub fn Counters(cx: Scope) -> impl IntoView {
     view! {
         cx,
-        <div>
-            <Router>
-                <header>
-                    <h1>"Server-Side Counters"</h1>
-                    <p>"Each of these counters stores its data in the same variable on the server."</p>
-                    <p>"The value is shared across connections. Try opening this is another browser tab to see what I mean."</p>
-                </header>
-                <nav>
-                    <ul>
-                        <li><A href="">"Simple"</A></li>
-                        <li><A href="form">"Form-Based"</A></li>
-                        <li><A href="multi">"Multi-User"</A></li>
-                    </ul>
-                </nav>
-                <main>
-                    <Routes>
-                        <Route path="" element=|cx| view! {
-                            cx,
-                            <Counter/>
-                        }/>
-                        <Route path="form" element=|cx| view! {
-                            cx,
-                            <FormCounter/>
-                        }/>
-                        <Route path="multi" element=|cx| view! {
-                            cx,
-                            <MultiuserCounter/>
-                        }/>
-                    </Routes>
-                </main>
-            </Router>
-        </div>
+        <Router>
+            <header>
+                <h1>"Server-Side Counters"</h1>
+                <p>"Each of these counters stores its data in the same variable on the server."</p>
+                <p>"The value is shared across connections. Try opening this is another browser tab to see what I mean."</p>
+            </header>
+            <nav>
+                <ul>
+                    <li><A href="">"Simple"</A></li>
+                    <li><A href="form">"Form-Based"</A></li>
+                    <li><A href="multi">"Multi-User"</A></li>
+                </ul>
+            </nav>
+            <main>
+                <Routes>
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <Counter/>
+                    }/>
+                    <Route path="form" view=|cx| view! {
+                        cx,
+                        <FormCounter/>
+                    }/>
+                    <Route path="multi" view=|cx| view! {
+                        cx,
+                        <MultiuserCounter/>
+                    }/>
+                </Routes>
+            </main>
+        </Router>
     }
 }
 
@@ -86,7 +84,7 @@ pub fn Counters(cx: Scope) -> Element {
 // it's invalidated by one of the user's own actions
 // This is the typical pattern for a CRUD app
 #[component]
-pub fn Counter(cx: Scope) -> Element {
+pub fn Counter(cx: Scope) -> impl IntoView {
     let dec = create_action(cx, |_| adjust_server_count(-1, "decing".into()));
     let inc = create_action(cx, |_| adjust_server_count(1, "incing".into()));
     let clear = create_action(cx, |_| clear_server_count());
@@ -126,7 +124,7 @@ pub fn Counter(cx: Scope) -> Element {
 // It uses the same invalidation pattern as the plain counter,
 // but uses HTML forms to submit the actions
 #[component]
-pub fn FormCounter(cx: Scope) -> Element {
+pub fn FormCounter(cx: Scope) -> impl IntoView {
     let adjust = create_server_action::<AdjustServerCount>(cx);
     let clear = create_server_action::<ClearServerCount>(cx);
 
@@ -189,7 +187,7 @@ pub fn FormCounter(cx: Scope) -> Element {
 // Whenever another user updates the value, it will update here
 // This is the primitive pattern for live chat, collaborative editing, etc.
 #[component]
-pub fn MultiuserCounter(cx: Scope) -> Element {
+pub fn MultiuserCounter(cx: Scope) -> impl IntoView {
     let dec = create_action(cx, |_| adjust_server_count(-1, "dec dec goose".into()));
     let inc = create_action(cx, |_| adjust_server_count(1, "inc inc moose".into()));
     let clear = create_action(cx, |_| clear_server_count());
@@ -198,7 +196,7 @@ pub fn MultiuserCounter(cx: Scope) -> Element {
     let multiplayer_value = {
         use futures::StreamExt;
 
-        let mut source = gloo::net::eventsource::futures::EventSource::new("/api/events")
+        let mut source = gloo_net::eventsource::futures::EventSource::new("/api/events")
             .expect_throw("couldn't connect to SSE stream");
         let s = create_signal_from_stream(
             cx,

examples/counter-isomorphic/src/lib.rs

@@ -9,12 +9,12 @@ cfg_if! {
         use crate::counters::*;
 
         #[wasm_bindgen]
-        pub fn main() {
+        pub fn hydrate() {
             console_error_panic_hook::set_once();
             _ = console_log::init_with_level(log::Level::Debug);
             console_error_panic_hook::set_once();
 
-            leptos::hydrate(body().unwrap(), |cx| {
+            mount_to_body(|cx| {
                 view! { cx,  <Counters/> }
             });
         }

examples/counter-isomorphic/src/main.rs

@@ -1,6 +1,5 @@
 use cfg_if::cfg_if;
 use leptos::*;
-use leptos_router::*;
 mod counters;
 
 // boilerplate to run in different modes
@@ -10,74 +9,7 @@ cfg_if! {
         use actix_files::{Files};
         use actix_web::*;
         use crate::counters::*;
-
-        #[get("{tail:.*}")]
-        async fn render(req: HttpRequest) -> impl Responder {
-            let path = req.path();
-            let path = "http://leptos".to_string() + path;
-            println!("path = {path}");
-
-            HttpResponse::Ok().content_type("text/html").body(format!(
-                r#"<!DOCTYPE html>
-                <html lang="en">
-                    <head>
-                        <meta charset="utf-8"/>
-                        <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                        <title>Isomorphic Counter</title>
-                    </head>
-                    <body>
-                        {}
-                    </body>
-                    <script type="module">import init, {{ main }} from './pkg/leptos_counter_isomorphic.js'; init().then(main);</script>
-                </html>"#,
-                run_scope({
-                    move |cx| {
-                        let integration = ServerIntegration { path: path.clone() };
-                        provide_context(cx, RouterIntegrationContext::new(integration));
-
-                        view! { cx, <Counters/>}
-                    }
-                })
-            ))
-        }
-
-        #[post("/api/{tail:.*}")]
-        async fn handle_server_fns(
-            req: HttpRequest,
-            params: web::Path<String>,
-            body: web::Bytes,
-        ) -> impl Responder {
-            let path = params.into_inner();
-            let accept_header = req
-                .headers()
-                .get("Accept")
-                .and_then(|value| value.to_str().ok());
-
-            if let Some(server_fn) = server_fn_by_path(path.as_str()) {
-                let body: &[u8] = &body;
-                match server_fn(&body).await {
-                    Ok(serialized) => {
-                        // if this is Accept: application/json then send a serialized JSON response
-                        if let Some("application/json") = accept_header {
-                            HttpResponse::Ok().body(serialized)
-                        }
-                        // otherwise, it's probably a <form> submit or something: redirect back to the referrer
-                        else {
-                            HttpResponse::SeeOther()
-                                .insert_header(("Location", "/"))
-                                .content_type("application/json")
-                                .body(serialized)
-                        }
-                    }
-                    Err(e) => {
-                        eprintln!("server function error: {e:#?}");
-                        HttpResponse::InternalServerError().body(e.to_string())
-                    }
-                }
-            } else {
-                HttpResponse::BadRequest().body(format!("Could not find a server function at that route."))
-            }
-        }
+        use std::{net::SocketAddr, env};
 
         #[get("/api/events")]
         async fn counter_events() -> impl Responder {
@@ -98,17 +30,20 @@ cfg_if! {
 
         #[actix_web::main]
         async fn main() -> std::io::Result<()> {
+            let addr = SocketAddr::from(([127,0,0,1],3000));
             crate::counters::register_server_functions();
 
-            HttpServer::new(|| {
+            HttpServer::new(move || {
+                let render_options: RenderOptions = RenderOptions::builder().pkg_path("/pkg/leptos_counter_isomorphic").reload_port(3001).socket_address(addr.clone()).environment(&env::var("RUST_ENV")).build();
+                render_options.write_to_file();
                 App::new()
                     .service(Files::new("/pkg", "./pkg"))
                     .service(counter_events)
-                    .service(handle_server_fns)
-                    .service(render)
+                    .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+                    .route("/{tail:.*}", leptos_actix::render_app_to_stream(render_options, |cx| view! { cx, <Counters/> }))
                 //.wrap(middleware::Compress::default())
             })
-            .bind(("127.0.0.1", 8081))?
+            .bind(&addr)?
             .run()
             .await
         }

examples/counter/README.md

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

examples/counter/src/lib.rs

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

examples/counter/src/main.rs

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

examples/counter/tests/mod.rs

@@ -10,11 +10,16 @@ fn inc() {
 
     let document = leptos::document();
     let div = document.query_selector("div").unwrap().unwrap();
-    let dec = div
+    let clear = div
         .first_child()
         .unwrap()
         .dyn_into::<HtmlElement>()
         .unwrap();
+    let dec = clear
+        .next_sibling()
+        .unwrap()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
     let text = dec
         .next_sibling()
         .unwrap()
@@ -29,12 +34,16 @@ fn inc() {
     inc.click();
     inc.click();
 
-    assert_eq!(text.text_content(), Some("2".to_string()));
+    assert_eq!(text.text_content(), Some("Value: 2!".to_string()));
 
     dec.click();
     dec.click();
     dec.click();
     dec.click();
 
-    assert_eq!(text.text_content(), Some("-2".to_string()));
+    assert_eq!(text.text_content(), Some("Value: -2!".to_string()));
+
+    clear.click();
+
+    assert_eq!(text.text_content(), Some("Value: 0!".to_string()));
 }

examples/counters-stable/src/main.rs

@@ -7,6 +7,8 @@ fn main() {
     mount_to_body(|cx| view! { cx,  <Counters/> })
 }
 
+const MANY_COUNTERS: usize = 1000;
+
 type CounterHolder = Vec<(usize, (ReadSignal<i32>, WriteSignal<i32>))>;
 
 #[derive(Copy, Clone)]
@@ -28,12 +30,14 @@ pub fn Counters(cx: Scope) -> web_sys::Element {
     };
 
     let add_many_counters = move |_| {
-        let mut new_counters = vec![];
-        for next_id in 0..1000 {
+        let next_id = next_counter_id.get();
+        let new_counters = (next_id..next_id + MANY_COUNTERS).map(|id| {
             let signal = create_signal(cx, 0);
-            new_counters.push((next_id, signal));
-        }
-        set_counters.update(|counters| counters.extend(new_counters.iter()));
+            (id, signal)
+        });
+
+        set_counters.update(move |counters| counters.extend(new_counters));
+        set_next_counter_id.update(|id| *id += MANY_COUNTERS);
     };
 
     let clear_counters = move |_| {
@@ -46,7 +50,7 @@ pub fn Counters(cx: Scope) -> web_sys::Element {
                 "Add Counter"
             </button>
             <button on:click=add_many_counters>
-                "Add 1000 Counters"
+                {format!("Add {MANY_COUNTERS} Counters")}
             </button>
             <button on:click=clear_counters>
                 "Clear Counters"

examples/counters/src/lib.rs

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

examples/fetch/src/lib.rs

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

examples/hackernews-axum/Cargo.toml

@@ -0,0 +1,51 @@
+[package]
+name = "leptos-hackernews-axum"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+anyhow = "1"
+console_log = "0.2"
+console_error_panic_hook = "0.1"
+futures = "0.3"
+cfg-if = "1"
+leptos = { path = "../../leptos", default-features = false, features = [
+	"serde",
+] }
+leptos_axum = { path = "../../integrations/axum", optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
+log = "0.4"
+simple_logger = "2"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+gloo-net = { version = "0.2", features = ["http"] }
+reqwest = { version = "0.11", features = ["json"] }
+axum = { version = "0.5.17", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.3.4", features = ["fs"], optional = true }
+tokio = { version = "1.0", features = ["full"], optional = true }
+http = { version = "0.2.8", optional = true }
+
+[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:http",
+	"leptos/ssr",
+	"leptos_axum",
+	"leptos_meta/ssr",
+	"leptos_router/ssr",
+]
+
+[package.metadata.cargo-all-features]
+denylist = ["axum", "tower", "tower-http", "tokio", "http", "leptos_axum"]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]

examples/hackernews-axum/LICENSE

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

examples/hackernews-axum/README.md

@@ -0,0 +1,20 @@
+# Leptos Hacker News Example with Axum
+
+This example creates a basic clone of the Hacker News site. It showcases Leptos' ability to create both a client-side rendered app, and a server side rendered app with hydration, in a single repository. This repo differs from the main Hacker News example by using Axum as it's server.
+
+## 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 CRS bundle
+
+## Server Side Rendering With Hydration
+To run it as a server side app with hydration, first you should run 
+```bash
+wasm-pack build --target=web --no-default-features --features=hydrate
+```
+to generate the Webassembly to provide hydration features for the server.
+Then run the server with `cargo run` to serve the server side rendered HTML and the WASM bundle for hydration. 
+```bash
+cargo run --no-default-features --features=ssr
+```
+> Note that if your hydration code changes, you will have to rerun the wasm-pack command above
+> This should be temporary, and vastly improve once cargo-leptos becomes ready for prime time!

examples/hackernews-axum/index.html

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<link data-trunk rel="rust" data-wasm-opt="z"/>
+		<link data-trunk rel="css" href="./static/style.css"/>
+	</head>
+	<body></body>
+</html>

examples/hackernews-axum/src/api.rs

@@ -0,0 +1,78 @@
+use leptos::Serializable;
+use serde::{Deserialize, Serialize};
+
+pub fn story(path: &str) -> String {
+    format!("https://node-hnapi.herokuapp.com/{path}")
+}
+
+pub fn user(path: &str) -> String {
+    format!("https://hacker-news.firebaseio.com/v0/user/{path}.json")
+}
+
+#[cfg(not(feature = "ssr"))]
+pub async fn fetch_api<T>(path: &str) -> Option<T>
+where
+    T: Serializable,
+{
+    let json = gloo_net::http::Request::get(path)
+        .send()
+        .await
+        .map_err(|e| log::error!("{e}"))
+        .ok()?
+        .text()
+        .await
+        .ok()?;
+    T::from_json(&json).ok()
+}
+
+#[cfg(feature = "ssr")]
+pub async fn fetch_api<T>(path: &str) -> Option<T>
+where
+    T: Serializable,
+{
+    let json = reqwest::get(path)
+        .await
+        .map_err(|e| log::error!("{e}"))
+        .ok()?
+        .text()
+        .await
+        .ok()?;
+    T::from_json(&json).map_err(|e| log::error!("{e}")).ok()
+}
+
+#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Clone)]
+pub struct Story {
+    pub id: usize,
+    pub title: String,
+    pub points: Option<i32>,
+    pub user: Option<String>,
+    pub time: usize,
+    pub time_ago: String,
+    #[serde(alias = "type")]
+    pub story_type: String,
+    pub url: String,
+    #[serde(default)]
+    pub domain: String,
+    #[serde(default)]
+    pub comments: Option<Vec<Comment>>,
+    pub comments_count: Option<usize>,
+}
+
+#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Clone)]
+pub struct Comment {
+    pub id: usize,
+    pub level: usize,
+    pub user: Option<String>,
+    pub time: usize,
+    pub time_ago: String,
+    pub content: Option<String>,
+    pub comments: Vec<Comment>,
+}
+
+#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Clone)]
+pub struct User {
+    pub created: usize,
+    pub id: String,
+    pub karma: i32,
+    pub about: Option<String>,
+}

examples/hackernews-axum/src/handlers.rs

@@ -0,0 +1,66 @@
+use cfg_if::cfg_if;
+
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        body::{boxed, Body, BoxBody},
+        http::{Request, Response, StatusCode, Uri},
+    };
+    use tower::ServiceExt;
+    use tower_http::services::ServeDir;
+
+    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`
+            // TODO: handle if the Uri has query parameters
+            match format!("{}.html", uri).parse() {
+                Ok(uri_html) => get_static_file(uri_html, "/pkg").await,
+                Err(_) => Err((StatusCode::INTERNAL_SERVER_ERROR, "Invalid URI".to_string())),
+            }
+        } else {
+            Ok(res)
+        }
+    }
+
+    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()))
+        } else {
+            Ok(res)
+        }
+    }
+
+    async fn get_static_file(uri: Uri, base: &str) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let req = Request::builder().uri(&uri).body(Body::empty()).unwrap();
+
+        // `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)),
+                Err(err) => Err((
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Something went wrong: {}", err),
+                ))
+        }
+        } else if base == "/pkg" {
+            match ServeDir::new("./pkg").oneshot(req).await {
+                Ok(res) => Ok(res.map(boxed)),
+                Err(err) => Err((
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Something went wrong: {}", err),
+                )),
+        }
+    } else{
+           Err((StatusCode::NOT_FOUND, "Not Found".to_string()))
+        }
+    }
+    }
+}

examples/hackernews-axum/src/lib.rs

@@ -0,0 +1,49 @@
+use cfg_if::cfg_if;
+use leptos::*;
+use leptos_meta::*;
+use leptos_router::*;
+mod api;
+pub mod handlers;
+mod routes;
+use routes::nav::*;
+use routes::stories::*;
+use routes::story::*;
+use routes::users::*;
+
+#[component]
+pub fn App(cx: Scope) -> Element {
+    provide_context(cx, MetaContext::default());
+
+    view! {
+        cx,
+        <div>
+            <Stylesheet href="/static/style.css"/>
+            <Router>
+                <Nav />
+                <main>
+                    <Routes>
+                        <Route path="users/:id" view=|cx| view! { cx,  <User/> }/>
+                        <Route path="stories/:id" view=|cx| view! { cx,  <Story/> }/>
+                        <Route path="*stories" view=|cx| view! { cx,  <Stories/> }/>
+                    </Routes>
+                </main>
+            </Router>
+        </div>
+    }
+}
+
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use wasm_bindgen::prelude::wasm_bindgen;
+
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            leptos::hydrate(body().unwrap(), move |cx| {
+                view! { cx, <App/> }
+            });
+        }
+    }
+}

examples/hackernews-axum/src/main.rs

@@ -0,0 +1,57 @@
+use cfg_if::cfg_if;
+use leptos::*;
+
+// boilerplate to run in different modes
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    // use actix_files::{Files, NamedFile};
+    // use actix_web::*;
+    use axum::{
+        routing::{get},
+        Router,
+        handler::Handler,
+    };
+    use std::net::SocketAddr;
+    use leptos_hackernews_axum::handlers::{file_handler, get_static_file_handler};
+
+    #[tokio::main]
+    async fn main() {
+        use leptos_hackernews_axum::*;
+
+        let addr = SocketAddr::from(([127, 0, 0, 1], 8082));
+
+        log::debug!("serving at {addr}");
+
+        simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
+
+        // build our application with a route
+        let app = Router::new()
+        // `GET /` goes to `root`
+        .nest("/pkg", get(file_handler))
+        .nest("/static", get(get_static_file_handler))
+        .fallback(leptos_axum::render_app_to_stream("leptos_hackernews_axum", |cx| view! { cx, <App/> }).into_service());
+
+        // run our app with hyper
+        // `axum::Server` is a re-export of `hyper::Server`
+        log!("listening on {}", addr);
+        axum::Server::bind(&addr)
+            .serve(app.into_make_service())
+            .await
+            .unwrap();
+    }
+}
+
+    // client-only stuff for Trunk
+    else {
+        use leptos_hackernews_axum::*;
+
+        pub fn main() {
+            console_error_panic_hook::set_once();
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            mount_to_body(|cx| {
+                view! { cx, <App/> }
+            });
+        }
+    }
+}

examples/hackernews-axum/src/routes.rs

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

examples/hackernews-axum/src/routes/nav.rs

@@ -0,0 +1,30 @@
+use leptos::*;
+use leptos_router::*;
+
+#[component]
+pub fn Nav(cx: Scope) -> Element {
+    view! { cx,
+        <header class="header">
+            <nav class="inner">
+                <A href="/">
+                    <strong>"HN"</strong>
+                </A>
+                <A href="/new">
+                    <strong>"New"</strong>
+                </A>
+                <A href="/show">
+                    <strong>"Show"</strong>
+                </A>
+                <A href="/ask">
+                    <strong>"Ask"</strong>
+                </A>
+                <A href="/job">
+                    <strong>"Jobs"</strong>
+                </A>
+                <a class="github" href="http://github.com/gbj/leptos" target="_blank" rel="noreferrer">
+                    "Built with Leptos"
+                </a>
+            </nav>
+        </header>
+    }
+}

examples/hackernews-axum/src/routes/stories.rs

@@ -0,0 +1,154 @@
+use leptos::*;
+use leptos_router::*;
+
+use crate::api;
+
+fn category(from: &str) -> &'static str {
+    match from {
+        "new" => "newest",
+        "show" => "show",
+        "ask" => "ask",
+        "job" => "jobs",
+        _ => "news",
+    }
+}
+
+#[component]
+pub fn Stories(cx: Scope) -> Element {
+    let query = use_query_map(cx);
+    let params = use_params_map(cx);
+    let page = move || {
+        query
+            .with(|q| q.get("page").and_then(|page| page.parse::<usize>().ok()))
+            .unwrap_or(1)
+    };
+    let story_type = move || {
+        params
+            .with(|p| p.get("stories").cloned())
+            .unwrap_or_else(|| "top".to_string())
+    };
+    let stories = create_resource(
+        cx,
+        move || (page(), story_type()),
+        move |(page, story_type)| async move {
+            let path = format!("{}?page={}", category(&story_type), page);
+            api::fetch_api::<Vec<api::Story>>(&api::story(&path)).await
+        },
+    );
+
+    let hide_more_link = move || stories.read().unwrap_or(None).unwrap_or_default().len() < 28;
+
+    view! {
+        cx,
+        <div class="news-view">
+            <div class="news-list-nav">
+                <span>
+                    {move || if page() > 1 {
+                        view! {
+                            cx,
+                            <a class="page-link"
+                                href=move || format!("/{}?page={}", story_type(), page() - 1)
+                                attr:aria_label="Previous Page"
+                            >
+                                "< prev"
+                            </a>
+                        }
+                    } else {
+                        view! {
+                            cx,
+                            <span class="page-link disabled" aria-hidden="true">
+                                "< prev"
+                            </span>
+                        }
+                    }}
+                </span>
+                <span>"page " {page}</span>
+                <span class="page-link"
+                    class:disabled=hide_more_link
+                    aria-hidden=hide_more_link
+                >
+                    <a href=move || format!("/{}?page={}", story_type(), page() + 1)
+                        aria-label="Next Page"
+                    >
+                        "more >"
+                    </a>
+                </span>
+            </div>
+            <main class="news-list">
+                <div>
+                    <Suspense fallback=view! { cx,  <p>"Loading..."</p> }>
+                        {move || match stories.read() {
+                            None => None,
+                            Some(None) => Some(view! { cx,  <p>"Error loading stories."</p> }),
+                            Some(Some(stories)) => {
+                                Some(view! { cx,
+                                    <ul>
+                                        <For each=move || stories.clone() key=|story| story.id>{
+                                            move |cx: Scope, story: &api::Story| {
+                                                view! { cx,
+                                                    <Story story=story.clone() />
+                                                }
+                                            }
+                                        }</For>
+                                    </ul>
+                                })
+                            }
+                        }}
+                    </Suspense>
+                </div>
+            </main>
+        </div>
+    }
+}
+
+#[component]
+fn Story(cx: Scope, story: api::Story) -> Element {
+    view! { cx,
+         <li class="news-item">
+            <span class="score">{story.points}</span>
+            <span class="title">
+                {if !story.url.starts_with("item?id=") {
+                    view! { cx,
+                        <span>
+                            <a href=story.url target="_blank" rel="noreferrer">
+                                {story.title.clone()}
+                            </a>
+                            <span class="host">"("{story.domain}")"</span>
+                        </span>
+                    }
+                } else {
+                    let title = story.title.clone();
+                    view! { cx,  <A href=format!("/stories/{}", story.id)>{title.clone()}</A> }
+                }}
+            </span>
+            <br />
+            <span class="meta">
+                {if story.story_type != "job" {
+                    view! { cx,
+                        <span>
+                            {"by "}
+                            {story.user.map(|user| view ! { cx, <A href=format!("/users/{}", user)>{user.clone()}</A>})}
+                            {format!(" {} | ", story.time_ago)}
+                            <A href=format!("/stories/{}", story.id)>
+                                {if story.comments_count.unwrap_or_default() > 0 {
+                                    format!("{} comments", story.comments_count.unwrap_or_default())
+                                } else {
+                                    "discuss".into()
+                                }}
+                            </A>
+                        </span>
+                    }
+                } else {
+                    let title = story.title.clone();
+                    view! { cx,  <A href=format!("/item/{}", story.id)>{title.clone()}</A> }
+                }}
+            </span>
+            {(story.story_type != "link").then(|| view! { cx,
+                <span>
+                    //{" "}
+                    <span class="label">{story.story_type}</span>
+                </span>
+            })}
+        </li>
+    }
+}

examples/hackernews-axum/src/routes/story.rs

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

examples/hackernews-axum/src/routes/users.rs

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

examples/hackernews-axum/static/style.css

@@ -0,0 +1,326 @@
+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/hackernews/.leptos.kdl

@@ -0,0 +1,7 @@
+// This file is auto-generated. Changing it will have no effect on leptos. Change these by changing RenderOptions and rerunning
+RenderOptions {
+    pkg-path "/pkg/leptos_hackernews"
+    environment "PROD"
+    socket-address "127.0.0.1:3000"
+    reload-port 3001
+}

examples/hackernews/Cargo.toml

@@ -14,11 +14,10 @@ console_log = "0.2"
 console_error_panic_hook = "0.1"
 futures = "0.3"
 cfg-if = "1"
-leptos = { path = "../../../leptos/leptos", default-features = false, features = [
-	"serde",
-] }
-leptos_meta = { path = "../../../leptos/meta", default-features = false }
-leptos_router = { path = "../../../leptos/router", default-features = false }
+leptos = { path = "../../leptos", default-features = false, features = ["serde"] }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_actix = { path = "../../integrations/actix", default-features = false, optional = true }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4"
 simple_logger = "2"
 serde = { version = "1", features = ["derive"] }
@@ -26,6 +25,9 @@ serde_json = "1"
 gloo-net = { version = "0.2", features = ["http"] }
 reqwest = { version = "0.11", features = ["json"] }
 # openssl = { version = "0.10", features = ["v110"] }
+wasm-bindgen = "0.2"
+web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
+tracing = "0.1"
 
 [features]
 default = ["csr"]
@@ -34,11 +36,12 @@ hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
 	"dep:actix-files",
 	"dep:actix-web",
+	"dep:leptos_actix",
 	"leptos/ssr",
 	"leptos_meta/ssr",
 	"leptos_router/ssr",
 ]
 
 [package.metadata.cargo-all-features]
-denylist = ["actix-files", "actix-web"]
+denylist = ["actix-files", "actix-web", "leptos_actix"]
 skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]

examples/hackernews/README.md

@@ -14,7 +14,7 @@ wasm-pack build --target=web --no-default-features --features=hydrate
 to generate the Webassembly to provide hydration features for the server.
 Then run the server with `cargo run` to serve the server side rendered HTML and the WASM bundle for hydration. 
 ```bash
-cargo run --no-default-features --features=ssr`
+cargo run --no-default-features --features=ssr
 ```
 > Note that if your hydration code changes, you will have to rerun the wasm-pack command above
 > This should be temporary, and vastly improve once cargo-leptos becomes ready for prime time!

examples/hackernews/src/api.rs

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

examples/hackernews/src/lib.rs

@@ -1,5 +1,5 @@
 use cfg_if::cfg_if;
-use leptos::*;
+use leptos::{component, Scope, IntoView, provide_context, view};
 use leptos_meta::*;
 use leptos_router::*;
 mod api;
@@ -10,24 +10,23 @@ use routes::story::*;
 use routes::users::*;
 
 #[component]
-pub fn App(cx: Scope) -> Element {
-    provide_context(cx, MetaContext::default());
-
+pub fn App(cx: Scope) -> impl IntoView {
     view! {
         cx,
-        <div>
-            <Stylesheet href="/static/style.css".into()/>
+        <>
+            <Stylesheet href="/style.css"/>
+            <Meta name="description" content="Leptos implementation of a HackerNews demo."/>
             <Router>
                 <Nav />
                 <main>
                     <Routes>
-                        <Route path="users/:id" element=|cx| view! { cx,  <User/> }/>
-                        <Route path="stories/:id" element=|cx| view! { cx,  <Story/> }/>
-                        <Route path="*stories" element=|cx| view! { cx,  <Stories/> }/>
+                        <Route path="users/:id" view=|cx| view! { cx,  <User/> }/>
+                        <Route path="stories/:id" view=|cx| view! { cx,  <Story/> }/>
+                        <Route path="*stories" view=|cx| view! { cx,  <Stories/> }/>
                     </Routes>
                 </main>
             </Router>
-        </div>
+        </>
     }
 }
 
@@ -37,10 +36,10 @@ cfg_if! {
         use wasm_bindgen::prelude::wasm_bindgen;
 
         #[wasm_bindgen]
-        pub fn main() {
+        pub fn hydrate() {
             _ = console_log::init_with_level(log::Level::Debug);
             console_error_panic_hook::set_once();
-            leptos::hydrate(body().unwrap(), move |cx| {
+            leptos::mount_to_body(move |cx| {
                 view! { cx, <App/> }
             });
         }

examples/hackernews/src/main.rs

@@ -3,109 +3,39 @@ use leptos::*;
 
 // boilerplate to run in different modes
 cfg_if! {
+    // server-only stuff
     if #[cfg(feature = "ssr")] {
-        use actix_files::{Files, NamedFile};
+        use actix_files::{Files};
         use actix_web::*;
-        use futures::StreamExt;
-        use leptos_meta::*;
-        use leptos_router::*;
         use leptos_hackernews::*;
+        use std::{net::SocketAddr, env};
 
-        #[get("/static/style.css")]
+        #[get("/style.css")]
         async fn css() -> impl Responder {
-            NamedFile::open_async("./style.css").await
-        }
-
-        // match every path — our router will handle actual dispatch
-        #[get("{tail:.*}")]
-        async fn render_app(req: HttpRequest) -> impl Responder {
-            let path = req.path();
-
-            let query = req.query_string();
-            let path = if query.is_empty() {
-                "http://leptos".to_string() + path
-            } else {
-                "http://leptos".to_string() + path + "?" + query
-            };
-
-            let app = move |cx| {
-                let integration = ServerIntegration { path: path.clone() };
-                provide_context(cx, RouterIntegrationContext::new(integration));
-
-                view! { cx, <App/> }
-            };
-
-            let head = r#"<!DOCTYPE html>
-                <html lang="en">
-                    <head>
-                        <meta charset="utf-8"/>
-                        <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                        <script type="module">import init, { main } from '/pkg/leptos_hackernews.js'; init().then(main);</script>"#;
-            let tail = "</body></html>";
-
-            HttpResponse::Ok().content_type("text/html").streaming(
-                futures::stream::once(async { head.to_string() })
-                    .chain(render_to_stream(move |cx| {
-                        let app = app(cx);
-                        let head = use_context::<MetaContext>(cx)
-                            .map(|meta| meta.dehydrate())
-                            .unwrap_or_default();
-                        format!("{head}</head><body>{app}")
-                    }))
-                    .chain(futures::stream::once(async { tail.to_string() }))
-                    .map(|html| Ok(web::Bytes::from(html)) as Result<web::Bytes>),
-            )
+            actix_files::NamedFile::open_async("./style.css").await
         }
 
         #[actix_web::main]
         async fn main() -> std::io::Result<()> {
-            let host = std::env::var("HOST").unwrap_or_else(|_| "127.0.0.1".to_string());
-            let port = std::env::var("PORT").unwrap_or_else(|_| "8080".to_string());
-            log::debug!("serving at {host}:{port}");
+            let addr = SocketAddr::from(([127,0,0,1],3000));
 
-            simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
-
-            // uncomment these lines (and .bind_openssl() below) to enable HTTPS, which is sometimes
-            // necessary for proper HTTP/2 streaming
-
-            // load TLS keys
-            // to create a self-signed temporary cert for testing:
-            // `openssl req -x509 -newkey rsa:4096 -nodes -keyout key.pem -out cert.pem -days 365 -subj '/CN=localhost'`
-            // let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
-            // builder
-            //     .set_private_key_file("key.pem", SslFiletype::PEM)
-            //     .unwrap();
-            // builder.set_certificate_chain_file("cert.pem").unwrap();
-
-            HttpServer::new(|| {
+            HttpServer::new(move || {
+                let render_options: RenderOptions = RenderOptions::builder().pkg_path("/pkg/leptos_hackernews").reload_port(3001).socket_address(addr.clone()).environment(&env::var("RUST_ENV")).build();
+                render_options.write_to_file();
                 App::new()
+                    .service(Files::new("/pkg", "./pkg"))
                     .service(css)
-                    .service(
-                        web::scope("/pkg")
-                            .service(Files::new("", "./dist"))
-                            .wrap(middleware::Compress::default()),
-                    )
-                    .service(render_app)
+                    .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+                    .route("/{tail:.*}", leptos_actix::render_app_to_stream(render_options, |cx| view! { cx, <App/> }))
+                //.wrap(middleware::Compress::default())
             })
-            .bind(("127.0.0.1", 8080))?
-            // replace .bind with .bind_openssl to use HTTPS
-            //.bind_openssl(&format!("{}:{}", host, port), builder)?
+            .bind(&addr)?
             .run()
             .await
         }
-    }
-
-    // client-only stuff for Trunk
-    else {
-        use leptos_hackernews::*;
-
-        pub fn main() {
-            console_error_panic_hook::set_once();
-            _ = console_log::init_with_level(log::Level::Debug);
-            console_error_panic_hook::set_once();
-            mount_to_body(|cx| {
-                view! { cx, <App/> }
-            });
+    } else {
+        fn main() {
+            // no client-side main function
         }
     }
 }

examples/hackernews/src/routes/nav.rs

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

examples/hackernews/src/routes/stories.rs

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

examples/hackernews/src/routes/story.rs

@@ -1,18 +1,27 @@
 use crate::api;
 use leptos::*;
+use leptos_meta::*;
 use leptos_router::*;
 
 #[component]
-pub fn Story(cx: Scope) -> Element {
+pub fn Story(cx: Scope) -> impl IntoView {
     let params = use_params_map(cx);
     let story = create_resource(
         cx,
         move || params().get("id").cloned().unwrap_or_default(),
-        move |id| async move { api::fetch_api::<api::Story>(&api::story(&format!("item/{id}"))).await },
+        move |id| async move {
+            if id.is_empty() {
+                None
+            } else {
+                api::fetch_api::<api::Story>(cx, &api::story(&format!("item/{id}"))).await
+            }
+        },
     );
+    let meta_description = move || story.read().and_then(|story| story.map(|story| story.title.clone())).unwrap_or_else(|| "Loading story...".to_string());
 
     view! { cx,
-        <div>
+        <>
+            <Meta name="description" content=meta_description/>
             {move || story.read().map(|story| match story {
                 None => view! { cx,  <div class="item-view">"Error loading this story."</div> },
                 Some(story) => view! { cx,
@@ -40,19 +49,21 @@ pub fn Story(cx: Scope) -> Element {
                             }}
                         </p>
                         <ul class="comment-children">
-                            <For each=move || story.comments.clone().unwrap_or_default() key=|comment| comment.id>
-                                {move |cx, comment: &api::Comment| view! { cx,  <Comment comment=comment.clone() /> }}
-                            </For>
+                            <For
+                                each=move || story.comments.clone().unwrap_or_default()
+                                key=|comment| comment.id
+                                view=move |comment| view! { cx,  <Comment comment /> }
+                            />
                         </ul>
                     </div>
                 </div>
             }})}
-        </div>
+        </>
     }
 }
 
 #[component]
-pub fn Comment(cx: Scope, comment: api::Comment) -> Element {
+pub fn Comment(cx: Scope, comment: api::Comment) -> impl IntoView {
     let (open, set_open) = create_signal(cx, true);
 
     view! { cx,
@@ -81,9 +92,11 @@ pub fn Comment(cx: Scope, comment: api::Comment) -> Element {
                         let comments = comment.comments.clone();
                         move || view! { cx,
                             <ul class="comment-children">
-                                <For each=move || comments.clone() key=|comment| comment.id>
-                                    {|cx, comment: &api::Comment| view! { cx, <Comment comment=comment.clone() /> }}
-                                </For>
+                                /* <For
+                                    each=move || comments.clone()
+                                    key=|comment| comment.id
+                                    view=move |comment: api::Comment| view! { cx, <Comment comment /> }
+                                /> */
                             </ul>
                         }
                     })}

examples/hackernews/src/routes/users.rs

@@ -3,17 +3,23 @@ use leptos::*;
 use leptos_router::*;
 
 #[component]
-pub fn User(cx: Scope) -> Element {
+pub fn User(cx: Scope) -> impl IntoView {
     let params = use_params_map(cx);
     let user = create_resource(
         cx,
         move || params().get("id").cloned().unwrap_or_default(),
-        move |id| async move { api::fetch_api::<User>(&api::user(&id)).await },
+        move |id| async move {
+            if id.is_empty() {
+                None
+            } else {
+                api::fetch_api::<User>(cx, &api::user(&id)).await
+            }
+        },
     );
     view! { cx,
         <div class="user-view">
             {move || user.read().map(|user| match user {
-                None => view! { cx,  <h1>"User not found."</h1> },
+                None => view! { cx,  <h1>"User not found."</h1> }.into_any(),
                 Some(user) => view! { cx,
                     <div>
                         <h1>"User: " {&user.id}</h1>
@@ -32,7 +38,7 @@ pub fn User(cx: Scope) -> Element {
                             <a href=format!("https://news.ycombinator.com/threads?id={}", user.id)>"comments"</a>
                         </p>
                     </div>
-                }
+                }.into_any()
             })}
         </div>
     }

examples/parent-child/src/lib.rs

@@ -1,5 +1,5 @@
 use leptos::*;
-use web_sys::Event;
+use web_sys::MouseEvent;
 
 // This highlights four different ways that child components can communicate
 // with their parent:
@@ -7,23 +7,21 @@ use web_sys::Event;
 //    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)
+// 4) <ButtonC/>: providing a context that is used in the component (rather than prop drilling)
 
 #[derive(Copy, Clone)]
 struct SmallcapsContext(WriteSignal<bool>);
 
 #[component]
-pub fn App(cx: Scope) -> Element {
+pub fn App(cx: Scope) -> impl IntoView {
     // just some signals to toggle three classes on our <p>
     let (red, set_red) = create_signal(cx, false);
     let (right, set_right) = create_signal(cx, false);
-    let (italics, set_italics) = create_signal(cx, false);
     let (smallcaps, set_smallcaps) = create_signal(cx, false);
 
     // the newtype pattern isn't *necessary* here but is a good practice
     // it avoids confusion with other possible future `WriteSignal<bool>` contexts
-    // and makes it easier to refer to it in ButtonD
+    // and makes it easier to refer to it in ButtonC
     provide_context(cx, SmallcapsContext(set_smallcaps));
 
     view! {
@@ -33,7 +31,6 @@ pub fn App(cx: Scope) -> Element {
                 // class: attributes take F: Fn() => bool, and these signals all implement Fn()
                 class:red=red
                 class:right=right
-                class:italics=italics
                 class:smallcaps=smallcaps
             >
                 "Lorem ipsum sit dolor amet."
@@ -45,18 +42,19 @@ pub fn App(cx: Scope) -> Element {
             // Button B: pass a closure
             <ButtonB on_click=move |_| set_right.update(|value| *value = !*value)/>
 
-            // Button C: components that return an Element, like elements, can take on: event handler attributes
-            <ButtonC on:click=move |_| set_italics.update(|value| *value = !*value)/>
-
             // Button D gets its setter from context rather than props
-            <ButtonD/>
+            <ButtonC/>
         </main>
     }
 }
 
-// Button A receives a signal setter and updates the signal itself
+/// Button A receives a signal setter and updates the signal itself
 #[component]
-pub fn ButtonA(cx: Scope, setter: WriteSignal<bool>) -> Element {
+pub fn ButtonA(
+    cx: Scope,
+    /// Signal that will be toggled when the button is clicked.
+    setter: WriteSignal<bool>
+) -> impl IntoView {
     view! {
         cx,
         <button
@@ -67,11 +65,15 @@ pub fn ButtonA(cx: Scope, setter: WriteSignal<bool>) -> Element {
     }
 }
 
-// Button B receives a closure
+/// Button B receives a closure
 #[component]
-pub fn ButtonB<F>(cx: Scope, on_click: F) -> Element
+pub fn ButtonB<F>(
+    cx: Scope,
+    /// Callback that will be invoked when the button is clicked.
+    on_click: F
+) -> impl IntoView
 where
-    F: Fn(Event) + 'static,
+    F: Fn(MouseEvent) + 'static,
 {
     view! {
         cx,
@@ -82,11 +84,11 @@ where
         </button>
     }
 
-    // just a note: in an ordinary function ButtonB could take on_click: impl Fn(Event) + 'static
+    // just a note: in an ordinary function ButtonB could take on_click: impl Fn(MouseEvent) + 'static
     // and save you from typing out the generic
     // the component macro actually expands to define a
     //
-    // struct ButtonBProps<F> where F: Fn(Event) + 'static {
+    // struct ButtonBProps<F> where F: Fn(MouseEvent) + 'static {
     //   on_click: F
     // }
     //
@@ -95,22 +97,10 @@ where
     // if Rust ever had named function arguments we could drop this requirement
 }
 
-// Button C will have its event listener added by the parent
-// This is just a way of encapsulating whatever markup you need for the button
+/// Button D is very similar to Button A, but instead of passing the setter as a prop
+/// we get it from the context
 #[component]
-pub fn ButtonC(cx: Scope) -> Element {
-    view! {
-        cx,
-        <button>
-            "Toggle Italics"
-        </button>
-    }
-}
-
-// Button D is very similar to Button A, but instead of passing the setter as a prop
-// we get it from the context
-#[component]
-pub fn ButtonD(cx: Scope) -> Element {
+pub fn ButtonC(cx: Scope) -> impl IntoView {
     let setter = use_context::<SmallcapsContext>(cx).unwrap().0;
 
     view! {

examples/router/Cargo.toml

@@ -11,8 +11,7 @@ leptos_router = { path = "../../router", features=["csr"] }
 serde = { version = "1", features = ["derive"] }
 futures = "0.3"
 console_error_panic_hook = "0.1.7"
-leptos_meta = { path = "../../../leptos/meta", default-features = false }
+leptos_meta = { path = "../../meta", default-features = false }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.0"
-

examples/router/src/api.rs

@@ -27,9 +27,9 @@ pub struct Contact {
     pub phone: String,
 }
 
-pub async fn get_contacts(search: String) -> Vec<ContactSummary> {
+pub async fn get_contacts(_search: String) -> Vec<ContactSummary> {
     // fake an API call with an artificial delay
-    delay(Duration::from_millis(300)).await;
+    _ = delay(Duration::from_millis(300)).await;
     vec![
         ContactSummary {
             id: 0,
@@ -51,7 +51,7 @@ pub async fn get_contacts(search: String) -> Vec<ContactSummary> {
 
 pub async fn get_contact(id: Option<usize>) -> Option<Contact> {
     // fake an API call with an artificial delay
-    delay(Duration::from_millis(500)).await;
+    _ = delay(Duration::from_millis(500)).await;
     match id {
         Some(0) => Some(Contact {
             id: 0,
@@ -97,7 +97,7 @@ fn delay(duration: Duration) -> impl Future<Output = Result<(), Canceled>> {
     let (tx, rx) = oneshot::channel();
     set_timeout(
         move || {
-            tx.send(());
+            _ = tx.send(());
         },
         duration,
     );

examples/router/src/lib.rs

@@ -1,84 +1,85 @@
 mod api;
 
-use api::{Contact, ContactSummary};
 use leptos::*;
-use leptos_meta::*;
 use leptos_router::*;
 
 use crate::api::{get_contact, get_contacts};
 
-pub fn router_example(cx: Scope) -> Element {
-    provide_context(cx, MetaContext::default());
+#[component]
+pub fn RouterExample(cx: Scope) -> impl IntoView {
+    log::debug!("rendering <RouterExample/>");
+
     view! { cx,
-        <div id="root">
-            <Router>
-                <nav>
-                    <A exact=true href="/">"Contacts"</A>
-                    <A href="about">"About"</A>
-                    <A href="settings">"Settings"</A>
-                </nav>
-                <main>
-                    <Routes>
+        <Router>
+            <nav>
+                <A exact=true href="/">"Contacts"</A>
+                <A href="about">"About"</A>
+                <A href="settings">"Settings"</A>
+            </nav>
+            <main>
+                <Routes>
+                    <Route
+                        path=""
+                        view=move |cx| view! { cx,  <ContactList/> }
+                    >
                         <Route
-                            path=""
-                            element=move |cx| view! { cx,  <ContactList/> }
-                        >
-                            <Route
-                                path=":id"
-                                element=move |cx| view! { cx,  <Contact/> }
-                            />
-                            <Route
-                                path="/"
-                                element=move |_| view! { cx,  <p>"Select a contact."</p> }
-                            />
-                        </Route>
-                        <Route
-                            path="about"
-                            element=move |cx| view! { cx,  <About/> }
+                            path=":id"
+                            view=move |cx| view! { cx,  <Contact/> }
                         />
                         <Route
-                            path="settings"
-                            element=move |cx| view! { cx,  <Settings/> }
+                            path="/"
+                            view=move |_| view! { cx,  <p>"Select a contact."</p> }
                         />
-                    </Routes>
-                </main>
-            </Router>
-        </div>
+                    </Route>
+                    <Route
+                        path="about"
+                        view=move |cx| view! { cx,  <About/> }
+                    />
+                    <Route
+                        path="settings"
+                        view=move |cx| view! { cx,  <Settings/> }
+                    />
+                </Routes>
+            </main>
+        </Router>
     }
 }
 
 #[component]
-pub fn ContactList(cx: Scope) -> Element {
+pub fn ContactList(cx: Scope) -> impl IntoView {
+    log::debug!("rendering <ContactList/>");
+
     let location = use_location(cx);
     let contacts = create_resource(cx, move || location.search.get(), get_contacts);
+    let contacts = move || {
+        contacts.read().map(|contacts| {
+            // this data doesn't change frequently so we can use .map().collect() instead of a keyed <For/>
+            contacts
+                .into_iter()
+                .map(|contact| {
+                    view! { cx,
+                        <li><A href=contact.id.to_string()><span>{&contact.first_name} " " {&contact.last_name}</span></A></li>
+                    }
+                })
+                .collect::<Vec<_>>()
+        })
+    };
 
     view! { cx,
         <div class="contact-list">
             <h1>"Contacts"</h1>
-            <ul>
-                <Suspense fallback=move || view! { cx,  <p>"Loading contacts..."</p> }>{
-                    move || {
-                        contacts.read().map(|contacts| view! { cx,
-                            <For each=move || contacts.clone() key=|contact| contact.id>
-                                {move |cx, contact: &ContactSummary| {
-                                    let id = contact.id;
-                                    let name = format!("{} {}", contact.first_name, contact.last_name);
-                                    view! { cx,
-                                        <li><A href=id.to_string()><span>{name.clone()}</span></A></li>
-                                    }
-                                }}
-                            </For>
-                        })
-                    }
-                }</Suspense>
-            </ul>
+            <Suspense fallback=move || view! { cx,  <p>"Loading contacts..."</p> }>
+                {move || view! { cx, <ul>{contacts}</ul>}}
+            </Suspense>
             <Outlet/>
         </div>
     }
 }
 
 #[component]
-pub fn Contact(cx: Scope) -> Element {
+pub fn Contact(cx: Scope) -> impl IntoView {
+    log::debug!("rendering <Contact/>");
+
     let params = use_params_map(cx);
     let contact = create_resource(
         cx,
@@ -102,14 +103,14 @@ pub fn Contact(cx: Scope) -> Element {
         // I'm only doing this explicitly for the example
         None => None,
         // Some(None) => has loaded and found no contact
-        Some(None) => Some(view! { cx, <p>"No contact with this ID was found."</p> }),
+        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()),
     };
 
     view! { cx,
@@ -122,7 +123,9 @@ pub fn Contact(cx: Scope) -> Element {
 }
 
 #[component]
-pub fn About(_cx: Scope) -> Vec<Element> {
+pub fn About(cx: Scope) -> impl IntoView {
+    log::debug!("rendering <About/>");
+
     view! { cx,
         <>
             <h1>"About"</h1>
@@ -132,7 +135,8 @@ pub fn About(_cx: Scope) -> Vec<Element> {
 }
 
 #[component]
-pub fn Settings(_cx: Scope) -> Vec<Element> {
+pub fn Settings(cx: Scope) -> impl IntoView {
+    log::debug!("rendering <Settings/>");
     view! { cx,
         <>
             <h1>"Settings"</h1>

examples/router/src/main.rs

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

examples/tailwind/.gitignore

@@ -0,0 +1,10 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk

examples/tailwind/Cargo.toml

@@ -0,0 +1,92 @@
+[workspace]
+
+[package]
+name = "example"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+
+[dependencies]
+leptos = { path = "../../leptos", default-features = false, features = [
+  "serde",
+] }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
+
+gloo-net = { version = "0.2", features = ["http"] }
+log = "0.4"
+cfg-if = "1.0"
+
+# dependecies for client (enable when csr or hydrate set)
+wasm-bindgen = { version = "0.2", optional = true }
+console_log = { version = "0.2", optional = true }
+console_error_panic_hook = { version = "0.1", optional = true }
+
+# dependecies for server (enable when ssr set)
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", features = ["macros"], optional = true }
+futures = { version = "0.3", optional = true }
+simple_logger = { version = "4.0", optional = true }
+serde_json = { version = "1.0", optional = true }
+reqwest = { version = "0.11", features = ["json"], optional = true }
+
+[profile.release]
+codegen-units = 1
+lto = true
+opt-level = 'z'
+
+[features]
+leptos_autoreload = []
+default = ["csr"]
+hydrate = [
+  "leptos/hydrate",
+  "leptos_meta/hydrate",
+  "leptos_router/hydrate",
+  "dep:wasm-bindgen",
+  "dep:console_log",
+  "dep:console_error_panic_hook",
+]
+csr = [
+  "leptos/csr",
+  "leptos_meta/csr",
+  "leptos_router/csr",
+  "dep:wasm-bindgen",
+  "dep:console_log",
+  "dep:console_error_panic_hook",
+]
+ssr = [
+  "leptos/ssr",
+  "leptos_meta/ssr",
+  "leptos_router/ssr",
+  "dep:reqwest",
+  "dep:actix-web",
+  "dep:actix-files",
+  "dep:futures",
+  "dep:simple_logger",
+  "dep:serde_json",
+]
+
+[package.metadata.leptos]
+# Path, relative to root, to generat rust code to
+gen_file = "src/server/generated.rs"
+# Path to the source index.html file
+index_file = "index.html"
+# [Optional] Files in the asset_dir will be copied to the target/site directory
+assets_dir = "assets"
+# [Optional] Command to use when running end2end tests. It will run in the end2end dir.
+end2end_test_cmd = "npx playwright test"
+# On which port to serve the client side rendered site (when using --csr option)
+csr_port = 3000
+# The port to use for automatic reload monitoring
+reload_port = 3001
+
+[package.metadata.leptos.style]
+# This points to the TailwindCSS output file
+file = "style/output.css"
+# A https://browsersl.ist query
+browserquery = "defaults"

examples/tailwind/LICENSE

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

examples/tailwind/README.md

@@ -0,0 +1,74 @@
+# 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.
+
+If you don't have `cargo-leptos` installed you can install it with
+
+`cargo install --locked cargo-leptos`
+
+Then run
+
+`npx tailwindcss -i ./input.css -o ./style/output.css --watch`
+
+and
+
+`cargo leptos watch`
+
+in this directory.
+
+You can begin editing your app at `src/app/mod.rs`.
+
+## Installing Tailwind
+
+You can install Tailwind using `npm`:
+
+```bash
+npm install -D tailwindcss
+```
+
+If you'd rather not use `npm`, you can install the Tailwind binary [here](https://github.com/tailwindlabs/tailwindcss/releases).
+
+## Setting up with VS Code and Additional Tools
+
+If you're using VS Code, add the following to your `settings.json`
+
+```json
+  "emmet.includeLanguages": {
+    "rust": "html",
+    "*.rs": "html"
+  },
+  "tailwindCSS.includeLanguages": {
+      "rust": "html",
+      "*.rs": "html"
+  },
+  "files.associations": {
+      "*.rs": "rust"
+  },
+  "editor.quickSuggestions": {
+    "other": "on",
+    "comments": "on",
+    "strings": true
+  },
+  "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.
+
+1. `rustup toolchain install nightly --allow-downgrade` - make sure you have Rust nightly
+2. `rustup default nightly` - setup nightly as default, or you can use rust-toolchain file later on
+3. `rustup target add wasm32-unknown-unknown` - add the ability to compile Rust to WebAssembly
+4. `cargo install cargo-generate` - install `cargo-generate` binary (should be installed automatically in future)
+5. `npm install -g sass` - install `dart-sass` (should be optional in future
+
+## 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).

examples/tailwind/end2end/package-lock.json

@@ -0,0 +1,74 @@
+{
+  "name": "end2end",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "end2end",
+      "version": "1.0.0",
+      "license": "ISC",
+      "devDependencies": {
+        "@playwright/test": "^1.28.0"
+      }
+    },
+    "node_modules/@playwright/test": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.28.0.tgz",
+      "integrity": "sha512-vrHs5DFTPwYox5SGKq/7TDn/S4q6RA1zArd7uhO6EyP9hj3XgZBBM12ktMbnDQNxh/fL1IUKsTNLxihmsU38lQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "playwright-core": "1.28.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+      "dev": true
+    },
+    "node_modules/playwright-core": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.0.tgz",
+      "integrity": "sha512-nJLknd28kPBiCNTbqpu6Wmkrh63OEqJSFw9xOfL9qxfNwody7h6/L3O2dZoWQ6Oxcm0VOHjWmGiCUGkc0X3VZA==",
+      "dev": true,
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    }
+  },
+  "dependencies": {
+    "@playwright/test": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.28.0.tgz",
+      "integrity": "sha512-vrHs5DFTPwYox5SGKq/7TDn/S4q6RA1zArd7uhO6EyP9hj3XgZBBM12ktMbnDQNxh/fL1IUKsTNLxihmsU38lQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "playwright-core": "1.28.0"
+      }
+    },
+    "@types/node": {
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+      "dev": true
+    },
+    "playwright-core": {
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.0.tgz",
+      "integrity": "sha512-nJLknd28kPBiCNTbqpu6Wmkrh63OEqJSFw9xOfL9qxfNwody7h6/L3O2dZoWQ6Oxcm0VOHjWmGiCUGkc0X3VZA==",
+      "dev": true
+    }
+  }
+}

examples/tailwind/end2end/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "end2end",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {},
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@playwright/test": "^1.28.0"
+  }
+}

examples/tailwind/end2end/playwright.config.ts

@@ -0,0 +1,107 @@
+import type { PlaywrightTestConfig } from "@playwright/test";
+import { devices } from "@playwright/test";
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+const config: PlaywrightTestConfig = {
+  testDir: "./tests",
+  /* Maximum time one test can run for. */
+  timeout: 30 * 1000,
+  expect: {
+    /**
+     * Maximum time expect() should wait for the condition to be met.
+     * For example in `await expect(locator).toHaveText();`
+     */
+    timeout: 5000,
+  },
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: "html",
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
+    actionTimeout: 0,
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    // baseURL: 'http://localhost:3000',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: "on-first-retry",
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: "chromium",
+      use: {
+        ...devices["Desktop Chrome"],
+      },
+    },
+
+    {
+      name: "firefox",
+      use: {
+        ...devices["Desktop Firefox"],
+      },
+    },
+
+    {
+      name: "webkit",
+      use: {
+        ...devices["Desktop Safari"],
+      },
+    },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: {
+    //     ...devices['Pixel 5'],
+    //   },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: {
+    //     ...devices['iPhone 12'],
+    //   },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: {
+    //     channel: 'msedge',
+    //   },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: {
+    //     channel: 'chrome',
+    //   },
+    // },
+  ],
+
+  /* Folder for test artifacts such as screenshots, videos, traces, etc. */
+  // outputDir: 'test-results/',
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: 'npm run start',
+  //   port: 3000,
+  // },
+};
+
+export default config;

examples/tailwind/end2end/tests/example.spec.ts

@@ -0,0 +1,9 @@
+import { test, expect } from "@playwright/test";
+
+test("homepage has title and links to intro page", async ({ page }) => {
+  await page.goto("http://localhost:3000/");
+
+  await expect(page).toHaveTitle("Cargo Leptos");
+
+  await expect(page.locator("h1")).toHaveText("Hi from your Leptos WASM!");
+});

examples/tailwind/index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Cargo Leptos</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <!-- INJECT HEAD -->
+  </head>
+  <body>
+    <!-- INJECT BODY -->
+  </body>
+</html>

examples/tailwind/input.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

examples/tailwind/src/app/mod.rs

@@ -0,0 +1,26 @@
+use leptos::*;
+use leptos_meta::*;
+
+#[component]
+pub fn App(cx: Scope) -> impl IntoView {
+    provide_context(cx, MetaContext::default());
+    let (count, set_count) = create_signal(cx, 0);
+
+    view! {
+        cx,
+        <main class="my-0 mx-auto max-w-3xl text-center">
+            <h2 class="p-6 text-4xl">"Welcome to Leptos with Tailwind"</h2>
+            <p class="px-10 pb-10 text-left">"Tailwind will scan your Rust files for Tailwind class names and compile them into a CSS file."</p>
+            <button
+                class="bg-sky-600 hover:bg-sky-700 px-5 py-3 text-white rounded-lg"
+                on:click=move |_| set_count.update(|count| *count += 1)
+            >
+                {move || if count() == 0 {
+                    "Click me!".to_string()
+                } else {
+                    count().to_string()
+                }}
+            </button>
+        </main>
+    }
+}

examples/tailwind/src/lib.rs

@@ -0,0 +1,22 @@
+mod app;
+use cfg_if::cfg_if;
+
+cfg_if! {
+  if #[cfg(any(feature = "hydrate", feature = "csr"))] {
+    use wasm_bindgen::prelude::wasm_bindgen;
+
+    #[wasm_bindgen(start)]
+    pub fn main() {
+        use app::*;
+        use leptos::*;
+        _ = console_log::init_with_level(log::Level::Debug);
+        console_error_panic_hook::set_once();
+
+        log!("csr mode - mounting to body");
+
+        mount_to_body(|cx| {
+            view! { cx, <App /> }
+        });
+    }
+  }
+}

examples/tailwind/src/main.rs

@@ -0,0 +1,17 @@
+mod app;
+#[cfg(feature = "ssr")]
+mod server;
+
+use cfg_if::cfg_if;
+
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
+        #[actix_web::main]
+        async fn main() -> std::io::Result<()> {
+            server::run().await
+        }
+    }
+    else {
+        pub fn main() {}
+    }
+}

examples/tailwind/src/server/generated.rs

@@ -0,0 +1,49 @@
+//! THIS FILE IS AUTOGENERATED, DO NOT MODIFY
+//! When building, `cargo-leptos` generates this file based on
+//! the `index.html` file specified in the Config.toml
+//!
+//! This file can be commited to version control. It only
+//! changes when the configuration changes
+
+#[cfg(feature = "leptos_autoreload")]
+/// index.html content up to `<!-- INJECT HEAD -->` plus `cargo leptos` injected css and js content.
+pub const HTML_START: &str = r##"<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Cargo Leptos</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <script type="module">import init from '/pkg/app.js';init('/pkg/app.wasm');</script>
+    <link rel="preload" href="/pkg/app.wasm" as="fetch" type="application/wasm" crossorigin="">
+    <link rel="stylesheet" href="/pkg/app.css">
+    <link rel="modulepreload" href="/pkg/app.js">
+    <script crossorigin="">(function () {
+        var ws = new WebSocket('ws://127.0.0.1:3001/autoreload');
+        ws.onmessage = (ev) => {
+            console.log(`Reload message: `);
+            if (ev.data === 'reload') window.location.reload();
+        };
+        ws.onclose = () => console.warn('Autoreload stopped. Manual reload necessary.');
+    })()
+    </script>"##;
+
+#[cfg(not(feature = "leptos_autoreload"))]
+/// index.html content up to `<!-- INJECT HEAD -->` plus `cargo leptos` injected css and js content.
+pub const HTML_START: &str = r##"<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Cargo Leptos</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <script type="module">import init from '/pkg/app.js';init('/pkg/app.wasm');</script>
+    <link rel="preload" href="/pkg/app.wasm" as="fetch" type="application/wasm" crossorigin="">
+    <link rel="stylesheet" href="/pkg/app.css">
+    <link rel="modulepreload" href="/pkg/app.js">"##;
+
+/// index.html content from `<!-- INJECT HEAD -->` up to `<!-- INJECT BODY -->`
+pub const HTML_MIDDLE: &str = r##"  </head>
+  <body>"##;
+
+/// index.html content from `<!-- INJECT BODY -->` until the end
+pub const HTML_END: &str = r##"  </body>
+</html>"##;

examples/tailwind/src/server/mod.rs

@@ -0,0 +1,95 @@
+mod generated;
+
+use crate::app::*;
+use actix_files::Files;
+use actix_web::*;
+use futures::StreamExt;
+use generated::{HTML_END, HTML_MIDDLE, HTML_START};
+use leptos::*;
+use leptos_meta::*;
+use leptos_router::*;
+
+#[derive(Copy, Clone, Debug)]
+struct ActixIntegration {
+    path: ReadSignal<String>,
+}
+
+impl History for ActixIntegration {
+    fn location(&self, cx: leptos::Scope) -> ReadSignal<LocationChange> {
+        create_signal(
+            cx,
+            LocationChange {
+                value: self.path.get(),
+                replace: false,
+                scroll: true,
+                state: State(None),
+            },
+        )
+        .0
+    }
+
+    fn navigate(&self, _loc: &LocationChange) {}
+}
+
+// match every path — our router will handle actual dispatch
+#[get("{tail:.*}")]
+async fn render_app(req: HttpRequest) -> impl Responder {
+    let path = req.path();
+
+    let query = req.query_string();
+    let path = if query.is_empty() {
+        "http://leptos".to_string() + path
+    } else {
+        "http://leptos".to_string() + path + "?" + query
+    };
+
+    let app = move |cx| {
+        let integration = ActixIntegration {
+            path: create_signal(cx, path.clone()).0,
+        };
+        provide_context(cx, RouterIntegrationContext(std::rc::Rc::new(integration)));
+
+        view! { cx, <App /> }.into_view(cx)
+    };
+
+    HttpResponse::Ok().content_type("text/html").streaming(
+        futures::stream::once(async { HTML_START.to_string() })
+            .chain(futures::stream::once(async { HTML_MIDDLE.to_string() }))
+            .chain(render_to_stream_with_prefix(
+                app,
+                |cx| {
+                    let head = use_context::<MetaContext>(cx)
+                        .map(|meta| meta.dehydrate())
+                        .unwrap_or_default();
+                    format!("{head}</head><body>").into()
+                }
+            ))
+            .chain(futures::stream::once(async { HTML_END.to_string() }))
+            .map(|html| Ok(web::Bytes::from(html)) as Result<web::Bytes>),
+    )
+}
+
+pub async fn run() -> std::io::Result<()> {
+    let host = std::env::var("HOST").unwrap_or_else(|_| "127.0.0.1".to_string());
+    let port = std::env::var("PORT")
+        .unwrap_or_else(|_| "3000".to_string())
+        .parse::<u16>()
+        .unwrap();
+
+    simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
+
+    log::info!("serving at {host}:{port}");
+
+    HttpServer::new(|| {
+        App::new()
+            .service(
+                web::scope("/pkg")
+                    .service(Files::new("", "target/site/pkg"))
+                    .wrap(middleware::Compress::default()),
+            )
+            .service(render_app)
+    })
+    .bind((host, port))?
+    .run()
+    .await
+}

examples/tailwind/style/main.scss

@@ -0,0 +1,2 @@
+/** Imports your Tailwind output */
+@import './output.scss';

examples/tailwind/style/output.css

@@ -0,0 +1,583 @@
+/*
+! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com
+*/
+
+/*
+1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
+2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
+*/
+
+*,
+::before,
+::after {
+  box-sizing: border-box;
+  /* 1 */
+  border-width: 0;
+  /* 2 */
+  border-style: solid;
+  /* 2 */
+  border-color: #e5e7eb;
+  /* 2 */
+}
+
+::before,
+::after {
+  --tw-content: '';
+}
+
+/*
+1. Use a consistent sensible line-height in all browsers.
+2. Prevent adjustments of font size after orientation changes in iOS.
+3. Use a more readable tab size.
+4. Use the user's configured `sans` font-family by default.
+5. Use the user's configured `sans` font-feature-settings by default.
+*/
+
+html {
+  line-height: 1.5;
+  /* 1 */
+  -webkit-text-size-adjust: 100%;
+  /* 2 */
+  -moz-tab-size: 4;
+  /* 3 */
+  -o-tab-size: 4;
+     tab-size: 4;
+  /* 3 */
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  /* 4 */
+  font-feature-settings: normal;
+  /* 5 */
+}
+
+/*
+1. Remove the margin in all browsers.
+2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.
+*/
+
+body {
+  margin: 0;
+  /* 1 */
+  line-height: inherit;
+  /* 2 */
+}
+
+/*
+1. Add the correct height in Firefox.
+2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
+3. Ensure horizontal rules are visible by default.
+*/
+
+hr {
+  height: 0;
+  /* 1 */
+  color: inherit;
+  /* 2 */
+  border-top-width: 1px;
+  /* 3 */
+}
+
+/*
+Add the correct text decoration in Chrome, Edge, and Safari.
+*/
+
+abbr:where([title]) {
+  -webkit-text-decoration: underline dotted;
+          text-decoration: underline dotted;
+}
+
+/*
+Remove the default font size and weight for headings.
+*/
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-size: inherit;
+  font-weight: inherit;
+}
+
+/*
+Reset links to optimize for opt-in styling instead of opt-out.
+*/
+
+a {
+  color: inherit;
+  text-decoration: inherit;
+}
+
+/*
+Add the correct font weight in Edge and Safari.
+*/
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/*
+1. Use the user's configured `mono` font family by default.
+2. Correct the odd `em` font sizing in all browsers.
+*/
+
+code,
+kbd,
+samp,
+pre {
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  /* 1 */
+  font-size: 1em;
+  /* 2 */
+}
+
+/*
+Add the correct font size in all browsers.
+*/
+
+small {
+  font-size: 80%;
+}
+
+/*
+Prevent `sub` and `sup` elements from affecting the line height in all browsers.
+*/
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/*
+1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
+2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
+3. Remove gaps between table borders by default.
+*/
+
+table {
+  text-indent: 0;
+  /* 1 */
+  border-color: inherit;
+  /* 2 */
+  border-collapse: collapse;
+  /* 3 */
+}
+
+/*
+1. Change the font styles in all browsers.
+2. Remove the margin in Firefox and Safari.
+3. Remove default padding in all browsers.
+*/
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit;
+  /* 1 */
+  font-size: 100%;
+  /* 1 */
+  font-weight: inherit;
+  /* 1 */
+  line-height: inherit;
+  /* 1 */
+  color: inherit;
+  /* 1 */
+  margin: 0;
+  /* 2 */
+  padding: 0;
+  /* 3 */
+}
+
+/*
+Remove the inheritance of text transform in Edge and Firefox.
+*/
+
+button,
+select {
+  text-transform: none;
+}
+
+/*
+1. Correct the inability to style clickable types in iOS and Safari.
+2. Remove default button styles.
+*/
+
+button,
+[type='button'],
+[type='reset'],
+[type='submit'] {
+  -webkit-appearance: button;
+  /* 1 */
+  background-color: transparent;
+  /* 2 */
+  background-image: none;
+  /* 2 */
+}
+
+/*
+Use the modern Firefox focus style for all focusable elements.
+*/
+
+:-moz-focusring {
+  outline: auto;
+}
+
+/*
+Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)
+*/
+
+:-moz-ui-invalid {
+  box-shadow: none;
+}
+
+/*
+Add the correct vertical alignment in Chrome and Firefox.
+*/
+
+progress {
+  vertical-align: baseline;
+}
+
+/*
+Correct the cursor style of increment and decrement buttons in Safari.
+*/
+
+::-webkit-inner-spin-button,
+::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/*
+1. Correct the odd appearance in Chrome and Safari.
+2. Correct the outline style in Safari.
+*/
+
+[type='search'] {
+  -webkit-appearance: textfield;
+  /* 1 */
+  outline-offset: -2px;
+  /* 2 */
+}
+
+/*
+Remove the inner padding in Chrome and Safari on macOS.
+*/
+
+::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/*
+1. Correct the inability to style clickable types in iOS and Safari.
+2. Change font properties to `inherit` in Safari.
+*/
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button;
+  /* 1 */
+  font: inherit;
+  /* 2 */
+}
+
+/*
+Add the correct display in Chrome and Safari.
+*/
+
+summary {
+  display: list-item;
+}
+
+/*
+Removes the default spacing and border for appropriate elements.
+*/
+
+blockquote,
+dl,
+dd,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+hr,
+figure,
+p,
+pre {
+  margin: 0;
+}
+
+fieldset {
+  margin: 0;
+  padding: 0;
+}
+
+legend {
+  padding: 0;
+}
+
+ol,
+ul,
+menu {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+/*
+Prevent resizing textareas horizontally by default.
+*/
+
+textarea {
+  resize: vertical;
+}
+
+/*
+1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
+2. Set the default placeholder color to the user's configured gray 400 color.
+*/
+
+input::-moz-placeholder, textarea::-moz-placeholder {
+  opacity: 1;
+  /* 1 */
+  color: #9ca3af;
+  /* 2 */
+}
+
+input::placeholder,
+textarea::placeholder {
+  opacity: 1;
+  /* 1 */
+  color: #9ca3af;
+  /* 2 */
+}
+
+/*
+Set the default cursor for buttons.
+*/
+
+button,
+[role="button"] {
+  cursor: pointer;
+}
+
+/*
+Make sure disabled buttons don't get the pointer cursor.
+*/
+
+:disabled {
+  cursor: default;
+}
+
+/*
+1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)
+2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)
+   This can trigger a poorly considered lint error in some tools but is included by design.
+*/
+
+img,
+svg,
+video,
+canvas,
+audio,
+iframe,
+embed,
+object {
+  display: block;
+  /* 1 */
+  vertical-align: middle;
+  /* 2 */
+}
+
+/*
+Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)
+*/
+
+img,
+video {
+  max-width: 100%;
+  height: auto;
+}
+
+/* Make elements with the HTML hidden attribute stay hidden by default */
+
+[hidden] {
+  display: none;
+}
+
+*, ::before, ::after {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
+  --tw-translate-x: 0;
+  --tw-translate-y: 0;
+  --tw-rotate: 0;
+  --tw-skew-x: 0;
+  --tw-skew-y: 0;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  --tw-pan-x:  ;
+  --tw-pan-y:  ;
+  --tw-pinch-zoom:  ;
+  --tw-scroll-snap-strictness: proximity;
+  --tw-ordinal:  ;
+  --tw-slashed-zero:  ;
+  --tw-numeric-figure:  ;
+  --tw-numeric-spacing:  ;
+  --tw-numeric-fraction:  ;
+  --tw-ring-inset:  ;
+  --tw-ring-offset-width: 0px;
+  --tw-ring-offset-color: #fff;
+  --tw-ring-color: rgb(59 130 246 / 0.5);
+  --tw-ring-offset-shadow: 0 0 #0000;
+  --tw-ring-shadow: 0 0 #0000;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  --tw-blur:  ;
+  --tw-brightness:  ;
+  --tw-contrast:  ;
+  --tw-grayscale:  ;
+  --tw-hue-rotate:  ;
+  --tw-invert:  ;
+  --tw-saturate:  ;
+  --tw-sepia:  ;
+  --tw-drop-shadow:  ;
+  --tw-backdrop-blur:  ;
+  --tw-backdrop-brightness:  ;
+  --tw-backdrop-contrast:  ;
+  --tw-backdrop-grayscale:  ;
+  --tw-backdrop-hue-rotate:  ;
+  --tw-backdrop-invert:  ;
+  --tw-backdrop-opacity:  ;
+  --tw-backdrop-saturate:  ;
+  --tw-backdrop-sepia:  ;
+}
+
+::backdrop {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
+  --tw-translate-x: 0;
+  --tw-translate-y: 0;
+  --tw-rotate: 0;
+  --tw-skew-x: 0;
+  --tw-skew-y: 0;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  --tw-pan-x:  ;
+  --tw-pan-y:  ;
+  --tw-pinch-zoom:  ;
+  --tw-scroll-snap-strictness: proximity;
+  --tw-ordinal:  ;
+  --tw-slashed-zero:  ;
+  --tw-numeric-figure:  ;
+  --tw-numeric-spacing:  ;
+  --tw-numeric-fraction:  ;
+  --tw-ring-inset:  ;
+  --tw-ring-offset-width: 0px;
+  --tw-ring-offset-color: #fff;
+  --tw-ring-color: rgb(59 130 246 / 0.5);
+  --tw-ring-offset-shadow: 0 0 #0000;
+  --tw-ring-shadow: 0 0 #0000;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  --tw-blur:  ;
+  --tw-brightness:  ;
+  --tw-contrast:  ;
+  --tw-grayscale:  ;
+  --tw-hue-rotate:  ;
+  --tw-invert:  ;
+  --tw-saturate:  ;
+  --tw-sepia:  ;
+  --tw-drop-shadow:  ;
+  --tw-backdrop-blur:  ;
+  --tw-backdrop-brightness:  ;
+  --tw-backdrop-contrast:  ;
+  --tw-backdrop-grayscale:  ;
+  --tw-backdrop-hue-rotate:  ;
+  --tw-backdrop-invert:  ;
+  --tw-backdrop-opacity:  ;
+  --tw-backdrop-saturate:  ;
+  --tw-backdrop-sepia:  ;
+}
+
+.my-0 {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+.mx-auto {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.max-w-3xl {
+  max-width: 48rem;
+}
+
+.rounded-lg {
+  border-radius: 0.5rem;
+}
+
+.bg-sky-600 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(2 132 199 / var(--tw-bg-opacity));
+}
+
+.p-6 {
+  padding: 1.5rem;
+}
+
+.px-10 {
+  padding-left: 2.5rem;
+  padding-right: 2.5rem;
+}
+
+.px-5 {
+  padding-left: 1.25rem;
+  padding-right: 1.25rem;
+}
+
+.py-3 {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+}
+
+.pb-10 {
+  padding-bottom: 2.5rem;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.text-4xl {
+  font-size: 2.25rem;
+  line-height: 2.5rem;
+}
+
+.text-white {
+  --tw-text-opacity: 1;
+  color: rgb(255 255 255 / var(--tw-text-opacity));
+}
+
+.hover\:bg-sky-700:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(3 105 161 / var(--tw-bg-opacity));
+}

examples/tailwind/style/output.scss

@@ -0,0 +1,583 @@
+/*
+! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com
+*/
+
+/*
+1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
+2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
+*/
+
+*,
+::before,
+::after {
+  box-sizing: border-box;
+  /* 1 */
+  border-width: 0;
+  /* 2 */
+  border-style: solid;
+  /* 2 */
+  border-color: #e5e7eb;
+  /* 2 */
+}
+
+::before,
+::after {
+  --tw-content: '';
+}
+
+/*
+1. Use a consistent sensible line-height in all browsers.
+2. Prevent adjustments of font size after orientation changes in iOS.
+3. Use a more readable tab size.
+4. Use the user's configured `sans` font-family by default.
+5. Use the user's configured `sans` font-feature-settings by default.
+*/
+
+html {
+  line-height: 1.5;
+  /* 1 */
+  -webkit-text-size-adjust: 100%;
+  /* 2 */
+  -moz-tab-size: 4;
+  /* 3 */
+  -o-tab-size: 4;
+     tab-size: 4;
+  /* 3 */
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  /* 4 */
+  font-feature-settings: normal;
+  /* 5 */
+}
+
+/*
+1. Remove the margin in all browsers.
+2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.
+*/
+
+body {
+  margin: 0;
+  /* 1 */
+  line-height: inherit;
+  /* 2 */
+}
+
+/*
+1. Add the correct height in Firefox.
+2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
+3. Ensure horizontal rules are visible by default.
+*/
+
+hr {
+  height: 0;
+  /* 1 */
+  color: inherit;
+  /* 2 */
+  border-top-width: 1px;
+  /* 3 */
+}
+
+/*
+Add the correct text decoration in Chrome, Edge, and Safari.
+*/
+
+abbr:where([title]) {
+  -webkit-text-decoration: underline dotted;
+          text-decoration: underline dotted;
+}
+
+/*
+Remove the default font size and weight for headings.
+*/
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-size: inherit;
+  font-weight: inherit;
+}
+
+/*
+Reset links to optimize for opt-in styling instead of opt-out.
+*/
+
+a {
+  color: inherit;
+  text-decoration: inherit;
+}
+
+/*
+Add the correct font weight in Edge and Safari.
+*/
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/*
+1. Use the user's configured `mono` font family by default.
+2. Correct the odd `em` font sizing in all browsers.
+*/
+
+code,
+kbd,
+samp,
+pre {
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  /* 1 */
+  font-size: 1em;
+  /* 2 */
+}
+
+/*
+Add the correct font size in all browsers.
+*/
+
+small {
+  font-size: 80%;
+}
+
+/*
+Prevent `sub` and `sup` elements from affecting the line height in all browsers.
+*/
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/*
+1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
+2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
+3. Remove gaps between table borders by default.
+*/
+
+table {
+  text-indent: 0;
+  /* 1 */
+  border-color: inherit;
+  /* 2 */
+  border-collapse: collapse;
+  /* 3 */
+}
+
+/*
+1. Change the font styles in all browsers.
+2. Remove the margin in Firefox and Safari.
+3. Remove default padding in all browsers.
+*/
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit;
+  /* 1 */
+  font-size: 100%;
+  /* 1 */
+  font-weight: inherit;
+  /* 1 */
+  line-height: inherit;
+  /* 1 */
+  color: inherit;
+  /* 1 */
+  margin: 0;
+  /* 2 */
+  padding: 0;
+  /* 3 */
+}
+
+/*
+Remove the inheritance of text transform in Edge and Firefox.
+*/
+
+button,
+select {
+  text-transform: none;
+}
+
+/*
+1. Correct the inability to style clickable types in iOS and Safari.
+2. Remove default button styles.
+*/
+
+button,
+[type='button'],
+[type='reset'],
+[type='submit'] {
+  -webkit-appearance: button;
+  /* 1 */
+  background-color: transparent;
+  /* 2 */
+  background-image: none;
+  /* 2 */
+}
+
+/*
+Use the modern Firefox focus style for all focusable elements.
+*/
+
+:-moz-focusring {
+  outline: auto;
+}
+
+/*
+Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)
+*/
+
+:-moz-ui-invalid {
+  box-shadow: none;
+}
+
+/*
+Add the correct vertical alignment in Chrome and Firefox.
+*/
+
+progress {
+  vertical-align: baseline;
+}
+
+/*
+Correct the cursor style of increment and decrement buttons in Safari.
+*/
+
+::-webkit-inner-spin-button,
+::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/*
+1. Correct the odd appearance in Chrome and Safari.
+2. Correct the outline style in Safari.
+*/
+
+[type='search'] {
+  -webkit-appearance: textfield;
+  /* 1 */
+  outline-offset: -2px;
+  /* 2 */
+}
+
+/*
+Remove the inner padding in Chrome and Safari on macOS.
+*/
+
+::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/*
+1. Correct the inability to style clickable types in iOS and Safari.
+2. Change font properties to `inherit` in Safari.
+*/
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button;
+  /* 1 */
+  font: inherit;
+  /* 2 */
+}
+
+/*
+Add the correct display in Chrome and Safari.
+*/
+
+summary {
+  display: list-item;
+}
+
+/*
+Removes the default spacing and border for appropriate elements.
+*/
+
+blockquote,
+dl,
+dd,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+hr,
+figure,
+p,
+pre {
+  margin: 0;
+}
+
+fieldset {
+  margin: 0;
+  padding: 0;
+}
+
+legend {
+  padding: 0;
+}
+
+ol,
+ul,
+menu {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+/*
+Prevent resizing textareas horizontally by default.
+*/
+
+textarea {
+  resize: vertical;
+}
+
+/*
+1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
+2. Set the default placeholder color to the user's configured gray 400 color.
+*/
+
+input::-moz-placeholder, textarea::-moz-placeholder {
+  opacity: 1;
+  /* 1 */
+  color: #9ca3af;
+  /* 2 */
+}
+
+input::placeholder,
+textarea::placeholder {
+  opacity: 1;
+  /* 1 */
+  color: #9ca3af;
+  /* 2 */
+}
+
+/*
+Set the default cursor for buttons.
+*/
+
+button,
+[role="button"] {
+  cursor: pointer;
+}
+
+/*
+Make sure disabled buttons don't get the pointer cursor.
+*/
+
+:disabled {
+  cursor: default;
+}
+
+/*
+1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)
+2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)
+   This can trigger a poorly considered lint error in some tools but is included by design.
+*/
+
+img,
+svg,
+video,
+canvas,
+audio,
+iframe,
+embed,
+object {
+  display: block;
+  /* 1 */
+  vertical-align: middle;
+  /* 2 */
+}
+
+/*
+Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)
+*/
+
+img,
+video {
+  max-width: 100%;
+  height: auto;
+}
+
+/* Make elements with the HTML hidden attribute stay hidden by default */
+
+[hidden] {
+  display: none;
+}
+
+*, ::before, ::after {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
+  --tw-translate-x: 0;
+  --tw-translate-y: 0;
+  --tw-rotate: 0;
+  --tw-skew-x: 0;
+  --tw-skew-y: 0;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  --tw-pan-x:  ;
+  --tw-pan-y:  ;
+  --tw-pinch-zoom:  ;
+  --tw-scroll-snap-strictness: proximity;
+  --tw-ordinal:  ;
+  --tw-slashed-zero:  ;
+  --tw-numeric-figure:  ;
+  --tw-numeric-spacing:  ;
+  --tw-numeric-fraction:  ;
+  --tw-ring-inset:  ;
+  --tw-ring-offset-width: 0px;
+  --tw-ring-offset-color: #fff;
+  --tw-ring-color: rgb(59 130 246 / 0.5);
+  --tw-ring-offset-shadow: 0 0 #0000;
+  --tw-ring-shadow: 0 0 #0000;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  --tw-blur:  ;
+  --tw-brightness:  ;
+  --tw-contrast:  ;
+  --tw-grayscale:  ;
+  --tw-hue-rotate:  ;
+  --tw-invert:  ;
+  --tw-saturate:  ;
+  --tw-sepia:  ;
+  --tw-drop-shadow:  ;
+  --tw-backdrop-blur:  ;
+  --tw-backdrop-brightness:  ;
+  --tw-backdrop-contrast:  ;
+  --tw-backdrop-grayscale:  ;
+  --tw-backdrop-hue-rotate:  ;
+  --tw-backdrop-invert:  ;
+  --tw-backdrop-opacity:  ;
+  --tw-backdrop-saturate:  ;
+  --tw-backdrop-sepia:  ;
+}
+
+::backdrop {
+  --tw-border-spacing-x: 0;
+  --tw-border-spacing-y: 0;
+  --tw-translate-x: 0;
+  --tw-translate-y: 0;
+  --tw-rotate: 0;
+  --tw-skew-x: 0;
+  --tw-skew-y: 0;
+  --tw-scale-x: 1;
+  --tw-scale-y: 1;
+  --tw-pan-x:  ;
+  --tw-pan-y:  ;
+  --tw-pinch-zoom:  ;
+  --tw-scroll-snap-strictness: proximity;
+  --tw-ordinal:  ;
+  --tw-slashed-zero:  ;
+  --tw-numeric-figure:  ;
+  --tw-numeric-spacing:  ;
+  --tw-numeric-fraction:  ;
+  --tw-ring-inset:  ;
+  --tw-ring-offset-width: 0px;
+  --tw-ring-offset-color: #fff;
+  --tw-ring-color: rgb(59 130 246 / 0.5);
+  --tw-ring-offset-shadow: 0 0 #0000;
+  --tw-ring-shadow: 0 0 #0000;
+  --tw-shadow: 0 0 #0000;
+  --tw-shadow-colored: 0 0 #0000;
+  --tw-blur:  ;
+  --tw-brightness:  ;
+  --tw-contrast:  ;
+  --tw-grayscale:  ;
+  --tw-hue-rotate:  ;
+  --tw-invert:  ;
+  --tw-saturate:  ;
+  --tw-sepia:  ;
+  --tw-drop-shadow:  ;
+  --tw-backdrop-blur:  ;
+  --tw-backdrop-brightness:  ;
+  --tw-backdrop-contrast:  ;
+  --tw-backdrop-grayscale:  ;
+  --tw-backdrop-hue-rotate:  ;
+  --tw-backdrop-invert:  ;
+  --tw-backdrop-opacity:  ;
+  --tw-backdrop-saturate:  ;
+  --tw-backdrop-sepia:  ;
+}
+
+.my-0 {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+.mx-auto {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.max-w-3xl {
+  max-width: 48rem;
+}
+
+.rounded-lg {
+  border-radius: 0.5rem;
+}
+
+.bg-sky-600 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(2 132 199 / var(--tw-bg-opacity));
+}
+
+.p-6 {
+  padding: 1.5rem;
+}
+
+.px-10 {
+  padding-left: 2.5rem;
+  padding-right: 2.5rem;
+}
+
+.px-5 {
+  padding-left: 1.25rem;
+  padding-right: 1.25rem;
+}
+
+.py-3 {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+}
+
+.pb-10 {
+  padding-bottom: 2.5rem;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.text-4xl {
+  font-size: 2.25rem;
+  line-height: 2.5rem;
+}
+
+.text-white {
+  --tw-text-opacity: 1;
+  color: rgb(255 255 255 / var(--tw-text-opacity));
+}
+
+.hover\:bg-sky-700:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(3 105 161 / var(--tw-bg-opacity));
+}

examples/tailwind/tailwind.config.js

@@ -0,0 +1,10 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: { 
+    files: ["*.html", "./src/**/*.rs"],
+  },
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}

examples/todo-app-sqlite-axum/Cargo.toml

@@ -0,0 +1,62 @@
+[package]
+name = "todo-app-sqlite-axum"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+anyhow = "1.0.66"
+console_log = "0.2.0"
+console_error_panic_hook = "0.1.7"
+futures = "0.3.25"
+cfg-if = "1.0.0"
+leptos = { path = "../../leptos", default-features = false, features = [
+	"serde",
+] }
+leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
+log = "0.4.17"
+simple_logger = "4.0.0"
+serde = { version = "1.0.148", features = ["derive"] }
+serde_json = "1.0.89"
+gloo-net = { version = "0.2.5", features = ["http"] }
+reqwest = { version = "0.11.13", features = ["json"] }
+axum = { version = "0.6.1", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.3.4", features = ["fs"], optional = true }
+tokio = { version = "1.22.0", features = ["full"], optional = true }
+http = { version = "0.2.8" }
+sqlx = { version = "0.6.2", features = [
+	"runtime-tokio-rustls",
+	"sqlite",
+], optional = true }
+
+[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",
+]
+
+[package.metadata.cargo-all-features]
+denylist = [
+	"axum",
+	"tower",
+	"tower-http",
+	"tokio",
+	"sqlx",
+	"leptos_axum",
+]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]

examples/todo-app-sqlite-axum/LICENSE

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

examples/todo-app-sqlite-axum/README.md

@@ -0,0 +1,22 @@
+# Leptos Todo App Sqlite with Axum
+
+This example creates a basic todo app with an Axum backend that uses Leptos' server functions to call sqlx from the client and seamlessly run it on the server.
+
+## Server Side Rendering With Hydration
+
+To run it as a server side app with hydration, first you should run
+
+```bash
+wasm-pack build --target=web --debug --no-default-features --features=hydrate
+```
+
+to generate the WebAssembly to hydrate the HTML that is generated on the server.
+
+Then run the server with `cargo run` to serve the server side rendered HTML and the WASM bundle for hydration.
+
+```bash
+cargo run --no-default-features --features=ssr
+```
+
+> Note that if your hydration code changes, you will have to rerun the wasm-pack command above
+> This should be temporary, and vastly improve once cargo-leptos becomes ready for prime time!

examples/todo-app-sqlite-axum/migrations/20221118172000_create_todo_table.sql

@@ -0,0 +1,7 @@
+
+CREATE TABLE IF NOT EXISTS todos
+(
+  id          INTEGER NOT NULL PRIMARY KEY,
+  title       VARCHAR,
+  completed   BOOLEAN
+);

examples/todo-app-sqlite-axum/src/lib.rs

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

examples/todo-app-sqlite-axum/src/main.rs

@@ -0,0 +1,81 @@
+use cfg_if::cfg_if;
+use leptos::*;
+
+// boilerplate to run in different modes
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        routing::{post},
+        error_handling::HandleError,
+        Router,
+    };
+    use std::net::SocketAddr;
+    use crate::todo::*;
+    use todo_app_sqlite_axum::*;
+    use http::StatusCode;
+    use tower_http::services::ServeDir;
+    use std::env;
+
+    #[tokio::main]
+    async fn main() {
+        let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
+        log::debug!("serving at {addr}");
+
+        simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
+
+        let mut conn = db().await.expect("couldn't connect to DB");
+        /* sqlx::migrate!()
+            .run(&mut conn)
+            .await
+            .expect("could not run SQLx migrations"); */
+
+        crate::todo::register_server_functions();
+
+        // These are Tower Services that will serve files from the static and pkg repos.
+        // HandleError is needed as Axum requires services to implement Infallible Errors
+        // because all Errors are converted into Responses
+        let static_service = HandleError::new( ServeDir::new("./static"), handle_file_error);
+        let pkg_service = HandleError::new( ServeDir::new("./pkg"), handle_file_error);
+
+        /// Convert the Errors from ServeDir to a type that implements IntoResponse
+        async fn handle_file_error(err: std::io::Error) -> (StatusCode, String) {
+            (
+                StatusCode::NOT_FOUND,
+                format!("File Not Found: {}", err),
+            )
+        }
+
+
+        let render_options: RenderOptions = RenderOptions::builder().pkg_path("/pkg/todo_app_sqlite_axum").socket_address(addr).reload_port(3001).environment(&env::var("RUST_ENV")).build();
+        render_options.write_to_file();
+        // build our application with a route
+        let app = Router::new()
+        .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
+        .nest_service("/pkg", pkg_service)
+        .nest_service("/static", static_service)
+        .fallback(leptos_axum::render_app_to_stream(render_options.clone(), |cx| view! { cx, <TodoApp/> }));
+
+        // run our app with hyper
+        // `axum::Server` is a re-export of `hyper::Server`
+        log!("listening on {}", &render_options.socket_address);
+        axum::Server::bind(&render_options.socket_address)
+            .serve(app.into_make_service())
+            .await
+            .unwrap();
+    }
+}
+
+    // client-only stuff for Trunk
+    else {
+        use todo_app_sqlite_axum::todo::*;
+
+        pub fn main() {
+            console_error_panic_hook::set_once();
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            mount_to_body(|cx| {
+                view! { cx, <TodoApp/> }
+            });
+        }
+    }
+}

examples/todo-app-sqlite-axum/src/todo.rs

@@ -0,0 +1,227 @@
+use cfg_if::cfg_if;
+use leptos::*;
+use leptos_meta::*;
+use leptos_router::*;
+use serde::{Deserialize, Serialize};
+
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
+        use sqlx::{Connection, SqliteConnection};
+        use http::{header::SET_COOKIE, HeaderMap, HeaderValue, StatusCode};
+
+        pub async fn db() -> Result<SqliteConnection, ServerFnError> {
+            Ok(SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))?)
+        }
+
+        pub fn register_server_functions() {
+            GetTodos::register();
+            AddTodo::register();
+            DeleteTodo::register();
+        }
+
+        #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, sqlx::FromRow)]
+        pub struct Todo {
+            id: u16,
+            title: String,
+            completed: bool,
+        }
+    } else {
+        #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+        pub struct Todo {
+            id: u16,
+            title: String,
+            completed: bool,
+        }
+    }
+}
+
+#[server(GetTodos, "/api")]
+pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
+    // this is just an example of how to access server context injected in the handlers
+    // http::Request doesn't implement Clone, so more work will be needed to do use_context() on this
+    let req_parts = use_context::<leptos_axum::RequestParts>(cx).unwrap();
+    println!("\ncalling server fn");
+    println!("Uri = {:?}", req_parts.uri);
+
+    use futures::TryStreamExt;
+
+    let mut conn = db().await?;
+
+    let mut todos = Vec::new();
+    let mut rows = sqlx::query_as::<_, Todo>("SELECT * FROM todos").fetch(&mut conn);
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
+        todos.push(row);
+    }
+
+    // Add a random header(because why not)
+    let mut res_headers = HeaderMap::new();
+    res_headers.insert(SET_COOKIE, HeaderValue::from_str("fizz=buzz").unwrap());
+
+    let res_parts = leptos_axum::ResponseParts {
+        headers: res_headers,
+        status: Some(StatusCode::IM_A_TEAPOT),
+    };
+
+    let res_options_outer = use_context::<leptos_axum::ResponseOptions>(cx);
+    if let Some(res_options) = res_options_outer {
+        res_options.overwrite(res_parts).await;
+    }
+
+    Ok(todos)
+}
+
+#[server(AddTodo, "/api")]
+pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
+    let mut conn = db().await?;
+
+    // fake API delay
+    std::thread::sleep(std::time::Duration::from_millis(1250));
+
+    match sqlx::query("INSERT INTO todos (title, completed) VALUES ($1, false)")
+        .bind(title)
+        .execute(&mut conn)
+        .await
+    {
+        Ok(_row) => Ok(()),
+        Err(e) => Err(ServerFnError::ServerError(e.to_string())),
+    }
+}
+
+#[server(DeleteTodo, "/api")]
+pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
+    let mut conn = db().await?;
+
+    sqlx::query("DELETE FROM todos WHERE id = $1")
+        .bind(id)
+        .execute(&mut conn)
+        .await
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
+}
+
+#[component]
+pub fn TodoApp(cx: Scope) -> impl IntoView {
+    view! {
+        cx,
+        <Stylesheet href="/style.css"/>
+        <Router>
+            <header>
+                <h1>"My Tasks"</h1>
+            </header>
+            <main>
+                <Routes>
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <Todos/>
+                    }/>
+                </Routes>
+            </main>
+        </Router> 
+    }
+}
+
+#[component]
+pub fn Todos(cx: Scope) -> impl IntoView {
+    let add_todo = create_server_multi_action::<AddTodo>(cx);
+    let delete_todo = create_server_action::<DeleteTodo>(cx);
+    let submissions = add_todo.submissions();
+
+    // track mutations that should lead us to refresh the list
+    let add_changed = add_todo.version;
+    let todo_deleted = delete_todo.version;
+
+    // list of todos is loaded from the server in reaction to changes
+    let todos = create_resource(
+        cx,
+        move || (add_changed(), todo_deleted()),
+        move |_| get_todos(cx),
+    );
+
+    view! {
+        cx,
+        <div>
+            <MultiActionForm action=add_todo>
+                <label>
+                    "Add a Todo"
+                    <input type="text" name="title"/>
+                </label>
+                <input type="submit" value="Add"/>
+            </MultiActionForm>
+            <Suspense fallback=move || view! {cx, <p>"Loading..."</p> }>
+                {
+                    let delete_todo = delete_todo.clone();
+                    move || {
+                    let existing_todos = {
+                        let delete_todo = delete_todo.clone();
+                        move || {
+                            todos
+                            .read()
+                            .map({
+                                let delete_todo = delete_todo.clone();
+                                move |todos| match todos {
+                                    Err(e) => {
+                                        vec![view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_any()]
+                                    }
+                                    Ok(todos) => {
+                                        if todos.is_empty() {
+                                            vec![view! { cx, <p>"No tasks were found."</p> }.into_any()]
+                                        } else {
+                                            todos
+                                                .into_iter()
+                                                .map({
+                                                    let delete_todo = delete_todo.clone();
+                                                    move |todo| {
+                                                        let delete_todo = delete_todo.clone();
+                                                        view! {
+                                                            cx,
+                                                            <li>
+                                                                {todo.title}
+                                                                <ActionForm action=delete_todo.clone()>
+                                                                    <input type="hidden" name="id" value={todo.id}/>
+                                                                    <input type="submit" value="X"/>
+                                                                </ActionForm>
+                                                            </li>
+                                                        }
+                                                        .into_any()
+                                                    }
+                                                })
+                                                .collect::<Vec<_>>()
+                                        }
+                                    }
+                                }
+                            })
+                            .unwrap_or_default()
+                        }
+                    };
+
+                    let pending_todos = move || {
+                        submissions
+                        .get()
+                        .into_iter()
+                        .filter(|submission| submission.pending().get())
+                        .map(|submission| {
+                            view! {
+                                cx,
+                                <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
+                            }
+                        })
+                        .collect::<Vec<_>>()
+                    };
+
+                    view! {
+                        cx,
+                        <ul>
+                            {existing_todos}
+                            {pending_todos}
+                        </ul>
+                    }
+                }
+            }
+            </Suspense>
+        </div>
+    }
+}

examples/todo-app-sqlite/.gitignore

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

examples/todo-app-sqlite/Cargo.toml

@@ -0,0 +1,48 @@
+[package]
+name = "todo-app-sqlite"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", optional = true, features = ["openssl", "macros"] }
+anyhow = "1"
+broadcaster = "1"
+console_log = "0.2"
+console_error_panic_hook = "0.1"
+serde = { version = "1", features = ["derive"] }
+futures = "0.3"
+cfg-if = "1"
+leptos = { path = "../../leptos", default-features = false, features = [
+	"serde",
+] }
+leptos_actix = { path = "../../integrations/actix", optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
+log = "0.4"
+simple_logger = "2"
+gloo = { git = "https://github.com/rustwasm/gloo" }
+sqlx = { version = "0.6", features = [
+	"runtime-tokio-rustls",
+	"sqlite",
+], optional = true }
+
+[features]
+default = ["ssr"]
+hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
+ssr = [
+	"dep:actix-files",
+	"dep:actix-web",
+	"dep:sqlx",
+	"leptos/ssr",
+	"leptos_actix",
+	"leptos_meta/ssr",
+	"leptos_router/ssr",
+]
+
+[package.metadata.cargo-all-features]
+denylist = ["actix-files", "actix-web", "leptos_actix", "sqlx"]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]

examples/todo-app-sqlite/LICENSE

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

examples/todo-app-sqlite/README.md

@@ -0,0 +1,21 @@
+# Leptos Counter Isomorphic Example
+
+This example demonstrates how to use a server functions and multi-actions to build a simple todo app.
+
+## Server Side Rendering With Hydration
+
+To run it as a server side app with hydration, first you should run
+
+```bash
+wasm-pack build --target=web --no-default-features --features=hydrate
+```
+
+to generate the Webassembly to provide hydration features for the server.
+Then run the server with `cargo run` to serve the server side rendered HTML and the WASM bundle for hydration.
+
+```bash
+cargo run
+```
+
+> Note that if your hydration code changes, you will have to rerun the wasm-pack command above
+> This should be temporary, and vastly improve once cargo-leptos becomes ready for prime time!

examples/todo-app-sqlite/migrations/20221118172000_create_todo_table.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS todos
+(
+  id          INTEGER NOT NULL PRIMARY KEY,
+  title       VARCHAR,
+  completed   BOOLEAN
+);

examples/todo-app-sqlite/src/lib.rs

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

examples/todo-app-sqlite/src/main.rs

@@ -0,0 +1,55 @@
+use cfg_if::cfg_if;
+use leptos::*;
+mod todo;
+
+// boilerplate to run in different modes
+cfg_if! {
+    // server-only stuff
+    if #[cfg(feature = "ssr")] {
+        use actix_files::{Files};
+        use actix_web::*;
+        use crate::todo::*;
+        use std::{net::SocketAddr, env};
+
+        #[get("/style.css")]
+        async fn css() -> impl Responder {
+            actix_files::NamedFile::open_async("./style.css").await
+        }
+
+        #[actix_web::main]
+        async fn main() -> std::io::Result<()> {
+            let addr = SocketAddr::from(([127,0,0,1],3000));
+            let mut conn = db().await.expect("couldn't connect to DB");
+            sqlx::migrate!()
+                .run(&mut conn)
+                .await
+                .expect("could not run SQLx migrations");
+
+            crate::todo::register_server_functions();
+
+            HttpServer::new(move || {
+                let render_options: RenderOptions = RenderOptions::builder()
+                    .pkg_path("/pkg/todo_app_sqlite")
+                    .reload_port(3001)
+                    .socket_address(addr.clone())
+                    .environment(&env::var("RUST_ENV"))
+                    .build();
+                render_options.write_to_file();
+
+                App::new()
+                    .service(Files::new("/pkg", "./pkg"))
+                    .service(css)
+                    .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+                    .route("/{tail:.*}", leptos_actix::render_app_to_stream(render_options, |cx| view! { cx, <TodoApp/> }))
+                //.wrap(middleware::Compress::default())
+            })
+            .bind(addr)?
+            .run()
+            .await
+        }
+    } else {
+        fn main() {
+            // no client-side main function
+        }
+    }
+}

examples/todo-app-sqlite/src/todo.rs

@@ -0,0 +1,211 @@
+use cfg_if::cfg_if;
+use leptos::*;
+use leptos_meta::*;
+use leptos_router::*;
+use serde::{Deserialize, Serialize};
+
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
+        use sqlx::{Connection, SqliteConnection};
+
+        pub async fn db() -> Result<SqliteConnection, ServerFnError> {
+            Ok(SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))?)
+        }
+
+        pub fn register_server_functions() {
+            GetTodos::register();
+            AddTodo::register();
+            DeleteTodo::register();
+        }
+
+        #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, sqlx::FromRow)]
+        pub struct Todo {
+            id: u16,
+            title: String,
+            completed: bool,
+        }
+    } else {
+        #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+        pub struct Todo {
+            id: u16,
+            title: String,
+            completed: bool,
+        }
+    }
+}
+
+#[server(GetTodos, "/api")]
+pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
+    // this is just an example of how to access server context injected in the handlers
+    let req =
+        use_context::<actix_web::HttpRequest>(cx).expect("couldn't get HttpRequest from context");
+    println!("req.path = {:?}", req.path());
+
+    use futures::TryStreamExt;
+
+    let mut conn = db().await?;
+
+    let mut todos = Vec::new();
+    let mut rows = sqlx::query_as::<_, Todo>("SELECT * FROM todos").fetch(&mut conn);
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
+        todos.push(row);
+    }
+
+    Ok(todos)
+}
+
+#[server(AddTodo, "/api")]
+pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
+    let mut conn = db().await?;
+
+    // fake API delay
+    std::thread::sleep(std::time::Duration::from_millis(1250));
+
+    match sqlx::query("INSERT INTO todos (title, completed) VALUES ($1, false)")
+        .bind(title)
+        .execute(&mut conn)
+        .await
+    {
+        Ok(row) => Ok(()),
+        Err(e) => Err(ServerFnError::ServerError(e.to_string())),
+    }
+}
+
+#[server(DeleteTodo, "/api")]
+pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
+    let mut conn = db().await?;
+
+    sqlx::query("DELETE FROM todos WHERE id = $1")
+        .bind(id)
+        .execute(&mut conn)
+        .await
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
+}
+
+#[component]
+pub fn TodoApp(cx: Scope) -> impl IntoView {
+    view! {
+        cx,
+        <Stylesheet href="/style.css"/>
+        <Router>
+            <header>
+                <h1>"My Tasks"</h1>
+            </header>
+            <main>
+                <Routes>
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <Todos/>
+                    }/>
+                </Routes>
+            </main>
+        </Router> 
+    }
+}
+
+#[component]
+pub fn Todos(cx: Scope) -> impl IntoView {
+    let add_todo = create_server_multi_action::<AddTodo>(cx);
+    let delete_todo = create_server_action::<DeleteTodo>(cx);
+    let submissions = add_todo.submissions();
+
+    // track mutations that should lead us to refresh the list
+    let add_changed = add_todo.version;
+    let todo_deleted = delete_todo.version;
+
+    // list of todos is loaded from the server in reaction to changes
+    let todos = create_resource(
+        cx,
+        move || (add_changed(), todo_deleted()),
+        move |_| get_todos(cx),
+    );
+
+    view! {
+        cx,
+        <div>
+            <MultiActionForm action=add_todo>
+                <label>
+                    "Add a Todo"
+                    <input type="text" name="title"/>
+                </label>
+                <input type="submit" value="Add"/>
+            </MultiActionForm>
+            <Suspense fallback=move || view! {cx, <p>"Loading..."</p> }>
+                {
+                    let delete_todo = delete_todo.clone();
+                    move || {
+                    let existing_todos = {
+                        let delete_todo = delete_todo.clone();
+                        move || {
+                            todos
+                            .read()
+                            .map({
+                                let delete_todo = delete_todo.clone();
+                                move |todos| match todos {
+                                    Err(e) => {
+                                        vec![view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_any()]
+                                    }
+                                    Ok(todos) => {
+                                        if todos.is_empty() {
+                                            vec![view! { cx, <p>"No tasks were found."</p> }.into_any()]
+                                        } else {
+                                            todos
+                                                .into_iter()
+                                                .map({
+                                                    let delete_todo = delete_todo.clone();
+                                                    move |todo| {
+                                                        let delete_todo = delete_todo.clone();
+                                                        view! {
+                                                            cx,
+                                                            <li>
+                                                                {todo.title}
+                                                                <ActionForm action=delete_todo.clone()>
+                                                                    <input type="hidden" name="id" value={todo.id}/>
+                                                                    <input type="submit" value="X"/>
+                                                                </ActionForm>
+                                                            </li>
+                                                        }
+                                                        .into_any()
+                                                    }
+                                                })
+                                                .collect::<Vec<_>>()
+                                        }
+                                    }
+                                }
+                            })
+                            .unwrap_or_default()
+                        }
+                    };
+
+                    let pending_todos = move || {
+                        submissions
+                        .get()
+                        .into_iter()
+                        .filter(|submission| submission.pending().get())
+                        .map(|submission| {
+                            view! {
+                                cx,
+                                <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
+                            }
+                        })
+                        .collect::<Vec<_>>()
+                    };
+
+                    view! {
+                        cx,
+                        <ul>
+                            {existing_todos}
+                            {pending_todos}
+                        </ul>
+                    }
+                }
+            }
+            </Suspense>
+        </div>
+    }
+}

examples/todo-app-sqlite/style.css

@@ -0,0 +1,3 @@
+.pending {
+	color: purple;
+}

examples/todomvc/src/lib.rs

@@ -12,9 +12,7 @@ const STORAGE_KEY: &str = "todos-leptos";
 // Basic operations to manipulate the todo list: nothing really interesting here
 impl Todos {
     pub fn new(cx: Scope) -> Self {
-        let starting_todos = if is_server!() {
-            Vec::new()
-        } else if let Ok(Some(storage)) = window().local_storage() {
+        let starting_todos = if let Ok(Some(storage)) = window().local_storage() {
             storage
                 .get_item(STORAGE_KEY)
                 .ok()
@@ -117,7 +115,7 @@ const ESCAPE_KEY: u32 = 27;
 const ENTER_KEY: u32 = 13;
 
 #[component]
-pub fn TodoMVC(cx: Scope) -> Element {
+pub fn TodoMVC(cx: Scope) -> impl IntoView {
     // The `todos` are a signal, since we need to reactively update the list
     let (todos, set_todos) = create_signal(cx, Todos::new(cx));
 
@@ -136,10 +134,10 @@ pub fn TodoMVC(cx: Scope) -> Element {
     });
 
     // Callback to add a todo on pressing the `Enter` key, if the field isn't empty
-    let add_todo = move |ev: web_sys::Event| {
+    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();
+        let key_code = ev.key_code();
         if key_code == ENTER_KEY {
             let title = event_target_value(&ev);
             let title = title.trim();
@@ -215,9 +213,11 @@ pub fn TodoMVC(cx: Scope) -> Element {
                     />
                     <label for="toggle-all">"Mark all as complete"</label>
                     <ul class="todo-list">
-                        <For each=filtered_todos key=|todo| todo.id>
-                            {move |cx, todo: &Todo| view! { cx,  <Todo todo=todo.clone() /> }}
-                        </For>
+                        <For
+                            each=filtered_todos
+                            key=|todo| todo.id
+                            view=move |todo: Todo| view! { cx,  <Todo todo /> }
+                        />
                     </ul>
                 </section>
                 <footer
@@ -257,12 +257,12 @@ pub fn TodoMVC(cx: Scope) -> Element {
 }
 
 #[component]
-pub fn Todo(cx: Scope, todo: Todo) -> Element {
+pub fn Todo(cx: Scope, todo: Todo) -> impl IntoView {
     let (editing, set_editing) = create_signal(cx, false);
     let set_todos = use_context::<WriteSignal<Todos>>(cx).unwrap();
 
     // this will be filled by _ref=input below
-    let input: Element;
+    let todo_input = NodeRef::new(cx);
 
     let save = move |value: &str| {
         let value = value.trim();
@@ -282,7 +282,7 @@ pub fn Todo(cx: Scope, todo: Todo) -> Element {
         >
             <div class="view">
                 <input
-                    _ref=input
+                    _ref=todo_input
                     class="toggle"
                     type="checkbox"
                     prop:checked={move || (todo.completed)()}
@@ -293,11 +293,9 @@ pub fn Todo(cx: Scope, todo: Todo) -> Element {
                 />
                 <label on:dblclick=move |_| {
                     set_editing(true);
-
-                    // guard against the fact that in SSR mode, that ref is actually to a String
-                    #[cfg(any(feature = "csr", feature = "hydrate"))]
-                    if let Some(input) = input.dyn_ref::<HtmlInputElement>() {
-                        input.focus();
+            
+                    if let Some(input) = todo_input.get() {
+                        _ = input.focus();
                     }
                 }>
                     {move || todo.title.get()}
@@ -311,7 +309,7 @@ pub fn Todo(cx: Scope, todo: Todo) -> Element {
                     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();
+                        let key_code = ev.key_code();
                         if key_code == ENTER_KEY {
                             save(&event_target_value(&ev));
                         } else if key_code == ESCAPE_KEY {

examples/view-tests/src/main.rs

@@ -1,35 +0,0 @@
-use leptos::*;
-
-pub fn main() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(|cx| view! { cx, <TemplateConsumer/> })
-}
-
-#[component]
-fn TemplateConsumer(cx: Scope) -> Element {
-    let tpl = view! { cx, <TemplateExample/> };
-    let cloned_tpl = tpl
-        .unchecked_ref::<web_sys::HtmlTemplateElement>()
-        .content()
-        .clone_node_with_deep(true)
-        .expect("couldn't clone template node");
-
-    view! {
-        cx,
-        <div id="template">
-            <h1>"Template Consumer"</h1>
-            {cloned_tpl}
-        </div>
-    }
-}
-
-#[component]
-fn TemplateExample(cx: Scope) -> Element {
-    view! {
-        cx,
-        <template>
-            <div>"Template contents"</div>
-        </template>
-    }
-}

integrations/actix/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "leptos_actix"
+version = "0.0.2"
+edition = "2021"
+authors = ["Greg Johnston"]
+license = "MIT"
+repository = "https://github.com/gbj/leptos"
+description = "Actix integrations for the Leptos web framework."
+
+[dependencies]
+actix-web = "4"
+futures = "0.3"
+leptos = { path = "../../leptos", default-features = false, version = "0.0", features = [
+	"ssr",
+] }
+leptos_meta = { path = "../../meta", default-features = false, version = "0.0", features = [
+	"ssr",
+] }
+leptos_router = { path = "../../router", default-features = false, version = "0.0", features = [
+	"ssr",
+] }
+tokio = { version = "1.0", features = ["full"] }
+

integrations/actix/src/lib.rs

@@ -0,0 +1,319 @@
+use actix_web::{http::header::HeaderMap, web::Bytes, *};
+use futures::{StreamExt, executor}; 
+
+use http::StatusCode;
+use leptos::*;
+use leptos_meta::*;
+use leptos_router::*;
+use std::sync::Arc;
+use tokio::sync::RwLock;
+
+/// This struct lets you define headers and override the status of the Response from an Element or a Server Function
+/// Typically contained inside of a ResponseOptions. Setting this is useful for cookies and custom responses.
+#[derive(Debug, Clone, Default)]
+pub struct ResponseParts {
+    pub headers: HeaderMap,
+    pub status: Option<StatusCode>,
+}
+
+/// Adding this Struct to your Scope inside of a Server Fn or Elements will allow you to override details of the Response
+/// like StatusCode and add Headers/Cookies. Because Elements and Server Fns are lower in the tree than the Response generation
+/// code, it needs to be wrapped in an `Arc<RwLock<>>` so that it can be surfaced
+#[derive(Debug, Clone, Default)]
+pub struct ResponseOptions(pub Arc<RwLock<ResponseParts>>);
+
+impl ResponseOptions {
+    /// A less boilerplatey way to overwrite the contents of `ResponseOptions` with a new `ResponseParts`
+    pub async fn overwrite(&self, parts: ResponseParts) {
+        let mut writable = self.0.write().await;
+        *writable = parts
+    }
+}
+
+/// 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:
+///
+/// ```
+/// use actix_web::*;
+///
+/// fn register_server_functions() {
+///   // call ServerFn::register() for each of the server functions you've defined
+/// }
+///
+/// # if false { // don't actually try to run a server in a doctest...
+/// #[actix_web::main]
+/// async fn main() -> std::io::Result<()> {
+///     // make sure you actually register your server functions
+///     register_server_functions();
+///
+///     HttpServer::new(|| {
+///         App::new()
+///             // "/api" should match the prefix, if any, declared when defining server functions
+///             // {tail:.*} passes the remainder of the URL as the server function name
+///             .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+///     })
+///     .bind(("127.0.0.1", 8080))?
+///     .run()
+///     .await
+/// }
+/// # }
+/// ```
+pub fn handle_server_fns() -> Route {
+    web::post().to(
+        |req: HttpRequest, params: web::Path<String>, body: web::Bytes| async move {
+            {
+                let path = params.into_inner();
+                let accept_header = req
+                    .headers()
+                    .get("Accept")
+                    .and_then(|value| value.to_str().ok());
+
+                if let Some(server_fn) = server_fn_by_path(path.as_str()) {
+                    let body: &[u8] = &body;
+
+                    let runtime = create_runtime();
+                    let (cx, disposer) = raw_scope_and_disposer(runtime);
+                    let res_options = ResponseOptions::default();
+
+                    // provide HttpRequest as context in server scope
+                    provide_context(cx, req.clone());
+                    provide_context(cx, res_options.clone());
+
+                    match server_fn(cx, body).await {
+                        Ok(serialized) => {
+                            let res_options = use_context::<ResponseOptions>(cx).unwrap();
+
+                            // clean up the scope, which we only needed to run the server fn
+                            disposer.dispose();
+                            runtime.dispose();
+
+                            let mut res: HttpResponseBuilder;
+                            let mut res_parts = res_options.0.write().await;
+                            // let (status, mut res_headers) = match res_parts {
+                            //     Some(parts) => (parts.status, parts.headers),
+                            //     None => (None, HeaderMap::new()),
+                            // };
+
+                            if accept_header == Some("application/json")
+                                || accept_header == Some("application/x-www-form-urlencoded")
+                                || accept_header == Some("application/cbor")
+                            {
+                                res = HttpResponse::Ok();
+
+                                // Override Status if Status is set in ResponseParts and
+                                // We're not trying to do a form submit
+                                if let Some(status) = res_parts.status {
+                                    res.status(status);
+                                }
+                            }
+                            // otherwise, it's probably a <form> submit or something: redirect back to the referrer
+                            else {
+                                let referer = req
+                                    .headers()
+                                    .get("Referer")
+                                    .and_then(|value| value.to_str().ok())
+                                    .unwrap_or("/");
+                                res = HttpResponse::SeeOther();
+                                res.insert_header(("Location", referer))
+                                    .content_type("application/json");
+                            };
+                            // Use provided ResponseParts headers if they exist
+                            let _count = res_parts
+                                .headers
+                                .drain()
+                                .map(|(k, v)| {
+                                    if let Some(k) = k {
+                                        res.insert_header((k, v));
+                                    }
+                                })
+                                .count();
+
+                            match serialized {
+                                Payload::Binary(data) => {
+                                    res.content_type("application/cbor");
+                                    res.body(Bytes::from(data))
+                                }
+                                Payload::Url(data) => {
+                                    res.content_type("application/x-www-form-urlencoded");
+                                    res.body(data)
+                                }
+                                Payload::Json(data) => {
+                                    res.content_type("application/json");
+                                    res.body(data)
+                                }
+                            }
+                        }
+                        Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
+                    }
+                } else {
+                    HttpResponse::BadRequest()
+                        .body(format!("Could not find a server function at that route."))
+                }
+            }
+        },
+    )
+}
+
+/// 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};
+///
+/// #[component]
+/// fn MyApp(cx: Scope) -> 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 addr = SocketAddr::from(([127,0,0,1],3000));
+///     HttpServer::new(move || {
+///         let render_options: RenderOptions = RenderOptions::builder().pkg_path("/pkg/leptos_example").reload_port(3001).socket_address(addr.clone()).environment(&env::var("RUST_ENV")).build();
+///         render_options.write_to_file();
+///         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_app_to_stream(render_options, |cx| view! { cx, <MyApp/> }))
+///     })
+///     .bind(&addr)?
+///     .run()
+///     .await
+/// }
+/// # }
+/// ```
+pub fn render_app_to_stream<IV>(
+    options: RenderOptions,
+    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 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();
+                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());
+
+                    (app_fn)(cx).into_view(cx)
+                }
+            };
+
+            let pkg_path = &options.pkg_path;
+            let socket_ip = &options.socket_address.ip().to_string();
+            let reload_port = options.reload_port;
+
+            let leptos_autoreload = match options.environment {
+                RustEnv::DEV => format!(
+                    r#"
+                        <script crossorigin="">(function () {{
+                            var ws = new WebSocket('ws://{socket_ip}:{reload_port}/autoreload');
+                            ws.onmessage = (ev) => {{
+                                console.log(`Reload message: `);
+                                if (ev.data === 'reload') window.location.reload();
+                            }};
+                            ws.onclose = () => console.warn('Autoreload stopped. Manual reload necessary.');
+                        }})()
+                        </script>
+                    "#
+                ),
+                RustEnv::PROD => "".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}.js">
+                        <link rel="preload" href="{pkg_path}_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
+                        <script type="module">import init, {{ hydrate }} from '{pkg_path}.js'; init('{pkg_path}_bg.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;
+            println!("Reading Options");
+            println!("Response Options: {:#?}", res_options);
+            let (status, mut headers) = (res_options.status.clone(), 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
+
+        }
+    })
+}

integrations/axum/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "leptos_axum"
+version = "0.0.4"
+edition = "2021"
+authors = ["Greg Johnston"]
+license = "MIT"
+repository = "https://github.com/gbj/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 = { path = "../../leptos", default-features = false, version = "0.0", features = [
+	"ssr",
+] }
+leptos_meta = { path = "../../meta", default-features = false, version = "0.0", features = [
+	"ssr",
+] }
+leptos_router = { path = "../../router", default-features = false, version = "0.0", features = [
+	"ssr",
+] }
+tokio = { version = "1.0", features = ["full"] }

integrations/axum/src/lib.rs

@@ -0,0 +1,433 @@
+use axum::{
+    body::{Body, Bytes, Full, StreamBody},
+    extract::Path,
+    http::{HeaderMap, HeaderValue, Request, StatusCode},
+    response::IntoResponse,
+};
+use futures::{Future, SinkExt, Stream, StreamExt};
+use http::{method::Method, uri::Uri, version::Version, Response};
+use hyper::body;
+use leptos::*;
+use leptos_meta::MetaContext;
+use leptos_router::*;
+use std::{io, pin::Pin, sync::Arc};
+use tokio::{sync::RwLock, task::spawn_blocking};
+
+/// A struct to hold the parts of the incoming Request. Since `http::Request` isn't cloneable, we're forced
+/// to construct this for Leptos to use in Axum
+#[derive(Debug, Clone)]
+pub struct RequestParts {
+    pub version: Version,
+    pub method: Method,
+    pub uri: Uri,
+    pub headers: HeaderMap<HeaderValue>,
+    pub body: Bytes,
+}
+/// This struct lets you define headers and override the status of the Response from an Element or a Server Function
+/// Typically contained inside of a ResponseOptions. Setting this is useful for cookies and custom responses.
+#[derive(Debug, Clone, Default)]
+pub struct ResponseParts {
+    pub status: Option<StatusCode>,
+    pub headers: HeaderMap,
+}
+
+/// Adding this Struct to your Scope inside of a Server Fn or Elements will allow you to override details of the Response
+/// like StatusCode and add Headers/Cookies. Because Elements and Server Fns are lower in the tree than the Response generation
+/// code, it needs to be wrapped in an `Arc<RwLock<>>` so that it can be surfaced
+#[derive(Debug, Clone, Default)]
+pub struct ResponseOptions(pub Arc<RwLock<ResponseParts>>);
+
+impl ResponseOptions {
+    /// A less boilerplatey way to overwrite the default contents of `ResponseOptions` with a new `ResponseParts`
+    pub async fn overwrite(&self, parts: ResponseParts) {
+        let mut writable = self.0.write().await;
+        *writable = parts
+    }
+}
+
+pub async fn generate_request_parts(req: Request<Body>) -> RequestParts {
+    // provide request headers as context in server scope
+    let (parts, body) = req.into_parts();
+    let body = body::to_bytes(body).await.unwrap_or_default();
+    RequestParts {
+        method: parts.method,
+        uri: parts.uri,
+        headers: parts.headers,
+        version: parts.version,
+        body: body.clone(),
+    }
+}
+
+/// 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:
+///
+/// ```
+/// use axum::{handler::Handler, routing::post, Router};
+/// use std::net::SocketAddr;
+/// use leptos::*;
+///
+/// # if false { // don't actually try to run a server in a doctest...
+/// #[tokio::main]
+/// async fn main() {
+///     let addr = SocketAddr::from(([127, 0, 0, 1], 8082));
+///
+///     // build our application with a route
+///     let app = Router::new()
+///       .route("/api/*fn_name", post(leptos_axum::handle_server_fns));
+///
+///     // run our app with hyper
+///     // `axum::Server` is a re-export of `hyper::Server`
+///     axum::Server::bind(&addr)
+///         .serve(app.into_make_service())
+///         .await
+///         .unwrap();
+/// }
+/// # }
+/// ```
+/// 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.
+pub async fn handle_server_fns(
+    Path(fn_name): Path<String>,
+    headers: HeaderMap,
+    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 (tx, rx) = futures::channel::oneshot::channel();
+    spawn_blocking({
+        move || {
+            tokio::runtime::Runtime::new()
+                .expect("couldn't spawn runtime")
+                .block_on({
+                    async move {
+                        let res = if let Some(server_fn) = server_fn_by_path(fn_name.as_str()) {
+                            let runtime = create_runtime();
+                            let (cx, disposer) = raw_scope_and_disposer(runtime);
+
+                            let req_parts = generate_request_parts(req).await;
+                            // Add this so we can get details about the Request
+                            provide_context(cx, req_parts.clone());
+                            // Add this so that we can set headers and status of the response
+                            provide_context(cx, ResponseOptions::default());
+
+                            match server_fn(cx, &req_parts.body).await {
+                                Ok(serialized) => {
+                                    // If ResponseParts are set, add the headers and extension to the request
+                                    let res_options = use_context::<ResponseOptions>(cx);
+
+                                    // clean up the scope, which we only needed to run the server fn
+                                    disposer.dispose();
+                                    runtime.dispose();
+
+                                    // if this is Accept: application/json then send a serialized JSON response
+                                    let accept_header =
+                                        headers.get("Accept").and_then(|value| value.to_str().ok());
+                                    let mut res = Response::builder();
+
+                                    // Add headers from ResponseParts if they exist. These should be added as long
+                                    // as the server function returns an OK response
+                                    let res_options_outer = res_options.unwrap().0;
+                                    let res_options_inner = res_options_outer.read().await;
+                                    let (status, mut res_headers) = (
+                                        res_options_inner.status.clone(),
+                                        res_options_inner.headers.clone(),
+                                    );
+
+                                    match res.headers_mut() {
+                                        Some(header_ref) => {
+                                            header_ref.extend(res_headers.drain());
+                                        }
+                                        None => (),
+                                    };
+
+                                    if accept_header == Some("application/json")
+                                        || accept_header
+                                            == Some("application/x-www-form-urlencoded")
+                                        || accept_header == Some("application/cbor")
+                                    {
+                                        res = res.status(StatusCode::OK);
+
+                                        // Override Status if Status is set in ResponseParts and
+                                        // We're not trying to do a form submit
+                                        res = match status {
+                                            Some(status) => res.status(status),
+                                            None => res,
+                                        }
+                                    }
+                                    // otherwise, it's probably a <form> submit or something: redirect back to the referrer
+                                    else {
+                                        let referer = headers
+                                            .get("Referer")
+                                            .and_then(|value| value.to_str().ok())
+                                            .unwrap_or("/");
+                                        res = res
+                                            .status(StatusCode::SEE_OTHER)
+                                            .header("Location", referer);
+                                    }
+                                    match serialized {
+                                        Payload::Binary(data) => res
+                                            .header("Content-Type", "application/cbor")
+                                            .body(Full::from(data)),
+                                        Payload::Url(data) => res
+                                            .header(
+                                                "Content-Type",
+                                                "application/x-www-form-urlencoded",
+                                            )
+                                            .body(Full::from(data)),
+                                        Payload::Json(data) => res
+                                            .header("Content-Type", "application/json")
+                                            .body(Full::from(data)),
+                                    }
+                                }
+                                Err(e) => Response::builder()
+                                    .status(StatusCode::INTERNAL_SERVER_ERROR)
+                                    .body(Full::from(e.to_string())),
+                            }
+                        } else {
+                            Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Full::from(
+                                    "Could not find a server function at that route.".to_string(),
+                                ))
+                        }
+                        .expect("could not build Response");
+
+                        _ = tx.send(res);
+                    }
+                })
+        }
+    });
+
+    rx.await.unwrap()
+}
+
+pub type PinnedHtmlStream = Pin<Box<dyn Stream<Item = io::Result<Bytes>> + Send>>;
+
+/// 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.
+///
+/// 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 axum::handler::Handler;
+/// use axum::Router;
+/// use std::{net::SocketAddr, env};
+/// use leptos::*;
+///
+/// #[component]
+/// fn MyApp(cx: Scope) -> Element {
+///   view! { cx, <main>"Hello, world!"</main> }
+/// }
+///
+/// # if false { // don't actually try to run a server in a doctest...
+/// #[tokio::main]
+/// async fn main() {
+///     let addr = SocketAddr::from(([127, 0, 0, 1], 8082));
+/// let render_options: RenderOptions = RenderOptions::builder()
+///     .pkg_path("/pkg/leptos_example")
+///     .socket_address(addr)
+///     .reload_port(3001)
+///     .environment(&env::var("RUST_ENV")).build();
+///
+///     // build our application with a route
+///     let app = Router::new()
+///     .fallback(leptos_axum::render_app_to_stream(render_options, |cx| view! { cx, <MyApp/> }));
+///
+///     // run our app with hyper
+///     // `axum::Server` is a re-export of `hyper::Server`
+///     axum::Server::bind(&addr)
+///         .serve(app.into_make_service())
+///         .await
+///         .unwrap();
+/// }
+/// # }
+/// ```
+///
+pub fn render_app_to_stream<IV>(
+    options: RenderOptions,
+    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 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();
+                let query = path.query();
+
+                let full_path;
+                if let Some(query) = query {
+                    full_path = "http://leptos".to_string() + &path.to_string() + "?" + query
+                } else {
+                    full_path = "http://leptos".to_string() + &path.to_string()
+                }
+
+                let pkg_path = &options.pkg_path;
+                let socket_ip = &options.socket_address.ip().to_string();
+                let reload_port = options.reload_port;
+
+                let leptos_autoreload = match options.environment {
+                    RustEnv::DEV => format!(
+                        r#"
+                            <script crossorigin="">(function () {{
+                                var ws = new WebSocket('ws://{socket_ip}:{reload_port}/autoreload');
+                                ws.onmessage = (ev) => {{
+                                    console.log(`Reload message: `);
+                                    if (ev.data === 'reload') window.location.reload();
+                                }};
+                                ws.onclose = () => console.warn('Autoreload stopped. Manual reload necessary.');
+                            }})()
+                            </script>
+                        "#
+                    ),
+                    RustEnv::PROD => "".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}.js">
+                            <link rel="preload" href="{pkg_path}_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
+                            <script type="module">import init, {{ hydrate }} from '{pkg_path}.js'; init('{pkg_path}_bg.wasm').then(hydrate);</script>
+                            {leptos_autoreload}
+                            "#
+                );
+                let tail = "</body></html>";
+
+                let (mut tx, rx) = futures::channel::mpsc::channel(8);
+
+                spawn_blocking({
+                    let app_fn = app_fn.clone();
+                    move || {
+                        tokio::runtime::Runtime::new()
+                            .expect("couldn't spawn runtime")
+                            .block_on({
+                                let app_fn = app_fn.clone();
+                                async move {
+                                    tokio::task::LocalSet::new()
+                                        .run_until(async {
+                                            let app = {
+                                                let full_path = full_path.clone();
+                                                let req_parts =
+                                                    generate_request_parts(req).await;
+                                                move |cx| {
+                                                    let integration = ServerIntegration {
+                                                        path: full_path.clone(),
+                                                    };
+                                                    provide_context(
+                                                        cx,
+                                                        RouterIntegrationContext::new(
+                                                            integration,
+                                                        ),
+                                                    );
+                                                    provide_context(cx, MetaContext::new());
+                                                    provide_context(cx, req_parts);
+                                                    provide_context(cx, default_res_options);
+                                                    app_fn(cx).into_view(cx)
+                                                }
+                                            };
+
+                                            let (bundle, runtime, scope) =
+                                                render_to_stream_with_prefix_undisposed(
+                                                    app,
+                                                |cx| {
+                                                        let head = use_context::<MetaContext>(cx)
+                                                            .map(|meta| meta.dehydrate())
+                                                            .unwrap_or_default();
+                                                        format!("{head}</head><body>").into()
+                                                    }
+                                            );
+                                            let mut shell = Box::pin(bundle);
+                                            while let Some(fragment) = shell.next().await {
+                                                _ = tx.send(fragment).await;
+                                            }
+
+                                            // Extract the value of ResponseOptions from here
+                                            let cx = Scope {
+                                                runtime,
+                                                id: scope
+                                            };
+                                            let res_options =
+                                                use_context::<ResponseOptions>(cx).unwrap();
+
+                                            let new_res_parts = res_options.0.read().await.clone();
+
+                                            let mut writable = res_options2.0.write().await;
+                                            *writable = new_res_parts;
+
+                                            runtime.dispose();
+
+                                            tx.close_channel();
+                                        })
+                                        .await;
+                                }
+                            });
+                    }
+                });
+
+                let mut stream = Box::pin(
+                    futures::stream::once(async move { head.clone() })
+                        .chain(rx)
+                        .chain(futures::stream::once(async { tail.to_string() }))
+                        .map(|html| Ok(Bytes::from(html))),
+                );
+
+                // 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;
+
+                // Extract the resources now that they've been rendered
+                let res_options = res_options3.0.read().await;
+
+                let complete_stream = futures::stream::iter([
+                    first_chunk.unwrap(),
+                    second_chunk.unwrap(),
+                    third_chunk.unwrap(),
+                ])
+                .chain(stream);
+
+                let mut res = Response::new(StreamBody::new(
+                    Box::pin(complete_stream) as PinnedHtmlStream
+                ));
+
+                match res_options.status {
+                    Some(status) => *res.status_mut() = status,
+                    None => (),
+                };
+                let mut res_headers = res_options.headers.clone();
+                res.headers_mut().extend(res_headers.drain());
+
+                res
+            }
+        })
+    }
+}