fmt

.github/ISSUE_TEMPLATE/bug_report.md

@@ -16,10 +16,10 @@ Please copy and paste the Leptos dependencies and features from your `Cargo.toml
 
 For example:
 ```toml
-leptos = { version = "0.3", features = ["serde"] }
+leptos = { version = "0.3", default-features = false, features = ["serde"] }
 leptos_axum = { version = "0.3", optional = true }
-leptos_meta = { version = "0.3"}
-leptos_router = { version = "0.3"}
+leptos_meta = { version = "0.3", default-features = false }
+leptos_router = { version = "0.3", default-features = false }
 ```
 
 **To Reproduce**

.github/workflows/check-examples.yml

@@ -1,46 +1,46 @@
-name: Check Examples
+name: Check examples
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
   pull_request:
-    branches:
-      - main
+    branches: [main]
+
+env:
+  CARGO_TERM_COLOR: always
+  CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
 
 jobs:
-  setup:
-    name: Get Examples
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install JQ Tool
-        uses: mbround18/install-jq@v1
-
-      - name: Set Matrix
-        id: set-matrix
-        run: |
-          examples=$(ls examples | 
-          awk '{print "examples/" $0}' | 
-          grep -v examples/README.md | 
-          grep -v examples/Makefile.toml | 
-          grep -v examples/cargo-make | 
-          grep -v examples/gtk | 
-          jq -R -s -c 'split("\n")[:-1]')
-          echo "Example Directories: $examples"
-          echo "matrix={\"directory\":$examples}" >> "$GITHUB_OUTPUT"
-
-  matrix-job:
-    name: Check
-    needs: [setup]
+  test:
+    name: Check examples ${{ matrix.os }} (using rustc ${{ matrix.rust }})
+    runs-on: ${{ matrix.os }}
     strategy:
-      matrix: ${{ fromJSON(needs.setup.outputs.matrix) }}
-      fail-fast: false
-    uses: ./.github/workflows/run-example-task.yml
-    with:
-      directory: ${{ matrix.directory }}
-      cargo_make_task: "check"
+      matrix:
+        rust:
+          - nightly
+        os:
+          - ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt
+
+      - name: Add wasm32-unknown-unknown
+        run: rustup target add wasm32-unknown-unknown
+
+      - name: Setup cargo-make
+        uses: davidB/rust-cargo-make@v1
+
+      - name: Cargo generate-lockfile
+        run: cargo generate-lockfile
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Run cargo check on all examples
+        run: cargo make check-examples

.github/workflows/verify-all-examples.yml

@@ -1,47 +0,0 @@
-name: Verify All Examples
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - v*
-  schedule:
-    # Run once a day at 3:00 AM EST
-    - cron: "0 8 * * *"
-
-jobs:
-  setup:
-    name: Get Examples
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install JQ Tool
-        uses: mbround18/install-jq@v1
-
-      - name: Set Matrix
-        id: set-matrix
-        run: |
-          examples=$(ls examples | 
-          awk '{print "examples/" $0}' | 
-          grep -v examples/README.md | 
-          grep -v examples/Makefile.toml | 
-          grep -v examples/cargo-make | 
-          grep -v examples/gtk | 
-          jq -R -s -c 'split("\n")[:-1]')
-          echo "Example Directories: $examples"
-          echo "matrix={\"directory\":$examples}" >> "$GITHUB_OUTPUT"
-
-  matrix-job:
-    name: Verify
-    needs: [setup]
-    strategy:
-      matrix: ${{ fromJSON(needs.setup.outputs.matrix) }}
-      fail-fast: false
-    uses: ./.github/workflows/run-example-task.yml
-    with:
-      directory: ${{ matrix.directory }}
-      cargo_make_task: "verify-flow"

.github/workflows/verify-changed-examples.yml

@@ -1,71 +0,0 @@
-name: Verify Changed Examples
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  setup:
-    name: Get Changes
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Get all example files that changed
-        id: changed-files
-        uses: tj-actions/changed-files@v36
-        with:
-          files: |
-            examples
-
-      - name: List all example files that changed
-        run: echo '${{ steps.changed-files.outputs.all_changed_files }}'
-
-      - name: Get example project directories that changed
-        id: changed-dirs
-        uses: tj-actions/changed-files@v36
-        with:
-          dir_names: true
-          dir_names_max_depth: "2"
-          files: |
-            examples
-            !examples/cargo-make
-            !examples/gtk
-            !examples/Makefile.toml
-            !examples/README.md
-          json: true
-          quotepath: false
-
-      - name: List example project directories that changed
-        run: echo '${{ steps.changed-dirs.outputs.all_changed_files }}'
-
-      - name: Set Matrix
-        id: set-matrix
-        run: |
-          if [ ${{ steps.changed-files.outputs.any_changed }} == 'true' ]; then
-            # Create matrix with changed directories
-            echo "matrix={\"directory\":${{ steps.changed-dirs.outputs.all_changed_files }}}" >> "$GITHUB_OUTPUT"
-          else
-            # Create matrix with one item to prevent an empty vector error
-            echo "matrix={\"directory\":[\"INTERNAL\"]}" >> "$GITHUB_OUTPUT"
-          fi
-
-  matrix-job:
-    name: Verify
-    needs: [setup]
-    strategy:
-      matrix: ${{ fromJSON(needs.setup.outputs.matrix) }}
-      fail-fast: false
-    uses: ./.github/workflows/run-example-task.yml
-    with:
-      directory: ${{ matrix.directory }}
-      cargo_make_task: "verify-flow"

.github/workflows/verify-examples.yml

@@ -1,21 +1,17 @@
-name: Run Example Task
+name: Verify Examples
 
 on:
-  workflow_call:
-    inputs:
-      directory:
-        required: true
-        type: string
-      cargo_make_task:
-        required: true
-        type: string
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
 env:
   CARGO_TERM_COLOR: always
-  CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
 
 jobs:
   test:
-    name: Run ${{ matrix.os }} (using rustc ${{ matrix.rust }})
+    name: Verify examples ${{ matrix.os }} (using rustc ${{ matrix.rust }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -25,12 +21,6 @@ jobs:
           - ubuntu-latest
 
     steps:
-      # Setup environment
-      - name: Install playwright browser dependencies
-        run: | 
-          sudo apt-get update
-          sudo apt-get install libegl1 libvpx7 libevent-2.1-7 libopus0 libopengl0 libwoff1 libharfbuzz-icu0 libgstreamer-plugins-base1.0-0 libgstreamer-gl1.0-0 libhyphen0 libmanette-0.2-0 libgles2 gstreamer1.0-libav                   
-
       - uses: actions/checkout@v3
 
       - name: Setup Rust
@@ -73,6 +63,7 @@ jobs:
 
       - name: Get pnpm store directory
         id: pnpm-cache
+        shell: bash
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
@@ -84,12 +75,5 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      # Verify project
-      - name: ${{ inputs.cargo_make_task }}
-        run: |
-          if [ "${{ inputs.directory }}" = "INTERNAL" ]; then
-            echo No verification required
-          else
-            cd ${{ inputs.directory }}
-            cargo make --profile=github-actions ${{ inputs.cargo_make_task }}
-          fi
+      - name: Run verify-flow on all web examples
+        run: cargo make --profile=github-actions verify-examples

CODE_OF_CONDUCT.md

@@ -2,7 +2,7 @@
 
 _This Code of Conduct is based on the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct)
 and the [Bevy Code of Conduct](https://raw.githubusercontent.com/bevyengine/bevy/main/CODE_OF_CONDUCT.md),
-which are adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)
+which are adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) 
 and the [Contributor Covenant](https://www.contributor-covenant.org)._
 
 ## Our Pledge

CONTRIBUTING.md

@@ -22,7 +22,7 @@ Leptos, as a framework, reflects certain technical values:
 - **Expose primitives rather than imposing patterns.** Provide building blocks
   that users can combine together to build up more complex behavior, rather than
   requiring users follow certain templates, file formats, etc. e.g., components
-  are defined as functions, rather than a bespoke single-file component format.
+  are defined as functions, rather than a bespoke single-file comonent format.
   The reactive system feeds into the rendering system, rather than being defined
   by it.
 - **Bottom-up over top-down.** If you envision a user’s application as a tree
@@ -42,7 +42,7 @@ Leptos, as a framework, reflects certain technical values:
 - **Embrace Rust semantics.** Especially in things like UI templating, use Rust
   semantics or extend them in a predictable way with control-flow components
   rather than overloading the meaning of Rust terms like `if` or `for` in a
-  framework-specific way.
+  framework-speciic way.
 - **Enhance ergonomics without obfuscating what’s happening.** This is by far
   the hardest to achieve. It’s often the case that adding additional layers to
   improve DX (like a custom build tool and starter templates) comes across as
@@ -67,7 +67,7 @@ are a few guidelines that will make it a better experience for everyone:
 - Our CI tests every PR against all the existing examples, sometimes requiring
   compilation for both server and client side, etc. It’s thorough but slow. If
   you want to run CI locally to reduce frustration, you can do that by installing
-  `cargo-make` and using `cargo make check && cargo make test && cargo make
+  `cargo-make` and using `cargo make check && cargo make test && cargo make 
 check-examples`.
 
 ## Architecture

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver="2"
 members = [
   # core
   "leptos",
@@ -26,22 +26,22 @@ members = [
 exclude = ["benchmarks", "examples"]
 
 [workspace.package]
-version = "0.4.0"
+version = "0.3.0"
 
 [workspace.dependencies]
-leptos = { path = "./leptos", version = "0.4.0" }
-leptos_dom = { path = "./leptos_dom", version = "0.4.0" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.4.0" }
-leptos_macro = { path = "./leptos_macro", version = "0.4.0" }
-leptos_reactive = { path = "./leptos_reactive", version = "0.4.0" }
-leptos_server = { path = "./leptos_server", version = "0.4.0" }
-server_fn = { path = "./server_fn", version = "0.4.0" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.4.0" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.4.0" }
-leptos_config = { path = "./leptos_config", version = "0.4.0" }
-leptos_router = { path = "./router", version = "0.4.0" }
-leptos_meta = { path = "./meta", version = "0.4.0" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.4.0" }
+leptos = { path = "./leptos", default-features = false, version = "0.3.0" }
+leptos_dom = { path = "./leptos_dom", default-features = false, version = "0.3.0" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.3.0" }
+leptos_macro = { path = "./leptos_macro", default-features = false, version = "0.3.0" }
+leptos_reactive = { path = "./leptos_reactive", default-features = false, version = "0.3.0" }
+leptos_server = { path = "./leptos_server", default-features = false, version = "0.3.0" }
+server_fn = { path = "./server_fn", default-features = false, version = "0.3.0" }
+server_fn_macro = { path = "./server_fn_macro", default-features = false, version = "0.3.0" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", default-features = false, version = "0.3.0" }
+leptos_config = { path = "./leptos_config", default-features = false, version = "0.3.0" }
+leptos_router = { path = "./router", version = "0.3.0" }
+leptos_meta = { path = "./meta", default-features = false, version = "0.3.0" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.3.0" }
 
 [profile.release]
 codegen-units = 1

Makefile.toml

@@ -45,8 +45,6 @@ dependencies = [
 	{ name = "check", path = "examples/fetch" },
 	{ name = "check", path = "examples/hackernews" },
 	{ name = "check", path = "examples/hackernews_axum" },
-	{ name = "check", path = "examples/js-framework-benchmark" },
-	{ name = "check", path = "examples/leptos-tailwind-axum" },
 	{ name = "check", path = "examples/login_with_token_csr_only" },
 	{ name = "check", path = "examples/parent_child" },
 	{ name = "check", path = "examples/router" },
@@ -56,7 +54,6 @@ dependencies = [
 	{ name = "check", path = "examples/ssr_modes_axum" },
 	{ name = "check", path = "examples/tailwind" },
 	{ name = "check", path = "examples/tailwind_csr_trunk" },
-	{ name = "check", path = "examples/timer" },
 	{ name = "check", path = "examples/todo_app_sqlite" },
 	{ name = "check", path = "examples/todo_app_sqlite_axum" },
 	{ name = "check", path = "examples/todo_app_sqlite_viz" },
@@ -105,7 +102,6 @@ args = ["make", "test-unit-and-web"]
 
 [tasks.verify-examples]
 description = "Run all quality checks and tests for examples"
-env = { CLEAN_AFTER_VERIFY = "true" }
 cwd = "examples"
 command = "cargo"
 args = ["make", "verify-flow"]

README.md

@@ -8,6 +8,7 @@
 [![Discord](https://img.shields.io/discord/1031524867910148188?color=%237289DA&label=discord)](https://discord.gg/YdRAhS7eQB)
 [![Matrix](https://img.shields.io/badge/Matrix-leptos-grey?logo=matrix&labelColor=white&logoColor=black)](https://matrix.to/#/#leptos:matrix.org)
 
+
 [Website](https://leptos.dev) | [Book](https://leptos-rs.github.io/leptos/) | [Docs.rs](https://docs.rs/leptos/latest/leptos/) | [Playground](https://codesandbox.io/p/sandbox/leptos-rtfggt?file=%2Fsrc%2Fmain.rs%3A1%2C1) | [Discord](https://discord.gg/YdRAhS7eQB)
 
 # Leptos
@@ -68,7 +69,7 @@ Here are some resources for learning more about Leptos:
 
 ## `nightly` Note
 
-Most of the examples assume you’re using `nightly` version of Rust and the `nightly` feature of Leptos. To use `nightly` Rust, you can either set your toolchain globally or on per-project basis.
+Most of the examples assume you’re using `nightly` version of Rust. For this, you can either set your toolchain globally or on per-project basis.
 
 To set `nightly` as a default toolchain for all projects (and add the ability to compile Rust to WebAssembly, if you haven’t already):
 
@@ -86,9 +87,13 @@ channel = "nightly"
 targets = ["wasm32-unknown-unknown"]
 ```
 
-The `nightly` feature enables the function call syntax for accessing and setting signals, as opposed to `.get()` and `.set()`. This leads to a consistent mental model in which accessing a reactive value of any kind (a signal, memo, or derived signal) is always represented as a function call. This is only possible with nightly Rust and the `nightly` feature.
+If you’re on `stable`, note the following:
 
-> Note: The `nightly` feature is present on the main branch version right now, but not in 0.3.x. For 0.3.x, nightly is the default and `stable` has a special feature.
+1. You need to enable the `"stable"` flag in `Cargo.toml`: `leptos = { version = "0.2", features = ["stable"] }`
+2. `nightly` enables the function call syntax for accessing and setting signals. If you’re using `stable`,
+   you’ll just call `.get()`, `.set()`, or `.update()` manually. Check out the
+   [`counters_stable` example](https://github.com/leptos-rs/leptos/blob/main/examples/counters_stable/src/main.rs)
+   for examples of the correct API.
 
 ## `cargo-leptos`
 

benchmarks/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 l021 = { package = "leptos", version = "0.2.1" }
-leptos = { path = "../leptos", features = ["ssr"] }
+leptos = { path = "../leptos", default-features = false, features = ["ssr"] }
 sycamore = { version = "0.8", features = ["ssr"] }
 yew = { git = "https://github.com/yewstack/yew", features = ["ssr"] }
 tokio-test = "0.4"

docs/book/src/02_getting_started.md

@@ -31,7 +31,7 @@ cargo init leptos-tutorial
 `cd` into your new `leptos-tutorial` project and add `leptos` as a dependency
 
 ```bash
-cargo add leptos --features=csr,nightly # or just csr if you're using stable Rust
+cargo add leptos
 ```
 
 Create a simple `index.html` in the root of the `leptos-tutorial` directory

docs/book/src/appendix_binary_size.md

@@ -47,12 +47,6 @@ Note that if you're using this with SSR too, the same Cargo profile will be appl
 target = "x86_64-unknown-linux-gnu" # or whatever
 ```
 
-Also note that in some cases, the cfg feature `has_std` will not be set, which may cause build errors with some dependencies which check for `has_std`. You may fix any build errors due to this by adding:
-```toml
-[build]
-rustflags = ["--cfg=has_std"]
-```
-
 And you'll need to add `panic = "abort"` to `[profile.release]` in `Cargo.toml`. Note that this applies the same `build-std` and panic settings to your server binary, which may not be desirable. Some further exploration is probably needed here.
 
 5. One of the sources of binary size in WASM binaries can be `serde` serialization/deserialization code. Leptos uses `serde` by default to serialize and deserialize resources created with `create_resource`. You might try experimenting with the `miniserde` and `serde-lite` features, which allow you to use those crates for serialization and deserialization instead; each only implements a subset of `serde`’s functionality, but typically optimizes for size over speed.

docs/book/src/async/13_actions.md

@@ -11,7 +11,7 @@ Actions and resources seem similar, but they represent fundamentally different t
 Say we have some `async` function we want to run.
 
 ```rust
-async fn add_todo_request(new_title: &str) -> Uuid {
+async fn add_todo(new_title: &str) -> Uuid {
     /* do some stuff on the server to add a new todo */
 }
 ```
@@ -41,16 +41,16 @@ async fn add_todo_request(new_title: &str) -> Uuid {
 So in this case, all we need to do to create an action is
 
 ```rust
-let add_todo_action = create_action(cx, |input: &String| {
+let add_todo = create_action(cx, |input: &String| {
     let input = input.to_owned();
-    async move { add_todo_request(&input).await }
+    async move { add_todo(&input).await }
 });
 ```
 
-Rather than calling `add_todo_action` directly, we’ll call it with `.dispatch()`, as in
+Rather than calling `add_todo` directly, we’ll call it with `.dispatch()`, as in
 
 ```rust
-add_todo_action.dispatch("Some value".to_string());
+add_todo.dispatch("Some value".to_string());
 ```
 
 You can do this from an event listener, a timeout, or anywhere; because `.dispatch()` isn’t an `async` function, it can be called from a synchronous context.
@@ -58,9 +58,9 @@ You can do this from an event listener, a timeout, or anywhere; because `.dispat
 Actions provide access to a few signals that synchronize between the asynchronous action you’re calling and the synchronous reactive system:
 
 ```rust
-let submitted = add_todo_action.input(); // RwSignal<Option<String>>
-let pending = add_todo_action.pending(); // ReadSignal<bool>
-let todo_id = add_todo_action.value(); // RwSignal<Option<Uuid>>
+let submitted = add_todo.input(); // RwSignal<Option<String>>
+let pending = add_todo.pending(); // ReadSignal<bool>
+let todo_id = add_todo.value(); // RwSignal<Option<Uuid>>
 ```
 
 This makes it easy to track the current state of your request, show a loading indicator, or do “optimistic UI” based on the assumption that the submission will succeed.
@@ -73,7 +73,7 @@ view! { cx,
         on:submit=move |ev| {
             ev.prevent_default(); // don't reload the page...
             let input = input_ref.get().expect("input to exist");
-            add_todo_action.dispatch(input.value());
+            add_todo.dispatch(input.value());
         }
     >
         <label>

docs/book/src/interlude_projecting_children.md

@@ -29,9 +29,9 @@ where
 }
 ```
 
-This is pretty straightforward: when the user is logged in, we want to show `children`. If the user is not logged in, we want to show `fallback`. And while we’re waiting to find out, we just render `()`, i.e., nothing.
+This is pretty straightforward: when the user is logged in, we want to show `children`. Until if the user is not logged in, we want to show `fallback`. And while we’re waiting to find out, we just render `()`, i.e., nothing.
 
-In other words, we want to pass the children of `<LoggedIn/>` _through_ the `<Suspense/>` component to become the children of the `<Show/>`. This is what I mean by “projection.”
+In other words, we want to pass the children of `<WhenLoaded/>` _through_ the `<Suspense/>` component to become the children of the `<Show/>`. This is what I mean by “projection.”
 
 This won’t compile.
 

docs/book/src/metadata.md

@@ -24,7 +24,7 @@ That’s where the [`leptos_meta`](https://docs.rs/leptos_meta/latest/leptos_met
 
 `leptos_meta` also provides a [`<Script/>`](https://docs.rs/leptos_meta/latest/leptos_meta/fn.Script.html) component, and it’s worth pausing here for a second. All of the other components we’ve considered inject `<head>`-only elements in the `<head>`. But a `<script>` can also be included in the body.
 
-There’s a very simple way to determine whether you should use a capital-S `<Script/>` component or a lowercase-s `<script>` element: the `<Script/>` component will be rendered in the `<head>`, and the `<script>` element will be rendered wherever in the `<body>` of your user interface you put it in, alongside other normal HTML elements. These cause JavaScript to load and run at different times, so use whichever is appropriate to your needs.
+There’s a very simple way to determine whether you should use a capital-S `<Script/>` component or a lowercase-s `<script>` element: the `<Script/>` component will be rendered in the `<head>`, and the `<script>` element will be rendered wherever in your the `<body>` of your user interface you put in, alongside other normal HTML elements. These cause JavaScript to load and run at different times, so use whichever is appropriate to your needs.
 
 ## `<Body/>` and `<Html/>`
 

docs/book/src/reactivity/working_with_signals.md

@@ -9,7 +9,7 @@ There are four basic signal operations:
 1. [`.get()`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html#impl-SignalGet%3CT%3E-for-ReadSignal%3CT%3E) clones the current value of the signal and tracks any future changes to the value reactively.
 2. [`.with()`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html#impl-SignalWith%3CT%3E-for-ReadSignal%3CT%3E) takes a function, which receives the current value of the signal by reference (`&T`), and tracks any future changes.
 3. [`.set()`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html#impl-SignalSet%3CT%3E-for-WriteSignal%3CT%3E) replaces the current value of the signal and notifies any subscribers that they need to update.
-4. [`.update()`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html#impl-SignalUpdate%3CT%3E-for-WriteSignal%3CT%3E) takes a function, which receives a mutable reference to the current value of the signal (`&mut T`), and notifies any subscribers that they need to update. (`.update()` doesn’t return the value returned by the closure, but you can use [`.try_update()`](https://docs.rs/leptos/latest/leptos/trait.SignalUpdate.html#tymethod.try_update) if you need to; for example, if you’re removing an item from a `Vec<_>` and want the removed item.)
+4. [`.update()`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html#impl-SignalUpdate%3CT%3E-for-WriteSignal%3CT%3E) takes a function, which receives a mutable reference to the current value of the signal (`&T`), and notifies any subscribers that they need to update. (`.update()` doesn’t return the value returned by the closure, but you can use [`.try_update()`](https://docs.rs/leptos/latest/leptos/trait.SignalUpdate.html#tymethod.try_update) if you need to; for example, if you’re removing an item from a `Vec<_>` and want the removed item.)
 
 Calling a `ReadSignal` as a function is syntax sugar for `.get()`. Calling a `WriteSignal` as a function is syntax sugar for `.set()`. So
 
@@ -99,7 +99,7 @@ let clear_handler = move |_| {
 ### If you really must...
 **4) Create an effect to write to B whenever A changes.** This is officially discouraged, for several reasons:
 a) It will always be less efficient, as it means every time A updates you do two full trips through the reactive process. (You set A, which causes the effect to run, as well as any other effects that depend on A. Then you set B, which causes any effects that depend on B to run.)
-b) It increases your chances of accidentally creating things like infinite loops or over-re-running effects. This is the kind of ping-ponging, reactive spaghetti code that was common in the early 2010s and that we try to avoid with things like read-write segregation and discouraging writing to signals from effects.
+b) It increases your chances of accidentally creating things like infinite loops or over-re-running effects. This is the kind of ping-ponging, reactive spaghetti code that was common in the early 2010s and that we try to avoid with things like read-write segregation and discouraging writing to signals frome effects.
 
 In most situations, it’s best to rewrite things such that there’s a clear, top-down data flow based on derived signals or memos. But this isn’t the end of the world.
 

docs/book/src/router/README.md

@@ -4,10 +4,10 @@
 
 Routing drives most websites. A router is the answer to the question, “Given this URL, what should appear on the page?”
 
-A URL consists of many parts. For example, the URL `https://my-cool-blog.com/blog/search?q=Search#results` consists of
+A URL consists of many parts. For example, the URL `https://leptos.dev/blog/search?q=Search#results` consists of
 
 - a _scheme_: `https`
-- a _domain_: `my-cool-blog.com`
+- a _domain_: `leptos.dev`
 - a **path**: `/blog/search`
 - a **query** (or **search**): `?q=Search`
 - a _hash_: `#results`

docs/book/src/view/01_basic_component.md

@@ -28,7 +28,7 @@ fn App(cx: Scope) -> impl IntoView {
     view! { cx,
         <button
             on:click=move |_| {
-                set_count(3);
+                set_count.update(|n| *n += 1);
             }
         >
             "Click me: "
@@ -142,7 +142,7 @@ in a function, telling the framework to update the view every time `count` chang
 `{count()}` access the value of `count` once, and passes an `i32` into the view,
 rendering it once, unreactively. You can see the difference in the CodeSandbox below!
 
-Let’s make one final change. `set_count(3)` is a pretty useless thing for a click handler to do. Let’s replace “set this value to 3” with “increment this value by 1”:
+Let’s make one final change. `set_count(3)` is a pretty useless thing for a click handler to do. Let’s replacing “set this value to 3” with “increment this value by 1”:
 
 ```rust
 move |_| {

docs/book/src/view/03_components.md

@@ -98,6 +98,18 @@ notice that you can easily tell the difference between an element and a componen
 because components always have `PascalCase` names. You pass the `progress` prop
 in as if it were an HTML element attribute. Simple.
 
+> ### Important Note
+>
+> For every `Component`, Leptos generates a corresponding `ComponentProps` type. This
+> is what allows us to have named props, when Rust does not have named function parameters.
+> If you’re defining a component in one module and importing it into another, make
+> sure you include this `ComponentProps` type:
+>
+> `use progress_bar::{ProgressBar, ProgressBarProps};`
+>
+> **Note**: This is still true as of `0.2.5`, but the requirement has been removed on `main`
+> and will not apply to later versions.
+
 ### Reactive and Static Props
 
 You’ll notice that throughout this example, `progress` takes a reactive

examples/Makefile.toml

@@ -15,33 +15,16 @@ CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
     "fetch",
     "hackernews",
     "hackernews_axum",
-    "js-framework-benchmark",
-    "leptos-tailwind-axum",
     "login_with_token_csr_only",
     "parent_child",
     "router",
     "session_auth_axum",
-    "slots",
     "ssr_modes",
     "ssr_modes_axum",
     "tailwind",
     "tailwind_csr_trunk",
-    "timer",
     "todo_app_sqlite",
     "todo_app_sqlite_axum",
     "todo_app_sqlite_viz",
     "todomvc",
 ]
-
-[tasks.gen-members]
-workspace = false
-description = "Generate the list of workspace members"
-script = '''
-examples=$(ls | 
-grep -v README.md | 
-grep -v Makefile.toml | 
-grep -v cargo-make | 
-grep -v gtk | 
-jq -R -s -c 'split("\n")[:-1]')
-echo "CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = $examples"
-'''

examples/cargo-make/common.toml

@@ -6,8 +6,7 @@ description = "Check for style violations"
 dependencies = ["check-format-flow", "clippy-flow"]
 
 [tasks.check-format]
-env = { LEPTOS_PROJECT_DIRECTORY = "../../" }
-args = ["fmt", "--", "--check", "--config-path", "${LEPTOS_PROJECT_DIRECTORY}"]
+args = ["fmt", "--", "--check", "--config-path", "../../"]
 
 [tasks.clean-cargo]
 description = "Runs the cargo clean command."
@@ -34,7 +33,7 @@ category = "Cleanup"
 script = '''
 for pw_dir in $(find . -name playwright.config.ts | xargs dirname)
 do
-  rm -rf $pw_dir/playwright-report pw_dir/playwright pw_dir/test-results
+  rm -rf $pw_dir/playwright-report
 done
 '''
 

examples/cargo-make/main.toml

@@ -1,8 +1,5 @@
 extend = [{ path = "../cargo-make/common.toml" }]
 
-[tasks.ci]
-alias = "verify-flow"
-
 [tasks.verify-flow]
 description = "Provides pre and post hooks for verify"
 dependencies = ["pre-verify", "verify", "post-verify"]
@@ -18,11 +15,7 @@ dependencies = ["test-flow", "test-e2e-flow"]
 [tasks.pre-verify]
 
 [tasks.post-verify]
-dependencies = ["maybe-clean-all"]
-
-[tasks.maybe-clean-all]
-description = "Used to clean up locally after call to verify-examples"
-condition = { env_true = ["CLEAN_AFTER_VERIFY"] }
+dependencies = ["clean-all"]
 
 [tasks.test-e2e-flow]
 description = "Provides pre and post hooks for test-e2e"

examples/cargo-make/playwright-test.toml

@@ -1,7 +0,0 @@
-extend = [{ path = "../cargo-make/playwright.toml" }]
-
-[tasks.test-e2e]
-dependencies = ["setup-node", "test-playwright-autostart"]
-
-[tasks.clean-all]
-dependencies = ["clean-cargo", "clean-node_modules", "clean-playwright"]

examples/cargo-make/playwright.toml

@@ -1,119 +0,0 @@
-[tasks.clean-playwright]
-description = "Delete playwright directories"
-category = "Cleanup"
-script = '''
-for pw_dir in $(find . -name playwright.config.ts | xargs dirname)
-do
-  rm -rf $pw_dir/playwright-report pw_dir/playwright pw_dir/test-results
-done
-'''
-
-[tasks.test-playwright-autostart]
-description = "Run playwright test with server autostart"
-category = "Test"
-command = "npm"
-args = ["run", "e2e:auto-start"]
-
-[tasks.test-playwright]
-description = "Run playwright test"
-category = "Test"
-script = '''
-BOLD="\e[1m"
-GREEN="\e[0;32m"
-RED="\e[0;31m"
-RESET="\e[0m"
-
-project_dir=$CARGO_MAKE_WORKING_DIRECTORY
-
-# Discover commands
-if command -v pnpm; then
-    PLAYWRIGHT_CMD=pnpm
-elif command -v npm; then
-    PLAYWRIGHT_CMD=npx
-else
-    echo "${RED}${BOLD}ERROR${RESET} - pnpm or npm is required by this task"
-    exit 1
-fi
-
-# Run playwright command
-for pw_path in $(find . -name playwright.config.ts)
-do
-  pw_dir=$(dirname $pw_path)
-  cd $pw_dir
-  ${PLAYWRIGHT_CMD} playwright test
-  cd $project_dir
-done
-'''
-
-[tasks.test-playwright-ui]
-description = "Run playwright test --ui"
-category = "Test"
-script = '''
-BOLD="\e[1m"
-GREEN="\e[0;32m"
-RED="\e[0;31m"
-RESET="\e[0m"
-
-project_dir=$CARGO_MAKE_WORKING_DIRECTORY
-
-# Discover commands
-if command -v pnpm; then
-    PLAYWRIGHT_CMD=pnpm
-elif command -v npm; then
-    PLAYWRIGHT_CMD=npx
-else
-    echo "${RED}${BOLD}ERROR${RESET} - pnpm or npm is required by this task"
-    exit 1
-fi
-
-# Run playwright command
-for pw_path in $(find . -name playwright.config.ts)
-do
-  pw_dir=$(dirname $pw_path)
-  cd $pw_dir
-  ${PLAYWRIGHT_CMD} playwright test --ui
-  cd $project_dir
-done
-'''
-
-[tasks.test-playwright-report]
-description = "Run playwright show-report"
-category = "Test"
-script = '''
-BOLD="\e[1m"
-GREEN="\e[0;32m"
-RED="\e[0;31m"
-RESET="\e[0m"
-
-project_dir=$CARGO_MAKE_WORKING_DIRECTORY
-
-# Discover commands
-if command -v pnpm; then
-    PLAYWRIGHT_CMD=pnpm
-elif command -v npm; then
-    PLAYWRIGHT_CMD=npx
-else
-    echo "${RED}${BOLD}ERROR${RESET} - pnpm or npm is required by this task"
-    exit 1
-fi
-
-# Run playwright command
-for pw_path in $(find . -name playwright.config.ts)
-do
-  pw_dir=$(dirname $pw_path)
-  cd $pw_dir
-  ${PLAYWRIGHT_CMD} playwright show-report
-  cd $project_dir
-done
-'''
-
-# ALIASES
-
-[tasks.pw]
-dependencies = ["test-playwright"]
-
-[tasks.pw-ui]
-dependencies = ["test-playwright-ui"]
-
-[tasks.pw-report]
-dependencies = ["test-playwright-report"]

examples/cargo-make/trunk_server.toml

@@ -1,22 +0,0 @@
-[tasks.build]
-command = "trunk"
-args = ["build"]
-
-[tasks.clean-trunk]
-command = "trunk"
-args = ["clean"]
-
-[tasks.start-trunk]
-command = "trunk"
-args = ["serve", "--open"]
-
-[tasks.stop-trunk]
-script = '''
-  pkill -f "cargo-make"
-  pkill -f "trunk"
-'''
-
-# ALIASES
-
-[tasks.dev]
-dependencies = ["start-trunk"]

examples/cargo-make/wasm-test.toml

@@ -1,7 +1,3 @@
-[tasks.test]
-env = { RUN_CARGO_TEST = false }
-condition = { env_true = ["RUN_CARGO_TEST"] }
-
 [tasks.post-test]
 dependencies = ["test-wasm"]
 

examples/counter/Cargo.toml

@@ -8,7 +8,7 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos" }
 console_log = "1"
 log = "0.4"
 console_error_panic_hook = "0.1.7"

examples/counter_isomorphic/Cargo.toml

@@ -19,17 +19,19 @@ console_error_panic_hook = "0.1"
 futures = "0.3"
 cfg-if = "1"
 lazy_static = "1"
-leptos = { path = "../../leptos" }
+leptos = { path = "../../leptos", default-features = false, features = [
+	"serde",
+] }
 leptos_actix = { path = "../../integrations/actix", optional = true }
-leptos_meta = { path = "../../meta" }
-leptos_router = { path = "../../router" }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4"
 gloo-net = { git = "https://github.com/rustwasm/gloo" }
 wasm-bindgen = "=0.2.86"
 serde = { version = "1", features = ["derive"] }
 
 [features]
-default = ["nightly"]
+default = []
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
 	"dep:actix-files",
@@ -39,10 +41,10 @@ ssr = [
 	"leptos_meta/ssr",
 	"leptos_router/ssr",
 ]
-nightly = ["leptos/nightly", "leptos_router/nightly"]
+stable = ["leptos/stable", "leptos_router/stable"]
 
 [package.metadata.cargo-all-features]
-denylist = ["actix-files", "actix-web", "leptos_actix", "nightly"]
+denylist = ["actix-files", "actix-web", "leptos_actix", "stable"]
 skip_feature_sets = [["ssr", "hydrate"]]
 
 [package.metadata.leptos]

examples/counter_without_macros/Cargo.toml

@@ -8,7 +8,7 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr"] }
+leptos = { path = "../../leptos", features = ["stable"] }
 console_log = "1"
 log = "0.4"
 console_error_panic_hook = "0.1.7"

examples/counter_without_macros/src/main.rs

@@ -1,7 +1,6 @@
 use counter_without_macros::counter;
 use leptos::*;
 
-/// Show the counter
 pub fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();

examples/counters/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"]  }
+leptos = { path = "../../leptos" }
 log = "0.4"
 console_log = "1"
 console_error_panic_hook = "0.1.7"

examples/counters_stable/.gitignore

@@ -1,20 +0,0 @@
-# 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
-
-# Support playwright testing
-node_modules/
-test-results/
-end2end/playwright-report/
-playwright/.cache/
-pnpm-lock.yaml
-
-# Support trunk
-dist

examples/counters_stable/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr"] }
+leptos = { path = "../../leptos", features = ["stable"] }
 log = "0.4"
 console_log = "1"
 console_error_panic_hook = "0.1.7"

examples/counters_stable/Makefile.toml

@@ -1,8 +1,4 @@
-extend = [
-    { path = "../cargo-make/main.toml" },
-    { path = "../cargo-make/trunk_server.toml" },
-    { path = "../cargo-make/playwright-test.toml" },
-]
+extend = [{ path = "../cargo-make/main.toml" }]
 
 [tasks.build]
 command = "cargo"

examples/counters_stable/e2e/.gitignore

@@ -1,4 +0,0 @@
-node_modules/
-/test-results/
-/playwright-report/
-/playwright/.cache/

examples/counters_stable/e2e/package-lock.json

@@ -1,83 +0,0 @@
-{
-  "name": "grip",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "grip",
-      "devDependencies": {
-        "@playwright/test": "^1.35.1"
-      }
-    },
-    "node_modules/.pnpm/@playwright+test@1.33.0": {
-      "extraneous": true
-    },
-    "node_modules/.pnpm/@types+node@20.2.1/node_modules/@types/node": {
-      "version": "20.2.1",
-      "extraneous": true,
-      "license": "MIT"
-    },
-    "node_modules/.pnpm/playwright-core@1.33.0/node_modules/playwright-core": {
-      "version": "1.33.0",
-      "extraneous": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@playwright/test": {
-      "version": "1.35.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.35.1.tgz",
-      "integrity": "sha512-b5YoFe6J9exsMYg0pQAobNDR85T1nLumUYgUTtKm4d21iX2L7WqKq9dW8NGJ+2vX0etZd+Y7UeuqsxDXm9+5ZA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "playwright-core": "1.35.1"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "20.3.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.1.tgz",
-      "integrity": "sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/playwright-core": {
-      "version": "1.35.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz",
-      "integrity": "sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg==",
-      "dev": true,
-      "bin": {
-        "playwright-core": "cli.js"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    }
-  }
-}

examples/counters_stable/e2e/package.json

@@ -1,7 +0,0 @@
-{
-  "private": "true",
-  "scripts": {},
-  "devDependencies": {
-    "@playwright/test": "^1.35.1"
-  }
-}

examples/counters_stable/e2e/playwright.config.ts

@@ -1,77 +0,0 @@
-import { defineConfig, devices } from "@playwright/test";
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: "./tests",
-  /* 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.DEV,
-  /* Retry on CI only */
-  retries: process.env.DEV ? 0 : 10,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.DEV ? 1 : 1,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: [["html", { open: "never" }], ["list"]],
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: "http://127.0.0.1:8080",
-
-    /* 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: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ..devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: "cd ../ && trunk serve",
-  //   url: "http://127.0.0.1:8080",
-  //   reuseExistingServer: false, //!process.env.CI,
-  // },
-});

examples/counters_stable/e2e/tests/add_1k_counters.spec.ts

@@ -1,20 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { CountersPage } from "./fixtures/counters_page";
-
-test.describe("Add 1000 Counters", () => {
-  test("should increase the number of counters", async ({ page }) => {
-    const ui = new CountersPage(page);
-
-    await Promise.all([
-      await ui.goto(),
-      await ui.addOneThousandCountersButton.waitFor(),
-    ]);
-
-    await ui.addOneThousandCounters();
-    await ui.addOneThousandCounters();
-    await ui.addOneThousandCounters();
-
-    await expect(ui.total).toHaveText("0");
-    await expect(ui.counters).toHaveText("3000");
-  });
-});

examples/counters_stable/e2e/tests/add_counter.spec.ts

@@ -1,16 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { CountersPage } from "./fixtures/counters_page";
-
-test.describe("Add Counter", () => {
-  test("should increase the number of counters", async ({ page }) => {
-    const ui = new CountersPage(page);
-    await ui.goto();
-
-    await ui.addCounter();
-    await ui.addCounter();
-    await ui.addCounter();
-
-    await expect(ui.total).toHaveText("0");
-    await expect(ui.counters).toHaveText("3");
-  });
-});

examples/counters_stable/e2e/tests/clear_counters.spec.ts

@@ -1,18 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { CountersPage } from "./fixtures/counters_page";
-
-test.describe("Clear Counters", () => {
-  test("should reset the counts", async ({ page }) => {
-    const ui = new CountersPage(page);
-    await ui.goto();
-
-    await ui.addCounter();
-    await ui.addCounter();
-    await ui.addCounter();
-
-    await ui.clearCounters();
-
-    await expect(ui.total).toHaveText("0");
-    await expect(ui.counters).toHaveText("0");
-  });
-});

examples/counters_stable/e2e/tests/decrement_count.spec.ts

@@ -1,17 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { CountersPage } from "./fixtures/counters_page";
-
-test.describe("Decrement Count", () => {
-  test("should decrease the total count", async ({ page }) => {
-    const ui = new CountersPage(page);
-    await ui.goto();
-    await ui.addCounter();
-
-    await ui.decrementCount();
-    await ui.decrementCount();
-    await ui.decrementCount();
-
-    await expect(ui.total).toHaveText("-3");
-    await expect(ui.counters).toHaveText("1");
-  });
-});

examples/counters_stable/e2e/tests/enter_count.spec.ts

@@ -1,31 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { CountersPage } from "./fixtures/counters_page";
-
-test.describe("Enter Count", () => {
-  test("should increase the total count", async ({ page }) => {
-    const ui = new CountersPage(page);
-    await ui.goto();
-    await ui.addCounter();
-
-    await ui.enterCount("5");
-
-    await expect(ui.total).toHaveText("5");
-    await expect(ui.counters).toHaveText("1");
-  });
-
-  test("should decrease the total count", async ({ page }) => {
-    const ui = new CountersPage(page);
-    await ui.goto();
-    await ui.addCounter();
-    await ui.addCounter();
-    await ui.addCounter();
-
-    await ui.enterCount("100");
-    await ui.enterCount("100", 1);
-    await ui.enterCount("100", 2);
-    await ui.enterCount("50", 1);
-
-    await expect(ui.total).toHaveText("250");
-    await expect(ui.counters).toHaveText("3");
-  });
-});

examples/counters_stable/e2e/tests/fixtures/counters_page.ts

@@ -1,98 +0,0 @@
-import { expect, Locator, Page } from "@playwright/test";
-
-export class CountersPage {
-  readonly page: Page;
-  readonly addCounterButton: Locator;
-  readonly addOneThousandCountersButton: Locator;
-  readonly clearCountersButton: Locator;
-
-  readonly incrementCountButton: Locator;
-  readonly counterInput: Locator;
-  readonly decrementCountButton: Locator;
-  readonly removeCountButton: Locator;
-
-  readonly total: Locator;
-  readonly counters: Locator;
-
-  constructor(page: Page) {
-    this.page = page;
-
-    this.addCounterButton = page.locator("button", { hasText: "Add Counter" });
-
-    this.addOneThousandCountersButton = page.locator("button", {
-      hasText: "Add 1000 Counters",
-    });
-
-    this.clearCountersButton = page.locator("button", {
-      hasText: "Clear Counters",
-    });
-
-    this.decrementCountButton = page.locator("button", {
-      hasText: "-1",
-    });
-
-    this.incrementCountButton = page.locator("button", {
-      hasText: "+1",
-    });
-
-    this.removeCountButton = page.locator("button", {
-      hasText: "x",
-    });
-
-    this.total = page.getByTestId("total");
-
-    this.counters = page.getByTestId("counters");
-
-    this.counterInput = page.getByRole("textbox");
-  }
-
-  async goto() {
-    await this.page.goto("/");
-  }
-
-  async addCounter() {
-    await Promise.all([
-      this.addCounterButton.waitFor(),
-      this.addCounterButton.click(),
-    ]);
-  }
-
-  async addOneThousandCounters() {
-    this.addOneThousandCountersButton.click();
-  }
-
-  async decrementCount(index: number = 0) {
-    await Promise.all([
-      this.decrementCountButton.nth(index).waitFor(),
-      this.decrementCountButton.nth(index).click(),
-    ]);
-  }
-
-  async incrementCount(index: number = 0) {
-    await Promise.all([
-      this.incrementCountButton.nth(index).waitFor(),
-      this.incrementCountButton.nth(index).click(),
-    ]);
-  }
-
-  async clearCounters() {
-    await Promise.all([
-      this.clearCountersButton.waitFor(),
-      this.clearCountersButton.click(),
-    ]);
-  }
-
-  async enterCount(count: string, index: number = 0) {
-    await Promise.all([
-      this.counterInput.nth(index).waitFor(),
-      this.counterInput.nth(index).fill(count),
-    ]);
-  }
-
-  async removeCounter(index: number = 0) {
-    await Promise.all([
-      this.removeCountButton.nth(index).waitFor(),
-      this.removeCountButton.nth(index).click(),
-    ]);
-  }
-}

examples/counters_stable/e2e/tests/increment_count.spec.ts

@@ -1,17 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { CountersPage } from "./fixtures/counters_page";
-
-test.describe("Increment Count", () => {
-  test("should increase the total count", async ({ page }) => {
-    const ui = new CountersPage(page);
-    await ui.goto();
-    await ui.addCounter();
-
-    await ui.incrementCount();
-    await ui.incrementCount();
-    await ui.incrementCount();
-
-    await expect(ui.total).toHaveText("3");
-    await expect(ui.counters).toHaveText("1");
-  });
-});

examples/counters_stable/e2e/tests/remove_counter.spec.ts

@@ -1,18 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { CountersPage } from "./fixtures/counters_page";
-
-test.describe("Remove Counter", () => {
-  test("should decrement the number of counters", async ({ page }) => {
-    const ui = new CountersPage(page);
-    await ui.goto();
-
-    await ui.addCounter();
-    await ui.addCounter();
-    await ui.addCounter();
-
-    await ui.removeCounter(1);
-
-    await expect(ui.total).toHaveText("0");
-    await expect(ui.counters).toHaveText("2");
-  });
-});

examples/counters_stable/e2e/tests/view_counters.spec.ts

@@ -1,19 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { CountersPage } from "./fixtures/counters_page";
-
-test.describe("View Counters", () => {
-  test("should see the title", async ({ page }) => {
-    const ui = new CountersPage(page);
-    await ui.goto();
-
-    await expect(page).toHaveTitle("Counters (Stable)");
-  });
-
-  test("should see the initial counts", async ({ page }) => {
-    const counters = new CountersPage(page);
-    await counters.goto();
-
-    await expect(counters.total).toHaveText("0");
-    await expect(counters.counters).toHaveText("0");
-  });
-});

examples/counters_stable/index.html

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>Counters (Stable)</title>
 		<link data-trunk rel="rust" data-wasm-opt="z" data-weak-refs/>
 	</head>
 	<body></body>

examples/counters_stable/package.json

@@ -1,11 +0,0 @@
-{
-  "private": "true",
-  "scripts": {
-    "start-server": "trunk serve",
-    "e2e": "cargo make test-playwright",
-    "e2e:auto-start": "start-server-and-test start-server http://127.0.0.1:8080 e2e"
-  },
-  "devDependencies": {
-    "start-server-and-test": "^1.15.4"
-  }
-}

examples/counters_stable/src/main.rs

@@ -56,7 +56,7 @@ pub fn Counters(cx: Scope) -> impl IntoView {
             </button>
             <p>
                 "Total: "
-                <span data-testid="total">{move ||
+                <span>{move ||
                     counters.get()
                         .iter()
                         .map(|(_, (count, _))| count.get())
@@ -64,7 +64,7 @@ pub fn Counters(cx: Scope) -> impl IntoView {
                         .to_string()
                 }</span>
                 " from "
-                <span data-testid="counters">{move || counters.with(|counters| counters.len()).to_string()}</span>
+                <span>{move || counters.with(|counters| counters.len()).to_string()}</span>
                 " counters."
             </p>
             <ul>
@@ -99,13 +99,13 @@ fn Counter(
 
     view! { cx,
         <li>
-            <button id="decrement_count" on:click=move |_| set_value.update(move |value| *value -= 1)>"-1"</button>
+            <button on:click=move |_| set_value.update(move |value| *value -= 1)>"-1"</button>
             <input type="text"
                 prop:value={move || value.get().to_string()}
                 on:input=input
             />
-            <span>{value}</span>
-            <button id="increment_count" on:click=move |_| set_value.update(move |value| *value += 1)>"+1"</button>
+            <span>{move || value.get().to_string()}</span>
+            <button on:click=move |_| set_value.update(move |value| *value += 1)>"+1"</button>
             <button on:click=move |_| set_counters.update(move |counters| counters.retain(|(counter_id, _)| counter_id != &id))>"x"</button>
         </li>
     }

examples/error_boundary/Cargo.toml

@@ -8,7 +8,7 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos" }
 console_log = "1"
 log = "0.4"
 console_error_panic_hook = "0.1.7"

examples/errors_axum/Cargo.toml

@@ -10,10 +10,12 @@ crate-type = ["cdylib", "rlib"]
 console_log = "1.0.0"
 console_error_panic_hook = "0.1.7"
 cfg-if = "1.0.0"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_meta = { path = "../../meta" }
-leptos_router = { path = "../../router" }
+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"
 serde = { version = "1", features = ["derive"] }
 simple_logger = "4.0.0"

examples/errors_axum/src/landing.rs

@@ -34,7 +34,10 @@ pub fn App(cx: Scope) -> impl IntoView {
             </header>
             <main>
                 <Routes>
-                    <Route path="" view=|cx| view! { cx, <ExampleErrors/> }/>
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <ExampleErrors/>
+                    }/>
                 </Routes>
             </main>
         </Router>
@@ -63,7 +66,7 @@ pub fn ExampleErrors(cx: Scope) -> impl IntoView {
         // note that the error boundaries could be placed above in the Router or lower down
         // in a particular route. The generated errors on the entire page contribute to the
         // final status code sent by the server when producing ssr pages.
-        <ErrorBoundary fallback=|cx, errors| view!{ cx, <ErrorTemplate errors=errors/>}>
+        <ErrorBoundary fallback=|cx, errors| view!{cx, <ErrorTemplate errors=errors/>}>
             <ReturnsError/>
         </ErrorBoundary>
         </div>

examples/fetch/Cargo.toml

@@ -8,7 +8,7 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos" }
 reqwasm = "0.5"
 serde = { version = "1", features = ["derive"] }
 log = "0.4"

examples/fetch/src/lib.rs

@@ -1,4 +1,4 @@
-use leptos::{error::Result, *};
+use leptos::*;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
@@ -8,24 +8,30 @@ pub struct Cat {
 }
 
 #[derive(Error, Clone, Debug)]
-pub enum CatError {
+pub enum FetchError {
     #[error("Please request more than zero cats.")]
     NonZeroCats,
+    #[error("Error loading data from serving.")]
+    Request,
+    #[error("Error deserializaing cat data from request.")]
+    Json,
 }
 
 type CatCount = usize;
 
-async fn fetch_cats(count: CatCount) -> Result<Vec<String>> {
+async fn fetch_cats(count: CatCount) -> Result<Vec<String>, FetchError> {
     if count > 0 {
         // make the request
         let res = reqwasm::http::Request::get(&format!(
             "https://api.thecatapi.com/v1/images/search?limit={count}",
         ))
         .send()
-        .await?
+        .await
+        .map_err(|_| FetchError::Request)?
         // convert it to JSON
         .json::<Vec<Cat>>()
-        .await?
+        .await
+        .map_err(|_| FetchError::Json)?
         // extract the URL field for each cat
         .into_iter()
         .take(count)
@@ -33,7 +39,7 @@ async fn fetch_cats(count: CatCount) -> Result<Vec<String>> {
         .collect::<Vec<_>>();
         Ok(res)
     } else {
-        Err(CatError::NonZeroCats.into())
+        Err(FetchError::NonZeroCats)
     }
 }
 

examples/gtk/Cargo.toml

@@ -4,5 +4,5 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos" }
 gtk = { version = "0.5.0", package = "gtk4" }

examples/hackernews/Cargo.toml

@@ -16,10 +16,12 @@ actix-web = { version = "4", optional = true, features = ["macros"] }
 console_log = "1"
 console_error_panic_hook = "0.1"
 cfg-if = "1"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_actix = { path = "../../integrations/actix", optional = true }
-leptos_router = { path = "../../router", features = ["nightly"] }
+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"
 serde = { version = "1", features = ["derive"] }
 gloo-net = { version = "0.2", features = ["http"] }

examples/hackernews_axum/Cargo.toml

@@ -14,10 +14,12 @@ lto = true
 console_log = "1.0.0"
 console_error_panic_hook = "0.1.7"
 cfg-if = "1.0.0"
-leptos = { path = "../../leptos", features = ["nightly"] }
+leptos = { path = "../../leptos", default-features = false, features = [
+  "serde",
+] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+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"] }

examples/js-framework-benchmark/Cargo.toml

@@ -8,7 +8,7 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly", "template_macro"] }
+leptos = { path = "../../leptos", features=["template_macro"] }
 console_log = "1"
 log = "0.4"
 # used in rand, but we need to enable js feature

examples/js-framework-benchmark/Makefile.toml

@@ -5,13 +5,10 @@ extend = [
 
 [tasks.build]
 command = "cargo"
-args = ["+nightly", "build-all-features", "--target", "wasm32-unknown-unknown"]
+args = ["+nightly", "build-all-features"]
 install_crate = "cargo-all-features"
 
 [tasks.check]
 command = "cargo"
-args = ["+nightly", "check-all-features", "--target", "wasm32-unknown-unknown"]
+args = ["+nightly", "check-all-features"]
 install_crate = "cargo-all-features"
-
-[tasks.pre-clippy]
-env = { CARGO_MAKE_CLIPPY_ARGS = "--all-targets --all-features --target wasm32-unknown-unknown -- -D warnings" }

examples/leptos-tailwind-axum/Cargo.toml

@@ -11,10 +11,10 @@ axum = { version = "0.6.18", optional = true }
 console_error_panic_hook = "0.1.7"
 console_log = "1"
 cfg-if = "1"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos = { version = "0.3", default-features = false, features = ["serde"] }
+leptos_axum = { version = "0.3", optional = true }
+leptos_meta = { version = "0.3", default-features = false }
+leptos_router = { version = "0.3", default-features = false }
 log = "0.4.17"
 simple_logger = "4"
 tokio = { version = "1.28.1", optional = true }

examples/leptos-tailwind-axum/Makefile.toml

@@ -1,11 +0,0 @@
-extend = [{ path = "../cargo-make/main.toml" }]
-
-[tasks.build]
-command = "cargo"
-args = ["+nightly", "build-all-features"]
-install_crate = "cargo-all-features"
-
-[tasks.check]
-command = "cargo"
-args = ["+nightly", "check-all-features"]
-install_crate = "cargo-all-features"

examples/leptos-tailwind-axum/src/app.rs

@@ -20,25 +20,26 @@ pub fn App(cx: Scope) -> impl IntoView {
 
 #[component]
 fn Home(cx: Scope) -> impl IntoView {
+
     let (value, set_value) = create_signal(cx, 0);
 
     // thanks to https://tailwindcomponents.com/component/blue-buttons-example for the showcase layout
     view! { cx,
         <Title text="Leptos + Tailwindcss"/>
-        <main>
-            <div class="bg-gradient-to-tl from-blue-800 to-blue-500 text-white font-mono flex flex-col min-h-screen">
-                <div class="flex flex-row-reverse flex-wrap m-auto">
-                    <button on:click=move |_| set_value.update(|value| *value += 1) class="rounded px-3 py-2 m-1 border-b-4 border-l-2 shadow-lg bg-blue-700 border-blue-800 text-white">
-                        "+"
-                    </button>
-                    <button class="rounded px-3 py-2 m-1 border-b-4 border-l-2 shadow-lg bg-blue-800 border-blue-900 text-white">
-                        {value}
-                    </button>
-                    <button on:click=move |_| set_value.update(|value| *value -= 1) class="rounded px-3 py-2 m-1 border-b-4 border-l-2 shadow-lg bg-blue-700 border-blue-800 text-white">
-                        "-"
-                    </button>
+            <main>
+                <div class="bg-gradient-to-tl from-blue-800 to-blue-500 text-white font-mono flex flex-col min-h-screen">
+                    <div class="flex flex-row-reverse flex-wrap m-auto">
+                        <button on:click=move |_| set_value.update(|value| *value += 1) class="rounded px-3 py-2 m-1 border-b-4 border-l-2 shadow-lg bg-blue-700 border-blue-800 text-white">
+                            "+"
+                        </button>
+                        <button class="rounded px-3 py-2 m-1 border-b-4 border-l-2 shadow-lg bg-blue-800 border-blue-900 text-white">
+                            {value}
+                        </button>
+                        <button on:click=move |_| set_value.update(|value| *value -= 1) class="rounded px-3 py-2 m-1 border-b-4 border-l-2 shadow-lg bg-blue-700 border-blue-800 text-white">
+                            "-"
+                        </button>
+                    </div>
                 </div>
-            </div>
-        </main>
+            </main>
     }
 }

examples/leptos-tailwind-axum/src/error_template.rs

@@ -0,0 +1,76 @@
+use cfg_if::cfg_if;
+use http::status::StatusCode;
+use leptos::*;
+use thiserror::Error;
+
+#[cfg(feature = "ssr")]
+use leptos_axum::ResponseOptions;
+
+#[derive(Clone, Debug, Error)]
+pub enum AppError {
+    #[error("Not Found")]
+    NotFound,
+}
+
+impl AppError {
+    pub fn status_code(&self) -> StatusCode {
+        match self {
+            AppError::NotFound => StatusCode::NOT_FOUND,
+        }
+    }
+}
+
+// A basic function to display errors served by the error boundaries.
+// Feel free to do more complicated things here than just displaying the error.
+#[component]
+pub fn ErrorTemplate(
+    cx: Scope,
+    #[prop(optional)] outside_errors: Option<Errors>,
+    #[prop(optional)] errors: Option<RwSignal<Errors>>,
+) -> impl IntoView {
+    let errors = match outside_errors {
+        Some(e) => create_rw_signal(cx, e),
+        None => match errors {
+            Some(e) => e,
+            None => panic!("No Errors found and we expected errors!"),
+        },
+    };
+    // Get Errors from Signal
+    let errors = errors.get();
+
+    // Downcast lets us take a type that implements `std::error::Error`
+    let errors: Vec<AppError> = errors
+        .into_iter()
+        .filter_map(|(_k, v)| v.downcast_ref::<AppError>().cloned())
+        .collect();
+    println!("Errors: {errors:#?}");
+
+    // Only the response code for the first error is actually sent from the server
+    // this may be customized by the specific application
+    cfg_if! { if #[cfg(feature="ssr")] {
+        let response = use_context::<ResponseOptions>(cx);
+        if let Some(response) = response {
+            response.set_status(errors[0].status_code());
+        }
+    }}
+
+    view! {cx,
+        <h1>{if errors.len() > 1 {"Errors"} else {"Error"}}</h1>
+        <For
+            // a function that returns the items we're iterating over; a signal is fine
+            each= move || {errors.clone().into_iter().enumerate()}
+            // a unique key for each item as a reference
+            key=|(index, _error)| *index
+            // renders each item to a view
+            view= move |cx, error| {
+                let error_string = error.1.to_string();
+                let error_code= error.1.status_code();
+                view! {
+                    cx,
+                    <h2>{error_code.to_string()}</h2>
+                    <p>"Error: " {error_string}</p>
+                }
+            }
+        />
+    }
+}

examples/leptos-tailwind-axum/src/fileserv.rs

@@ -3,27 +3,29 @@ use cfg_if::cfg_if;
 cfg_if! { if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
-        extract::State,
+        extract::Extension,
         response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
     use axum::response::Response as AxumResponse;
     use tower::ServiceExt;
     use tower_http::services::ServeDir;
-    use leptos::{LeptosOptions, view};
-    use crate::app::App;
+    use std::sync::Arc;
+    use leptos::*;
+    use crate::error_template::ErrorTemplate;
+    use crate::error_template::AppError;
 
-    pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
+        let options = &*options;
         let root = options.site_root.clone();
         let res = get_static_file(uri.clone(), &root).await.unwrap();
 
         if res.status() == StatusCode::OK {
-            res.into_response()
-        } else{
-            let handler = leptos_axum::render_app_to_stream(
-                options.to_owned(),
-                move |cx| view!{ cx, <App/> }
-            );
+           res.into_response()
+        } else {
+            let mut errors = Errors::default();
+            errors.insert_with_default_key(AppError::NotFound);
+            let handler = leptos_axum::render_app_to_stream(options.to_owned(), move |cx| view!{cx, <ErrorTemplate outside_errors=errors.clone()/>});
             handler(req).await.into_response()
         }
     }

examples/leptos-tailwind-axum/src/lib.rs

@@ -1,6 +1,7 @@
 use cfg_if::cfg_if;
 pub mod app;
-pub mod fallback;
+pub mod error_template;
+pub mod fileserv;
 
 cfg_if! { if #[cfg(feature = "hydrate")] {
     use leptos::*;

examples/leptos-tailwind-axum/src/main.rs

@@ -1,32 +1,32 @@
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::{routing::post, Router};
+    use axum::{extract::Extension, routing::post, Router};
     use leptos::*;
     use leptos_axum::{generate_route_list, LeptosRoutes};
-    use leptos_tailwind::{app::*, fallback::file_and_error_handler};
     use log::info;
+    use leptos_tailwind::app::*;
+    use leptos_tailwind::fileserv::file_and_error_handler;
+    use std::sync::Arc;
 
-    simple_logger::init_with_level(log::Level::Info)
-        .expect("couldn't initialize logging");
-
+    simple_logger::init_with_level(log::Level::Info).expect("couldn't initialize logging");
+   
     // Setting get_configuration(None) means we'll be using cargo-leptos's env values
     // For deployment these variables are:
     // <https://github.com/leptos-rs/start-axum#executing-a-server-on-a-remote-machine-without-the-toolchain>
     // Alternately a file can be specified such as Some("Cargo.toml")
     // The file would need to be included with the executable when moved to deployment
     let conf = get_configuration(None).await.unwrap();
-    let addr = conf.leptos_options.site_addr;
     let leptos_options = conf.leptos_options;
-    // Generate the list of routes in your Leptos App
+    let addr = leptos_options.site_addr;
     let routes = generate_route_list(|cx| view! { cx, <App/> }).await;
 
     // build our application with a route
     let app = Router::new()
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
-        .leptos_routes(&leptos_options, routes, |cx| view! { cx, <App/> })
+        .leptos_routes(leptos_options.clone(), routes, |cx| view! { cx, <App/> })
         .fallback(file_and_error_handler)
-        .with_state(leptos_options);
+        .layer(Extension(Arc::new(leptos_options)));
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`

examples/login_with_token_csr_only/Cargo.toml

@@ -6,6 +6,6 @@ codegen-units = 1
 lto = true
 
 [patch.crates-io]
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos = { path = "../../leptos" }
+leptos_router = { path = "../../router" }
 api-boundary = { path = "api-boundary" }

examples/login_with_token_csr_only/api-boundary/Makefile.toml

@@ -1,4 +1 @@
 extend = { path = "../../cargo-make/main.toml" }
-
-[tasks.check-format]
-env = { LEPTOS_PROJECT_DIRECTORY = "../../../" }

examples/login_with_token_csr_only/client/Cargo.toml

@@ -7,9 +7,8 @@ publish = false
 [dependencies]
 api-boundary = "*"
 
-leptos = { path = "../../../leptos", features = ["csr"] }
-leptos_meta = { path = "../../../meta", features = ["csr"] }
-leptos_router = { path = "../../../router", features = ["csr"] }
+leptos = { version = "0.2.0-alpha2", features = ["stable"] }
+leptos_router = { version = "0.2.0-alpha2", features = ["stable", "csr"] }
 
 log = "0.4"
 console_error_panic_hook = "0.1"

examples/login_with_token_csr_only/client/Makefile.toml

@@ -1,4 +1 @@
 extend = { path = "../../cargo-make/main.toml" }
-
-[tasks.check-format]
-env = { LEPTOS_PROJECT_DIRECTORY = "../../../" }

examples/login_with_token_csr_only/server/Makefile.toml

@@ -1,4 +1 @@
 extend = { path = "../../cargo-make/main.toml" }
-
-[tasks.check-format]
-env = { LEPTOS_PROJECT_DIRECTORY = "../../../" }

examples/parent_child/Cargo.toml

@@ -8,7 +8,7 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos" }
 console_log = "1"
 log = "0.4"
 console_error_panic_hook = "0.1.7"

examples/parent_child/src/lib.rs

@@ -45,7 +45,7 @@ pub fn App(cx: Scope) -> impl IntoView {
             // Button B: pass a closure
             <ButtonB on_click=move |_| set_right.update(|value| *value = !*value)/>
 
-            // Button C: use a regular event listener
+            // Button B: use a regular event listener
             // setting an event listener on a component like this applies it
             // to each of the top-level elements the component returns
             <ButtonC on:click=move |_| set_italics.update(|value| *value = !*value)/>

examples/router/.gitignore

@@ -1,21 +0,0 @@
- 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
-
-# Support playwright testing
-node_modules/
-test-results/
-end2end/playwright-report/
-playwright/.cache/
-pnpm-lock.yaml
-
-# Support trunk
-dist
-

examples/router/Cargo.toml

@@ -10,12 +10,12 @@ lto = true
 [dependencies]
 console_log = "1"
 log = "0.4"
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
-leptos_router = { path = "../../router", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos" }
+leptos_router = { path = "../../router", features = ["csr"] }
 serde = { version = "1", features = ["derive"] }
 futures = "0.3"
 console_error_panic_hook = "0.1.7"
-leptos_meta = { path = "../../meta", features = ["csr", "nightly"] }
+leptos_meta = { path = "../../meta", features = ["csr"] }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.0"

examples/router/Makefile.toml

@@ -1,8 +1,4 @@
-extend = [
-    { path = "../cargo-make/main.toml" },
-    { path = "../cargo-make/trunk_server.toml" },
-    { path = "../cargo-make/playwright-test.toml" },
-]
+extend = { path = "../cargo-make/main.toml" }
 
 [tasks.build]
 command = "cargo"

examples/router/e2e/package-lock.json

@@ -1,36 +0,0 @@
-{
-  "name": "e2e",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@playwright/test": {
-      "version": "1.35.1",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "fsevents": "2.3.2",
-        "playwright-core": "1.35.1"
-      }
-    },
-    "@types/node": {
-      "version": "20.3.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.2.tgz",
-      "integrity": "sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
-    "playwright-core": {
-      "version": "1.35.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz",
-      "integrity": "sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg==",
-      "dev": true
-    }
-  }
-}

examples/router/e2e/package.json

@@ -1,7 +0,0 @@
-{
-  "private": "true",
-  "scripts": {},
-  "devDependencies": {
-    "@playwright/test": "^1.35.1"
-  }
-}

examples/router/e2e/playwright.config.ts

@@ -1,77 +0,0 @@
-import { defineConfig, devices } from "@playwright/test";
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: "./tests",
-  /* 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 ? 10 : 10,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: "list",
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: "http://127.0.0.1:8080",
-
-    /* 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: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ..devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: "cd ../ && trunk serve",
-  //   url: "http://127.0.0.1:8080",
-  //   reuseExistingServer: false, //!process.env.CI,
-  // },
-});

examples/router/e2e/tests/router.spec.ts

@@ -1,30 +0,0 @@
-import { test, expect } from "@playwright/test";
-
-test.describe("Test Router example", () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto("/");
-  });
-
-  const links = [
-    { label: "Bill Smith", url: "/0" },
-    { label: "Tim Jones", url: "/1" },
-    { label: "Sally Stevens", url: "/2" },
-    { label: "About", url: "/about" },
-    { label: "Settings", url: "/settings" },
-  ];
-  links.forEach(({ label, url }) => {
-    test(`Can navigate to ${label}`, async ({ page }) => {
-      await page.getByRole("link", { name: label }).click();
-
-      await expect(page.getByRole("heading", { name: label })).toBeVisible();
-      await expect(page).toHaveURL(url);
-    });
-  });
-
-  test("Can redirect to home", async ({ page }) => {
-    await page.getByRole("link", { name: "About" }).click();
-
-    await page.getByRole("link", { name: "Redirect to Home" }).click();
-    await expect(page).toHaveURL("/");
-  });
-});

examples/router/package.json

@@ -1,11 +0,0 @@
-{
-  "private": true,
-  "scripts": {
-    "start-server": "trunk serve",
-    "e2e": "cargo make test-playwright",
-    "e2e:auto-start": "start-server-and-test start-server http://127.0.0.1:8080 e2e"
-  },
-  "devDependencies": {
-    "start-server-and-test": "^2.0.0"
-  }
-}

examples/session_auth_axum/Cargo.toml

@@ -13,10 +13,12 @@ rand = { version = "0.8.5", features = ["min_const_gen"], optional = true }
 console_error_panic_hook = "0.1.7"
 futures = "0.3.25"
 cfg-if = "1.0.0"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
+leptos = { path = "../../leptos", default-features = false, features = [
+	"serde",
+] }
+leptos_meta = { path = "../../meta", default-features = false }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4.17"
 simple_logger = "4.0.0"
 serde = { version = "1.0.148", features = ["derive"] }

examples/session_auth_axum/src/auth.rs

@@ -163,11 +163,12 @@ pub async fn login(
 
     let user: User = User::get_from_username(username, &pool)
         .await
-        .ok_or_else(|| {
-            ServerFnError::ServerError("User does not exist.".into())
-        })?;
+        .ok_or("User does not exist.")
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
 
-    match verify(password, &user.password)? {
+    match verify(password, &user.password)
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         true => {
             auth.login_user(user.id);
             auth.remember_user(remember.is_some());
@@ -203,16 +204,13 @@ pub async fn signup(
         .bind(username.clone())
         .bind(password_hashed)
         .execute(&pool)
-        .await?;
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
 
-    let user =
-        User::get_from_username(username, &pool)
-            .await
-            .ok_or_else(|| {
-                ServerFnError::ServerError(
-                    "Signup failed: User does not exist.".into(),
-                )
-            })?;
+    let user = User::get_from_username(username, &pool)
+        .await
+        .ok_or("Signup failed: User does not exist.")
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
 
     auth.login_user(user.id);
     auth.remember_user(remember.is_some());

examples/session_auth_axum/src/todo.rs

@@ -21,12 +21,14 @@ if #[cfg(feature = "ssr")] {
 
     pub fn pool(cx: Scope) -> Result<SqlitePool, ServerFnError> {
        use_context::<SqlitePool>(cx)
-            .ok_or_else(|| ServerFnError::ServerError("Pool missing.".into()))
+            .ok_or("Pool missing.")
+            .map_err(|e| ServerFnError::ServerError(e.to_string()))
     }
 
     pub fn auth(cx: Scope) -> Result<AuthSession, ServerFnError> {
         use_context::<AuthSession>(cx)
-            .ok_or_else(|| ServerFnError::ServerError("Auth session missing.".into()))
+            .ok_or("Auth session missing.")
+            .map_err(|e| ServerFnError::ServerError(e.to_string()))
     }
 
     #[derive(sqlx::FromRow, Clone)]
@@ -62,7 +64,11 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     let mut rows =
         sqlx::query_as::<_, SqlTodo>("SELECT * FROM todos").fetch(&pool);
 
-    while let Some(row) = rows.try_next().await? {
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         todos.push(row);
     }
 
@@ -111,11 +117,12 @@ pub async fn add_todo(cx: Scope, title: String) -> Result<(), ServerFnError> {
 pub async fn delete_todo(cx: Scope, id: u16) -> Result<(), ServerFnError> {
     let pool = pool(cx)?;
 
-    Ok(sqlx::query("DELETE FROM todos WHERE id = $1")
+    sqlx::query("DELETE FROM todos WHERE id = $1")
         .bind(id)
         .execute(&pool)
         .await
-        .map(|_| ())?)
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
 }
 
 #[component]
@@ -170,7 +177,12 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
             <hr/>
             <main>
                 <Routes>
-                    <Route path="" view=|cx| view! { cx, <Todos/> }/> //Route
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <ErrorBoundary fallback=|cx, errors| view!{cx, <ErrorTemplate errors=errors/>}>
+                            <Todos/>
+                        </ErrorBoundary>
+                    }/> //Route
                     <Route path="signup" view=move |cx| view! {
                         cx,
                         <Signup action=signup/>
@@ -214,71 +226,69 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                 <input type="submit" value="Add"/>
             </MultiActionForm>
             <Transition fallback=move || view! {cx, <p>"Loading..."</p> }>
-                <ErrorBoundary fallback=|cx, errors| view!{ cx, <ErrorTemplate errors=errors/>}>
-                    {move || {
-                        let existing_todos = {
-                            move || {
-                                todos.read(cx)
-                                    .map(move |todos| match todos {
-                                        Err(e) => {
-                                            view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                {move || {
+                    let existing_todos = {
+                        move || {
+                            todos.read(cx)
+                                .map(move |todos| match todos {
+                                    Err(e) => {
+                                        view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                                    }
+                                    Ok(todos) => {
+                                        if todos.is_empty() {
+                                            view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
+                                        } else {
+                                            todos
+                                                .into_iter()
+                                                .map(move |todo| {
+                                                    view! {
+                                                        cx,
+                                                        <li>
+                                                            {todo.title}
+                                                            ": Created at "
+                                                            {todo.created_at}
+                                                            " by "
+                                                            {
+                                                                todo.user.unwrap_or_default().username
+                                                            }
+                                                            <ActionForm action=delete_todo>
+                                                                <input type="hidden" name="id" value={todo.id}/>
+                                                                <input type="submit" value="X"/>
+                                                            </ActionForm>
+                                                        </li>
+                                                    }
+                                                })
+                                                .collect_view(cx)
                                         }
-                                        Ok(todos) => {
-                                            if todos.is_empty() {
-                                                view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
-                                            } else {
-                                                todos
-                                                    .into_iter()
-                                                    .map(move |todo| {
-                                                        view! {
-                                                            cx,
-                                                            <li>
-                                                                {todo.title}
-                                                                ": Created at "
-                                                                {todo.created_at}
-                                                                " by "
-                                                                {
-                                                                    todo.user.unwrap_or_default().username
-                                                                }
-                                                                <ActionForm action=delete_todo>
-                                                                    <input type="hidden" name="id" value={todo.id}/>
-                                                                    <input type="submit" value="X"/>
-                                                                </ActionForm>
-                                                            </li>
-                                                        }
-                                                    })
-                                                    .collect_view(cx)
-                                            }
-                                        }
-                                    })
-                                    .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_view(cx)
-                        };
-
-                        view! {
-                            cx,
-                            <ul>
-                                {existing_todos}
-                                {pending_todos}
-                            </ul>
+                                    }
+                                })
+                                .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_view(cx)
+                    };
+
+                    view! {
+                        cx,
+                        <ul>
+                            {existing_todos}
+                            {pending_todos}
+                        </ul>
                     }
                 }
-                </ErrorBoundary>
+            }
             </Transition>
         </div>
     }

examples/slots/Cargo.toml

@@ -8,7 +8,7 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos" }
 console_log = "1"
 log = "0.4"
 console_error_panic_hook = "0.1.7"

examples/ssr_modes/Cargo.toml

@@ -13,10 +13,12 @@ console_error_panic_hook = "0.1"
 console_log = "1"
 cfg-if = "1"
 lazy_static = "1"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_actix = { path = "../../integrations/actix", optional = true }
-leptos_router = { path = "../../router", features = ["nightly"] }
+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"
 serde = { version = "1", features = ["derive"] }
 thiserror = "1"

examples/ssr_modes_axum/Cargo.toml

@@ -11,10 +11,12 @@ console_error_panic_hook = "0.1"
 console_log = "1"
 cfg-if = "1"
 lazy_static = "1"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos = { path = "../../leptos", default-features = false, features = [
+  "serde",
+] }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4"
 serde = { version = "1", features = ["derive"] }
 thiserror = "1"

examples/ssr_modes_axum/src/app.rs

@@ -87,27 +87,22 @@ fn Post(cx: Scope) -> impl IntoView {
         }
     });
 
-    // this view needs to take the `Scope` from the `<Suspense/>`, not
-    // from the parent component, so we take that as an argument and
-    // pass it in under the `<Suspense/>` so that it is correct
-    let post_view = move |cx| {
-        move || {
-            post.with(cx, |post| {
-                post.clone().map(|post| {
-                    view! { cx,
-                        // render content
-                        <h1>{&post.title}</h1>
-                        <p>{&post.content}</p>
+    let post_view = move || {
+        post.with(cx, |post| {
+            post.clone().map(|post| {
+                view! { cx,
+                    // render content
+                    <h1>{&post.title}</h1>
+                    <p>{&post.content}</p>
 
-                        // since we're using async rendering for this page,
-                        // this metadata should be included in the actual HTML <head>
-                        // when it's first served
-                        <Title text=post.title/>
-                        <Meta name="description" content=post.content/>
-                    }
-                })
+                    // since we're using async rendering for this page,
+                    // this metadata should be included in the actual HTML <head>
+                    // when it's first served
+                    <Title text=post.title/>
+                    <Meta name="description" content=post.content/>
+                }
             })
-        }
+        })
     };
 
     view! { cx,
@@ -126,7 +121,7 @@ fn Post(cx: Scope) -> impl IntoView {
                     </div>
                 }
             }>
-                {post_view(cx)}
+                {post_view}
             </ErrorBoundary>
         </Suspense>
     }

examples/tailwind/Cargo.toml

@@ -10,10 +10,12 @@ crate-type = ["cdylib", "rlib"]
 
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["nightly"] }
+leptos = { path = "../../leptos", default-features = false, features = [
+  "serde",
+] }
 leptos_actix = { path = "../../integrations/actix", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+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"

examples/tailwind/README.md

@@ -108,4 +108,4 @@ Many thanks to GreatGreg for putting together this guide. You can find the origi
 ## Playwright Testing
 
 - Run `cargo make setup` to install dependencies
-- Run `cargo leptos test` or `cargo leptos end-to-end` to run the test
+- Run `cargo leptos test` or `cargo leptos end-to-end` to run the tests

examples/tailwind_csr_trunk/Cargo.toml

@@ -4,9 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
-leptos_meta = { path = "../../meta", features = ["csr", "nightly"] }
-leptos_router = { path = "../../router", features = ["csr", "nightly"] }
+leptos = { version = "0.2", features = [
+  "serde",
+  "csr",
+] }
+leptos_meta = { version = "0.2", features = ["csr"] }
+leptos_router = { version = "0.2", features = ["csr"]  }
 log = "0.4"
 gloo-net = { version = "0.2", features = ["http"] }
 

examples/tailwind_csr_trunk/README.md

@@ -52,9 +52,8 @@ If you're using VS Code, add the following to your `settings.json`
 
 Install [Tailwind CSS Intellisense](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss).
 
-Install [VS Browser](https://marketplace.visualstudio.com/items?itemName=Phu1237.vs-browser) extension (allows you to open a browser at the right window.
-
-Allow vscode Ports forward: 3000, 3001.
+    Install "VS Browser" extension, a browser at the right window.
+    Allow vscode Ports forward: 3000, 3001.
 
 ## Notes about Tooling
 

examples/timer/Cargo.toml

@@ -8,7 +8,7 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos" }
 console_log = "1"
 log = "0.4"
 console_error_panic_hook = "0.1.7"

examples/todo_app_sqlite/Cargo.toml

@@ -16,10 +16,12 @@ console_error_panic_hook = "0.1.7"
 serde = { version = "1.0.152", features = ["derive"] }
 futures = "0.3.25"
 cfg-if = "1.0.0"
-leptos = { path = "../../leptos", features = ["nightly"] }
+leptos = { path = "../../leptos", default-features = false, features = [
+	"serde",
+] }
 leptos_actix = { path = "../../integrations/actix", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4.17"
 simple_logger = "4.0.0"
 gloo = { git = "https://github.com/rustwasm/gloo" }
@@ -30,6 +32,7 @@ sqlx = { version = "0.6.2", features = [
 wasm-bindgen = "0.2"
 
 [features]
+default = ["ssr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
 	"dep:actix-files",

examples/todo_app_sqlite/src/todo.rs

@@ -9,7 +9,7 @@ cfg_if! {
         use sqlx::{Connection, SqliteConnection};
 
         pub async fn db() -> Result<SqliteConnection, ServerFnError> {
-            Ok(SqliteConnection::connect("sqlite:Todos.db").await?)
+            SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))
         }
 
         #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, sqlx::FromRow)]
@@ -43,7 +43,11 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     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? {
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         todos.push(row);
     }
 
@@ -72,11 +76,12 @@ pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
 pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
     let mut conn = db().await?;
 
-    Ok(sqlx::query("DELETE FROM todos WHERE id = $1")
+    sqlx::query("DELETE FROM todos WHERE id = $1")
         .bind(id)
         .execute(&mut conn)
         .await
-        .map(|_| ())?)
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
 }
 
 #[component]

examples/todo_app_sqlite_axum/Cargo.toml

@@ -11,10 +11,12 @@ console_log = "1.0.0"
 console_error_panic_hook = "0.1.7"
 futures = "0.3.25"
 cfg-if = "1.0.0"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+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", features = ["derive"] }
@@ -31,6 +33,8 @@ thiserror = "1.0.38"
 wasm-bindgen = "0.2"
 
 [features]
+default = ["csr"]
+csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
 	"dep:axum",

examples/todo_app_sqlite_axum/src/todo.rs

@@ -11,7 +11,7 @@ cfg_if! {
         // use http::{header::SET_COOKIE, HeaderMap, HeaderValue, StatusCode};
 
         pub async fn db() -> Result<SqliteConnection, ServerFnError> {
-            Ok(SqliteConnection::connect("sqlite:Todos.db").await?)
+            SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))
         }
 
         #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, sqlx::FromRow)]
@@ -47,7 +47,11 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     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? {
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         todos.push(row);
     }
 
@@ -89,11 +93,12 @@ pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
 pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
     let mut conn = db().await?;
 
-    Ok(sqlx::query("DELETE FROM todos WHERE id = $1")
+    sqlx::query("DELETE FROM todos WHERE id = $1")
         .bind(id)
         .execute(&mut conn)
         .await
-        .map(|_| ())?)
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
 }
 
 #[component]
@@ -110,7 +115,9 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
             </header>
             <main>
                 <Routes>
-                    <Route path="" view=|cx| view! { cx, <Todos/> }/>
+                    <Route path="" view=|cx| view! { cx,
+                        <Todos/>
+                    }/>
                 </Routes>
             </main>
         </Router>

examples/todo_app_sqlite_viz/Cargo.toml

@@ -11,11 +11,13 @@ console_log = "1.0.0"
 console_error_panic_hook = "0.1.7"
 futures = "0.3.25"
 cfg-if = "1.0.0"
-leptos = { path = "../../leptos" }
-leptos_viz = { path = "../../integrations/viz", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
-leptos_reactive = { path = "../../leptos_reactive", features = ["nightly"] }
+leptos = { path = "../../leptos", default-features = false, features = [
+  "serde",
+] }
+leptos_viz = { path = "../../integrations/viz", default-features = false, optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
+leptos_reactive = { path = "../../leptos_reactive", default-features = false }
 log = "0.4.17"
 simple_logger = "4.0.0"
 serde = { version = "1", features = ["derive"] }
@@ -30,6 +32,7 @@ thiserror = "1.0.38"
 wasm-bindgen = "0.2"
 
 [features]
+default = ["csr"]
 csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [