add CI

fix: prevent double-rebuild and correctly navigate multiple times to same lazy route (closes #4285)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -29,11 +29,15 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+**Next Steps**
+
+- [ ] I will make a PR
+- [ ] I would like to make a PR, but need help getting started
+- [ ] I want someone else to take the time to fix this
+- [ ] This is a low priority for me and is just shared for your information
+
 **Additional context**
 Add any other context about the problem here.

.github/dependabot.yml

@@ -3,11 +3,17 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
-  - package-ecosystem: "cargo"
-    directories:
-      - "/"
-      - "/examples/*"
-      - "/benchmarks"
+      interval: "weekly"
+  # Grouping all dependencies in one PR weekly
+  - package-ecosystem: cargo
+    directory: "/"
     schedule:
-      interval: "daily"
+      interval: weekly
+      day: monday
+    open-pull-requests-limit: 1
+    allow:
+      - dependency-type: "all"
+    groups:
+      rust-dependencies:
+        patterns:
+          - "*"

.github/workflows/autofix.yml

@@ -0,0 +1,39 @@
+name: autofix.ci
+on:
+  pull_request:
+  # Running this workflow on main branch pushes requires write permission to apply changes.
+  # Leave it alone for future uses.
+  # push:
+  #   branches: ["main"]
+permissions:
+  contents: read
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+env:
+  CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: 1
+  DEBIAN_FRONTEND: noninteractive
+jobs:
+  autofix:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with: {toolchain: "nightly-2025-07-16", components: "rustfmt, clippy", target: "wasm32-unknown-unknown", rustflags: ""}
+      - name: Install Glib
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libglib2.0-dev
+      - name: Install cargo-all-features
+        run: cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+      - name: Install jq
+        run: sudo apt-get install jq
+      - name: Format the workspace
+        run: cargo fmt --all
+      - name: Clippy the workspace
+        run: cargo all-features clippy --allow-dirty --fix --lib --no-deps
+      - uses: autofix-ci/action@v1.3.2
+        if: ${{ always() }}
+        with:
+          fail-fast: false

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

@@ -1,30 +0,0 @@
-name: CI Changed Examples
-on:
-  push:
-    branches:
-      - main
-      - leptos_0.6
-  pull_request:
-    branches:
-      - main
-      - leptos_0.6
-jobs:
-  get-example-changed:
-    uses: ./.github/workflows/get-example-changed.yml
-  get-matrix:
-    needs: [get-example-changed]
-    uses: ./.github/workflows/get-changed-examples-matrix.yml
-    with:
-      example_changed: ${{ fromJSON(needs.get-example-changed.outputs.example_changed) }}
-  test:
-    name: CI
-    needs: [get-example-changed, get-matrix]
-    if: needs.get-example-changed.outputs.example_changed == 'true'
-    strategy:
-      matrix: ${{ fromJSON(needs.get-matrix.outputs.matrix) }}
-      fail-fast: false
-    uses: ./.github/workflows/run-cargo-make-task.yml
-    with:
-      directory: ${{ matrix.directory }}
-      cargo_make_task: "ci"
-      toolchain: stable

.github/workflows/ci-examples.yml

@@ -1,27 +0,0 @@
-name: CI Examples
-on:
-  push:
-    branches:
-      - main
-      - leptos_0.6
-  pull_request:
-    branches:
-      - main
-      - leptos_0.6
-jobs:
-  get-leptos-changed:
-    uses: ./.github/workflows/get-leptos-changed.yml
-  get-examples-matrix:
-    uses: ./.github/workflows/get-examples-matrix.yml
-  test:
-    name: CI
-    needs: [get-leptos-changed, get-examples-matrix]
-    if: needs.get-leptos-changed.outputs.leptos_changed == 'true'
-    strategy:
-      matrix: ${{ fromJSON(needs.get-examples-matrix.outputs.matrix) }}
-      fail-fast: false
-    uses: ./.github/workflows/run-cargo-make-task.yml
-    with:
-      directory: ${{ matrix.directory }}
-      cargo_make_task: "ci"
-      toolchain: stable

.github/workflows/ci-semver.yml

@@ -1,25 +0,0 @@
-name: CI semver
-on:
-  push:
-    branches:
-      - main
-      - leptos_0.6
-  pull_request:
-    branches:
-      - main
-      - leptos_0.6
-jobs:
-  get-leptos-changed:
-    uses: ./.github/workflows/get-leptos-changed.yml
-  test:
-    needs: [get-leptos-changed]
-    if: github.event.pull_request.labels[0].name == 'semver' # needs.get-leptos-changed.outputs.leptos_changed == 'true' && github.event.pull_request.labels[0].name != 'breaking'
-    name: Run semver check (nightly-2024-08-01)
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Semver Checks
-        uses: obi1kenobi/cargo-semver-checks-action@v2
-        with:
-          rust-toolchain: nightly-2024-08-01

.github/workflows/ci.yml

@@ -4,17 +4,26 @@ on:
     branches:
       - main
       - leptos_0.6
+      - leptos_0.8
   pull_request:
     branches:
       - main
       - leptos_0.6
+      - leptos_0.8
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   get-leptos-changed:
     uses: ./.github/workflows/get-leptos-changed.yml
   get-leptos-matrix:
     uses: ./.github/workflows/get-leptos-matrix.yml
-  test:
-    name: CI
+  get-example-changed:
+    uses: ./.github/workflows/get-example-changed.yml
+  get-examples-matrix:
+    uses: ./.github/workflows/get-examples-matrix.yml
+  test-members:
+    name: CI (members)
     needs: [get-leptos-changed, get-leptos-matrix]
     if: needs.get-leptos-changed.outputs.leptos_changed == 'true'
     strategy:
@@ -23,5 +32,37 @@ jobs:
     uses: ./.github/workflows/run-cargo-make-task.yml
     with:
       directory: ${{ matrix.directory }}
-      cargo_make_task: "ci"
-      toolchain: nightly-2024-08-01
+  test-examples:
+    name: CI (examples)
+    needs: [test-members, get-examples-matrix]
+    if: ${{ success() }}
+    strategy:
+      matrix: ${{ fromJSON(needs.get-examples-matrix.outputs.matrix) }}
+      fail-fast: false
+    uses: ./.github/workflows/run-cargo-make-task.yml
+    with:
+      directory: ${{ matrix.directory }}
+  test-only-examples:
+    name: CI (examples)
+    needs: [get-leptos-changed, get-example-changed]
+    if: needs.get-leptos-changed.outputs.leptos_changed != 'true' && needs.get-example-changed.outputs.example_changed == 'true'
+    strategy:
+      matrix: ${{ fromJSON(needs.get-example-changed.outputs.matrix) }}
+      fail-fast: false
+    uses: ./.github/workflows/run-cargo-make-task.yml
+    with:
+      directory: ${{ matrix.directory }}
+  semver-check:
+    name: SemVer check (stable)
+    needs: [get-leptos-changed, test-members, test-examples]
+    if: ${{ success() && needs.get-leptos-changed.outputs.leptos_changed == 'true' && !contains(github.event.pull_request.labels.*.name, 'breaking') }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Glib
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libglib2.0-dev
+      - name: Checkout
+        uses: actions/checkout@v5
+      - name: Semver Checks
+        uses: obi1kenobi/cargo-semver-checks-action@v2

.github/workflows/get-changed-examples-matrix.yml

@@ -1,54 +0,0 @@
-name: Changed Examples Matrix Call
-
-on:
-  workflow_call:
-    inputs:
-      example_changed:
-        description: "Example Changed"
-        required: true
-        type: boolean
-    outputs:
-      matrix:
-        description: "Matrix"
-        value: ${{ jobs.get-example-changed.outputs.matrix }}
-
-jobs:
-  get-example-changed:
-    name: Get Changed Example Matrix
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Get example project directories that changed
-        id: changed-dirs
-        uses: tj-actions/changed-files@v45
-        with:
-          dir_names: true
-          dir_names_max_depth: "2"
-          files: |
-            examples/**
-            !examples/cargo-make/**
-            !examples/gtk/**
-            !examples/Makefile.toml
-            !examples/*.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 [ ${{ inputs.example_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\":[\"NO_CHANGE\"]}" >> "$GITHUB_OUTPUT"
-          fi

.github/workflows/get-example-changed.yml

@@ -5,20 +5,26 @@ on:
       example_changed:
         description: "Example Changed"
         value: ${{ jobs.get-example-changed.outputs.example_changed }}
+      # This is for test-only-examples workflow in ci.yml
+      matrix:
+        description: "Example Changed Directories"
+        value: ${{ jobs.get-example-changed.outputs.matrix }}
 jobs:
   get-example-changed:
     name: Get Example Changed
     runs-on: ubuntu-latest
     outputs:
       example_changed: ${{ steps.set-example-changed.outputs.example_changed }}
+      # This is for test-only-examples workflow in ci.yml
+      matrix: ${{ steps.set-example-changed.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Get example files that changed
         id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             examples/**
@@ -27,7 +33,11 @@ jobs:
             !examples/*.md
       - name: List example files that changed
         run: echo '${{ steps.changed-files.outputs.all_changed_files }}'
+      - name: Install jq
+        run: sudo apt-get install jq
       - name: Set example_changed
         id: set-example-changed
         run: |
           echo "example_changed=${{ steps.changed-files.outputs.any_changed }}" >> "$GITHUB_OUTPUT"
+          # This is for test-only-examples workflow in ci.yml
+          echo "matrix={\"directory\": $(echo '${{ steps.changed-files.outputs.all_changed_files }}' | tr ' ' '\n' | awk -F'/' '{print $1 "/" $2}'| sort -u | jq -R -s -c 'split("\n") | .[:-1]')}" >> "$GITHUB_OUTPUT"

.github/workflows/get-examples-matrix.yml

@@ -17,7 +17,7 @@ jobs:
       EXCLUDED_EXAMPLES: cargo-make
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install jq
         run: sudo apt-get install jq
       - name: Set Matrix

.github/workflows/get-leptos-changed.yml

@@ -13,12 +13,12 @@ jobs:
       leptos_changed: ${{ steps.set-source-changed.outputs.leptos_changed }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Get source files that changed
         id: changed-source
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files_ignore: |
             .*/**/*

.github/workflows/get-leptos-matrix.yml

@@ -13,7 +13,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install jq
         run: sudo apt-get install jq
       - name: Set Matrix

.github/workflows/publish-book.yml

@@ -12,7 +12,7 @@ jobs:
       contents: write # To push a branch
       pull-requests: write # To create a PR from that branch
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Install mdbook

.github/workflows/run-cargo-make-task.yml

@@ -5,60 +5,106 @@ on:
       directory:
         required: true
         type: string
-      cargo_make_task:
-        required: true
-        type: string
-      toolchain:
-        required: true
-        type: string
 env:
   CARGO_TERM_COLOR: always
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
+  DEBIAN_FRONTEND: noninteractive
+  RUSTFLAGS: ${{ inputs.erased_mode && '--cfg erase_components' || '' }}
+  LEPTOS_TAILWIND_VERSION: v4.0.14
+  LEPTOS_SASS_VERSION: 1.86.0
 jobs:
   test:
-    name: Run ${{ inputs.cargo_make_task }} (${{ inputs.toolchain }})
+    name: "Run (${{ matrix.toolchain }}) (erased_mode: ${{ matrix.erased_mode && 'enabled' || 'disabled' }})"
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        toolchain: [stable, nightly-2025-07-16]
+        erased_mode: [true, false]
     steps:
+      - name: Free Disk Space
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/local/.ghcup
+          sudo rm -rf /opt/hostedtoolcache/CodeQL
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf /usr/local/lib/node_modules
+
+          # following lines currenly not needed as it takes too much time
+          # the new isolated CI doesn't need much space to test libraries
+          #
+          # uncommet only if nneded
+          #
+          # sudo apt-get clean
+          # sudo apt-get purge -y '^ghc-.*' '^dotnet-.*' '^llvm-.*' '^mono-.*' '^php.*' '^ruby.*'
+          # sudo apt-get autoremove -y
+          # sudo apt-get clean
+          # sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          # docker system prune -af
+          # docker image prune -af
+          # docker volume prune -f
+          echo "Disk space after cleanup:"
+          df -h
       # Setup environment
-      - uses: actions/checkout@v4
+      - name: Install Glib
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libglib2.0-dev
+      - uses: actions/checkout@v5
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ inputs.toolchain }}
-      - 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
+          toolchain: ${{ matrix.toolchain }}
+          targets: wasm32-unknown-unknown
+          components: clippy,rustfmt
       - name: Install binstall
         uses: cargo-bins/cargo-binstall@main
       - name: Install wasm-bindgen
         run: cargo binstall wasm-bindgen-cli --no-confirm
       - name: Install cargo-leptos
-        run: cargo binstall cargo-leptos --no-confirm
+        run: cargo binstall cargo-leptos --locked --no-confirm
+      - name: Install cargo-make
+        run: cargo binstall cargo-make --no-confirm
+      - name: Install nextest
+        run: cargo binstall cargo-nextest --no-confirm
+      - name: Install cargo-all-features
+        run: cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+      # Part of direct-minimal-versions check
+      - name: Install cargo-hack
+        if: contains(matrix.toolchain, 'nightly')
+        uses: taiki-e/install-action@cargo-hack
+      # Part of direct-minimal-versions check
+      - name: Install cargo-minimal-versions
+        if: contains(matrix.toolchain, 'nightly')
+        uses: taiki-e/install-action@cargo-minimal-versions
       - name: Install Trunk
-        uses: jetli/trunk-action@v0.5.0
-        with:
-          version: "latest"
+        if: contains(inputs.directory, 'examples')
+        run: cargo binstall trunk --no-confirm
       - name: Print Trunk Version
+        if: contains(inputs.directory, 'examples')
         run: trunk --version
       - name: Install Node.js
+        if: contains(inputs.directory, 'examples')
         uses: actions/setup-node@v4
         with:
           node-version: 20
       - uses: pnpm/action-setup@v4
         name: Install pnpm
+        if: contains(inputs.directory, 'examples')
         id: pnpm-install
         with:
           version: 8
           run_install: false
       - name: Get pnpm store directory
+        if: contains(inputs.directory, 'examples')
         id: pnpm-cache
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
       - uses: actions/cache@v4
+        if: contains(inputs.directory, 'examples')
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
@@ -66,8 +112,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
       - name: Maybe install chromedriver
+        if: contains(inputs.directory, 'examples')
         run: |
-          project_makefile=${{inputs.directory}}/Makefile.toml
+          project_makefile='${{inputs.directory}}/Makefile.toml'
           webdriver_count=$(cat $project_makefile | grep "cargo-make/webdriver.toml" | wc -l)
           if [ $webdriver_count -eq 1 ]; then
               if ! command -v chromedriver &>/dev/null; then
@@ -81,8 +128,9 @@ jobs:
               echo chromedriver is not required
           fi
       - name: Maybe install playwright browser dependencies
+        if: contains(inputs.directory, 'examples')
         run: |
-          for pw_path in $(find ${{inputs.directory}} -name playwright.config.ts)
+          for pw_path in $(find '${{inputs.directory}}' -name playwright.config.ts)
           do
             pw_dir=$(dirname $pw_path)
             if [ ! -v $pw_dir ]; then
@@ -94,17 +142,47 @@ jobs:
             fi
           done
       - name: Install Deno
-        uses: denoland/setup-deno@v1
+        if: contains(inputs.directory, 'examples')
+        uses: denoland/setup-deno@v2
         with:
           deno-version: v1.x
       - name: Maybe install gtk-rs dependencies
+        if: contains(inputs.directory, 'gtk')
         run: |
-          if [ ! -z $(echo ${{inputs.directory}} | grep gtk) ]; then
-            sudo apt-get update
-            sudo apt-get install -y libglib2.0-dev libgio2.0-cil-dev libgraphene-1.0-dev libcairo2-dev libpango1.0-dev libgtk-4-dev
-          fi
+          sudo apt-get install -y libglib2.0-dev libgio2.0-cil-dev libgraphene-1.0-dev libcairo2-dev libpango1.0-dev libgtk-4-dev
+      - name: Install Tailwind and Sass dependencies
+        if: contains(inputs.directory, 'examples')
+        run: |
+          cd '${{ inputs.directory }}'
+          tailwindcss_version=$(echo "$LEPTOS_TAILWIND_VERSION" | sed 's/^v//')
+          sass_version="$LEPTOS_SASS_VERSION"
+          pnpm add "tailwindcss@$tailwindcss_version" "@tailwindcss/cli@$tailwindcss_version" "sass@$sass_version"
+
+          echo "Tailwind CSS version:"
+          ./node_modules/.bin/tailwindcss --version
+
+          echo "Sass version:"
+          ./node_modules/.bin/sass --version
       # Run Cargo Make Task
       - name: ${{ inputs.cargo_make_task }}
         run: |
-          cd ${{ inputs.directory }}
-          cargo make --profile=github-actions ${{ inputs.cargo_make_task }}
+          cd '${{ inputs.directory }}'
+          cargo make --no-workspace --profile=github-actions ci
+          # check the direct-minimal-versions on release
+          COMMIT_MSG=$(git log -1 --pretty=format:'%s')
+          # Supports: v1.2.3, v1.2.3-alpha, v1.2.3-beta1, v1.2.3-rc.1, etc.
+          if [[ "$COMMIT_MSG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+(\.?[0-9]+)?)?$ ]]; then
+            cargo make --no-workspace --profile=github-actions check-minimal-versions
+          fi
+      # Check if the counter_isomorphic can be built with leptos_debuginfo cfg flag in release mode
+      - name: ${{ inputs.cargo_make_task }} with --cfg=leptos_debuginfo
+        if: contains(inputs.directory, 'counter_isomorphic')
+        run: |
+          cd '${{ inputs.directory }}'
+          RUSTFLAGS="$RUSTFLAGS --cfg leptos_debuginfo" cargo leptos build --release
+      - name: Clean up ${{ inputs.directory }}
+        if: always()
+        run: |
+          cd '${{ inputs.directory }}'
+          cargo clean || true
+          rm -rf node_modules || true

.gitignore

@@ -3,7 +3,9 @@ dist
 pkg
 comparisons
 blob.rs
-Cargo.lock
+**/projects/**/Cargo.lock
+**/examples/**/Cargo.lock
+**/benchmarks/**/Cargo.lock
 **/*.rs.bk
 .DS_Store
 .idea
@@ -11,4 +13,5 @@ Cargo.lock
 .envrc
 
 .vscode
-vendor
+vendor
+hash.txt

Cargo.toml

@@ -40,36 +40,139 @@ members = [
 exclude = ["benchmarks", "examples", "projects"]
 
 [workspace.package]
-version = "0.7.0-beta6"
 edition = "2021"
-rust-version = "1.76"
+rust-version = "1.88"
 
 [workspace.dependencies]
-throw_error = { path = "./any_error/", version = "0.2.0-beta6" }
-any_spawner = { path = "./any_spawner/", version = "0.1.0" }
-const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1.0" }
-either_of = { path = "./either_of/", version = "0.1.0" }
-hydration_context = { path = "./hydration_context", version = "0.2.0-beta6" }
-leptos = { path = "./leptos", version = "0.7.0-beta6" }
-leptos_config = { path = "./leptos_config", version = "0.7.0-beta6" }
-leptos_dom = { path = "./leptos_dom", version = "0.7.0-beta6" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-beta6" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-beta6" }
-leptos_macro = { path = "./leptos_macro", version = "0.7.0-beta6" }
-leptos_router = { path = "./router", version = "0.7.0-beta6" }
-leptos_router_macro = { path = "./router_macro", version = "0.7.0-beta6" }
-leptos_server = { path = "./leptos_server", version = "0.7.0-beta6" }
-leptos_meta = { path = "./meta", version = "0.7.0-beta6" }
-next_tuple = { path = "./next_tuple", version = "0.1.0-beta6" }
-oco_ref = { path = "./oco", version = "0.2.0" }
+# members
+throw_error = { path = "./any_error/", version = "0.3.0" }
+any_spawner = { path = "./any_spawner/", version = "0.3.0" }
+const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1" }
+either_of = { path = "./either_of/", version = "0.1.6" }
+hydration_context = { path = "./hydration_context", version = "0.3.0" }
+leptos = { path = "./leptos", version = "0.8.9" }
+leptos_config = { path = "./leptos_config", version = "0.8.7" }
+leptos_dom = { path = "./leptos_dom", version = "0.8.6" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.5" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.8.5" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.8" }
+leptos_router = { path = "./router", version = "0.8.7" }
+leptos_router_macro = { path = "./router_macro", version = "0.8.5" }
+leptos_server = { path = "./leptos_server", version = "0.8.5" }
+leptos_meta = { path = "./meta", version = "0.8.5" }
+next_tuple = { path = "./next_tuple", version = "0.1.0" }
+oco_ref = { path = "./oco", version = "0.2.1" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.1.0-beta6" }
-reactive_stores = { path = "./reactive_stores", version = "0.1.0-beta6" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-beta6" }
-server_fn = { path = "./server_fn", version = "0.7.0-beta6" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-beta6" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-beta6" }
-tachys = { path = "./tachys", version = "0.1.0-beta6" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.7" }
+reactive_stores = { path = "./reactive_stores", version = "0.2.5" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.6" }
+server_fn = { path = "./server_fn", version = "0.8.7" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.8.7" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.5" }
+tachys = { path = "./tachys", version = "0.2.8" }
+wasm_split_helpers = { path = "./wasm_split", version = "0.1.2" }
+wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.3" }
+
+# members deps
+async-once-cell = { default-features = false, version = "0.5.3" }
+itertools = { default-features = false, version = "0.14.0" }
+convert_case = { default-features = false, version = "0.8.0" }
+serde_json = { default-features = false, version = "1.0.143" }
+trybuild = { default-features = false, version = "1.0.110" }
+typed-builder = { default-features = false, version = "0.21.2" }
+thiserror = { default-features = false, version = "2.0.16" }
+wasm-bindgen = { default-features = false, version = "0.2.100" }
+indexmap = { default-features = false, version = "2.11.0" }
+rstml = { default-features = false, version = "0.12.1" }
+rustc_version = { default-features = false, version = "0.4.1" }
+guardian = { default-features = false, version = "1.3.0" }
+rustc-hash = { default-features = false, version = "2.1.1" }
+actix-web = { default-features = false, version = "4.11.0" }
+tracing = { default-features = false, version = "0.1.41" }
+slotmap = { default-features = false, version = "1.0.7" }
+futures = { default-features = false, version = "0.3.31" }
+dashmap = { default-features = false, version = "6.1.0" }
+pin-project-lite = { default-features = false, version = "0.2.16" }
+send_wrapper = { default-features = false, version = "0.6.0" }
+tokio-test = { default-features = false, version = "0.4.4" }
+html-escape = { default-features = false, version = "0.2.13" }
+proc-macro-error2 = { default-features = false, version = "2.0.1" }
+const_format = { default-features = false, version = "0.2.34" }
+gloo-net = { default-features = false, version = "0.6.0" }
+url = { default-features = false, version = "2.5.4" }
+tokio = { default-features = false, version = "1.47.1" }
+base64 = { default-features = false, version = "0.22.1" }
+cfg-if = { default-features = false, version = "1.0.3" }
+wasm-bindgen-futures = { default-features = false, version = "0.4.50" }
+tower = { default-features = false, version = "0.5.2" }
+proc-macro2 = { default-features = false, version = "1.0.101" }
+serde = { default-features = false, version = "1.0.219" }
+parking_lot = { default-features = false, version = "0.12.4" }
+axum = { default-features = false, version = "0.8.4" }
+serde_qs = { default-features = false, version = "0.15.0" }
+syn = { default-features = false, version = "2.0.106" }
+xxhash-rust = { default-features = false, version = "0.8.15" }
+paste = { default-features = false, version = "1.0.15" }
+quote = { default-features = false, version = "1.0.40" }
+web-sys = { default-features = false, version = "0.3.77" }
+js-sys = { default-features = false, version = "0.3.77" }
+rand = { default-features = false, version = "0.9.1" }
+serde-lite = { default-features = false, version = "0.5.0" }
+tokio-tungstenite = { default-features = false, version = "0.27.0" }
+serial_test = { default-features = false, version = "3.2.0" }
+erased = { default-features = false, version = "0.1.2" }
+glib = { default-features = false, version = "0.20.12" }
+async-trait = { default-features = false, version = "0.1.89" }
+typed-builder-macro = { default-features = false, version = "0.21.0" }
+linear-map = { default-features = false, version = "1.2.0" }
+anyhow = { default-features = false, version = "1.0.99" }
+walkdir = { default-features = false, version = "2.5.0" }
+actix-ws = { default-features = false, version = "0.3.0" }
+tower-http = { default-features = false, version = "0.6.4" }
+prettyplease = { default-features = false, version = "0.2.37" }
+inventory = { default-features = false, version = "0.3.21" }
+config = { default-features = false, version = "0.15.14" }
+camino = { default-features = false, version = "1.1.11" }
+ciborium = { default-features = false, version = "0.2.2" }
+multer = { default-features = false, version = "3.1.0" }
+leptos-spin-macro = { default-features = false, version = "0.2.0" }
+sledgehammer_utils = { default-features = false, version = "0.3.1" }
+sledgehammer_bindgen = { default-features = false, version = "0.6.0" }
+wasm-streams = { default-features = false, version = "0.4.2" }
+rkyv = { default-features = false, version = "0.8.11" }
+temp-env = { default-features = false, version = "0.3.6" }
+uuid = { default-features = false, version = "1.18.0" }
+bytes = { default-features = false, version = "1.10.1" }
+http = { default-features = false, version = "1.3.1" }
+regex = { default-features = false, version = "1.11.2" }
+drain_filter_polyfill = { default-features = false, version = "0.1.3" }
+tempfile = { default-features = false, version = "3.21.0" }
+futures-lite = { default-features = false, version = "2.6.1" }
+log = { default-features = false, version = "0.4.27" }
+percent-encoding = { default-features = false, version = "2.3.2" }
+async-executor = { default-features = false, version = "1.13.2" }
+const-str = { default-features = false, version = "0.6.4" }
+http-body-util = { default-features = false, version = "0.1.3" }
+hyper = { default-features = false, version = "1.7.0" }
+postcard = { default-features = false, version = "1.1.3" }
+rmp-serde = { default-features = false, version = "1.3.0" }
+reqwest = { default-features = false, version = "0.12.23" }
+tower-layer = { default-features = false, version = "0.3.3" }
+attribute-derive = { default-features = false, version = "0.10.3" }
+insta = { default-features = false, version = "1.43.1" }
+codee = { default-features = false, version = "0.3.0" }
+actix-http = { default-features = false, version = "3.11.1" }
+wasm-bindgen-test = { default-features = false, version = "0.3.50" }
+rustversion = { default-features = false, version = "1.0.22" }
+getrandom = { default-features = false, version = "0.3.3" }
+actix-files = { default-features = false, version = "0.6.6" }
+async-lock = { default-features = false, version = "3.4.1" }
+base16 = { default-features = false, version = "0.2.1" }
+digest = { default-features = false, version = "0.10.7" }
+sha2 = { default-features = false, version = "0.10.8" }
+subsecond = { default-features = false, git = "https://github.com/dioxuslabs/dioxus" }
+dioxus-cli-config = { default-features = false, git = "https://github.com/dioxuslabs/dioxus" }
+dioxus-devtools = { default-features = false, git = "https://github.com/dioxuslabs/dioxus" }
 
 [profile.release]
 codegen-units = 1
@@ -78,3 +181,10 @@ opt-level = 'z'
 
 [workspace.metadata.cargo-all-features]
 skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
+max_combination_size = 2
+
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+  'cfg(leptos_debuginfo)',
+  'cfg(erase_components)',
+] }

Makefile.toml

@@ -10,8 +10,8 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 workspace = false
 clear = true
 dependencies = [
-	{ name = "check", path = "examples/counter_without_macros" },
-	{ name = "check", path = "examples/counters_stable" },
+  { name = "lint", path = "examples/counter_without_macros" },
+  { name = "lint", path = "examples/counters_stable" },
 ]
 
 [tasks.ci-examples]

README.md

@@ -5,6 +5,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/leptos.svg)](https://crates.io/crates/leptos)
 [![docs.rs](https://docs.rs/leptos/badge.svg)](https://docs.rs/leptos)
+![Crates.io MSRV](https://img.shields.io/crates/msrv/leptos)
 [![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)
 
@@ -12,8 +13,6 @@
 
 You can find a list of useful libraries and example projects at [`awesome-leptos`](https://github.com/leptos-rs/awesome-leptos).
 
-# The `main` branch is currently undergoing major changes in preparation for the [0.7](https://github.com/leptos-rs/leptos/milestone/4) release. For a stable version, please use the [v0.6.13 tag](https://github.com/leptos-rs/leptos/tree/v0.6.13)
-
 # Leptos
 
 ```rust
@@ -22,7 +21,7 @@ use leptos::*;
 #[component]
 pub fn SimpleCounter(initial_value: i32) -> impl IntoView {
     // create a reactive signal with the initial value
-    let (value, set_value) = create_signal(initial_value);
+    let (value, set_value) = signal(initial_value);
 
     // create event handlers for our buttons
     // note that `value` and `set_value` are `Copy`, so it's super easy to move them into closures
@@ -47,7 +46,7 @@ pub fn SimpleCounter(initial_value: i32) -> impl IntoView {
 pub fn SimpleCounterWithBuilder(initial_value: i32) -> impl IntoView {
     use leptos::html::*;
 
-    let (value, set_value) = create_signal(initial_value);
+    let (value, set_value) = signal(initial_value);
     let clear = move |_| set_value(0);
     let decrement = move |_| set_value.update(|value| *value -= 1);
     let increment = move |_| set_value.update(|value| *value += 1);
@@ -91,35 +90,13 @@ Here are some resources for learning more about Leptos:
 - [API Documentation](https://docs.rs/leptos/latest/leptos/)
 - [Common Bugs](https://github.com/leptos-rs/leptos/tree/main/docs/COMMON_BUGS.md) (and how to fix them!)
 
-## `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.
-
-To set `nightly` as a default toolchain for all projects (and add the ability to compile Rust to WebAssembly, if you haven’t already):
-
-```
-rustup toolchain install nightly
-rustup default nightly
-rustup target add wasm32-unknown-unknown
-```
-
-If you'd like to use `nightly` only in your Leptos project however, add [`rust-toolchain.toml`](https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file) file with the following content:
-
-```toml
-[toolchain]
-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.
-
 ## `cargo-leptos`
 
 [`cargo-leptos`](https://github.com/leptos-rs/cargo-leptos) is a build tool that's designed to make it easy to build apps that run on both the client and the server, with seamless integration. The best way to get started with a real Leptos project right now is to use `cargo-leptos` and our starter templates for [Actix](https://github.com/leptos-rs/start) or [Axum](https://github.com/leptos-rs/start-axum).
 
 ```bash
 cargo install cargo-leptos
-cargo leptos new --git https://github.com/leptos-rs/start
+cargo leptos new --git https://github.com/leptos-rs/start-axum
 cd [your project name]
 cargo leptos watch
 ```
@@ -148,7 +125,7 @@ Yes, I’m sure there are. You can see from the state of our issue tracker over
 
 This may be the big one: “production ready” implies a certain orientation to a library: that you can basically use it, without any special knowledge of its internals or ability to contribute. Everyone has this at some level in their stack: for example I (@gbj) don’t have the capacity or knowledge to contribute to something like `wasm-bindgen` at this point: I simply rely on it to work.
 
-There are several people in the community using Leptos right now for internal apps at work, who have also become significant contributors. I think this is the right level of production use for now. There may be missing features that you need, and you may end up building them! But for internal apps, if you’re willing to build and contribute missing pieces along the way, the framework is definitely usable right now.
+There are several people in the community using Leptos right now for many websites at work, who have also become significant contributors. There may be missing features that you need, and you may end up building them! But, if you're willing to contribute a few missing pieces along the way, the framework is most definitely usable for production applications, especially given the ecosystem of libraries that have sprung up around it.
 
 ### Can I use this for native GUI?
 
@@ -159,9 +136,7 @@ Sure! Obviously the `view` macro is for generating DOM nodes but you can use the
 - Use event listeners to update signals
 - Create effects to update the UI
 
-I've put together a [very simple GTK example](https://github.com/leptos-rs/leptos/blob/main/examples/gtk/src/main.rs) so you can see what I mean.
-
-The new rendering approach being developed for 0.7 supports “universal rendering,” i.e., it can use any rendering library that supports a small set of 6-8 functions. (This is intended as a layer over typical retained-mode, OOP-style GUI toolkits like the DOM, GTK, etc.) That future rendering work will allow creating native UI in a way that is much more similar to the declarative approach used by the web framework.
+The 0.7 update originally set out to create a "generic rendering" approach that would allow us to reuse most of the same view logic to do all of the above. Unfortunately, this has had to be shelved for now due to difficulties encountered by the Rust compiler when building larger-scale applications with the number of generics spread throughout the codebase that this required. It's an approach I'm looking forward to exploring again in the future; feel free to reach out if you're interested in this kind of work.
 
 ### How is this different from Yew?
 
@@ -171,14 +146,14 @@ Yew is the most-used library for Rust web UI development, but there are several
 - **Performance:** This has huge performance implications: Leptos is simply much faster at both creating and updating the UI than Yew is.
 - **Server integration:** Yew was created in an era in which browser-rendered single-page apps (SPAs) were the dominant paradigm. While Leptos supports client-side rendering, it also focuses on integrating with the server side of your application via server functions and multiple modes of serving HTML, including out-of-order streaming.
 
-- ### How is this different from Dioxus?
+### How is this different from Dioxus?
 
 Like Leptos, Dioxus is a framework for building UIs using web technologies. However, there are significant differences in approach and features.
 
 - **VDOM vs. fine-grained:** While Dioxus has a performant virtual DOM (VDOM), it still uses coarse-grained/component-scoped reactivity: changing a stateful value reruns the component function and diffs the old UI against the new one. Leptos components use a different mental model, creating (and returning) actual DOM nodes and setting up a reactive system to update those DOM nodes.
 - **Web vs. desktop priorities:** Dioxus uses Leptos server functions in its fullstack mode, but does not have the same `<Suspense>`-based support for things like streaming HTML rendering, or share the same focus on holistic web performance. Leptos tends to prioritize holistic web performance (streaming HTML rendering, smaller WASM binary sizes, etc.), whereas Dioxus has an unparalleled experience when building desktop apps, because your application logic runs as a native Rust binary.
 
-- ### How is this different from Sycamore?
+### How is this different from Sycamore?
 
 Sycamore and Leptos are both heavily influenced by SolidJS. At this point, Leptos has a larger community and ecosystem and is more actively developed. Other differences:
 

any_error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "throw_error"
-version = "0.2.0-beta6"
+version = "0.3.0"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -10,4 +10,4 @@ rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
-pin-project-lite = "0.2.14"
+pin-project-lite = { workspace = true, default-features = true }

any_error/src/lib.rs

@@ -9,7 +9,7 @@ use std::{
     error,
     fmt::{self, Display},
     future::Future,
-    mem, ops,
+    ops,
     pin::Pin,
     sync::Arc,
     task::{Context, Poll},
@@ -17,11 +17,6 @@ use std::{
 
 /* Wrapper Types */
 
-/// This is a result type into which any error can be converted.
-///
-/// Results are stored as [`Error`].
-pub type Result<T, E = Error> = core::result::Result<T, E>;
-
 /// A generic wrapper for any error.
 #[derive(Debug, Clone)]
 #[repr(transparent)]
@@ -109,7 +104,7 @@ pub fn get_error_hook() -> Option<Arc<dyn ErrorHook>> {
 /// Sets the current thread-local error hook, which will be invoked when [`throw`] is called.
 pub fn set_error_hook(hook: Arc<dyn ErrorHook>) -> ResetErrorHookOnDrop {
     ResetErrorHookOnDrop(
-        ERROR_HOOK.with_borrow_mut(|this| mem::replace(this, Some(hook))),
+        ERROR_HOOK.with_borrow_mut(|this| Option::replace(this, hook)),
     )
 }
 

any_spawner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "any_spawner"
-version = "0.1.1"
+version = "0.3.0"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -9,25 +9,39 @@ description = "Spawn asynchronous tasks in an executor-independent way."
 edition.workspace = true
 
 [dependencies]
-futures = "0.3.30"
-glib = { version = "0.20.0", optional = true }
-thiserror = "1.0"
-tokio = { version = "1.39", optional = true, default-features = false, features = [
+async-executor = { optional = true , workspace = true, default-features = true }
+futures = { workspace = true, default-features = true }
+glib = { optional = true , workspace = true, default-features = true }
+thiserror = { workspace = true , default-features = true }
+tokio = { optional = true, default-features = false, features = [
   "rt",
-] }
-tracing = { version = "0.1.40", optional = true }
-wasm-bindgen-futures = { version = "0.4.42", optional = true }
+] , workspace = true }
+tracing = { optional = true , workspace = true, default-features = true }
+wasm-bindgen-futures = { optional = true , workspace = true, default-features = true }
+
+[dev-dependencies]
+futures-lite = { default-features = false , workspace = true }
+tokio = { default-features = false, features = [
+  "rt",
+  "macros",
+  "time",
+] , workspace = true }
+wasm-bindgen-test = { workspace = true, default-features = true }
+serial_test = { workspace = true, default-features = true }
 
 [features]
+async-executor = ["dep:async-executor"]
 tracing = ["dep:tracing"]
 tokio = ["dep:tokio"]
 glib = ["dep:glib"]
 wasm-bindgen = ["dep:wasm-bindgen-futures"]
 futures-executor = ["futures/thread-pool", "futures/executor"]
 
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [package.metadata.cargo-all-features]
 denylist = ["tracing"]
+max_combination_size = 2

any_spawner/Makefile.toml

@@ -1 +1,4 @@
-extend = { path = "../cargo-make/main.toml" }
+extend = [
+  { path = "../cargo-make/main.toml" },
+  { path = "../cargo-make/wasm-test.toml" },
+]

any_spawner/src/lib.rs

@@ -11,18 +11,16 @@
 //! - no "join handle" or other result is returned from the spawn
 //! - the `Future` must output `()`
 //!
-//! ```rust
+//! ```no_run
 //! use any_spawner::Executor;
 //!
 //! // make sure an Executor has been initialized with one of the init_ functions
 //!
-//! # if false {
 //! // spawn a thread-safe Future
 //! Executor::spawn(async { /* ... */ });
 //!
 //! // spawn a Future that is !Send
 //! Executor::spawn_local(async { /* ... */ });
-//! # }
 //! ```
 
 #![forbid(unsafe_code)]
@@ -32,17 +30,72 @@
 use std::{future::Future, pin::Pin, sync::OnceLock};
 use thiserror::Error;
 
-pub(crate) type PinnedFuture<T> = Pin<Box<dyn Future<Output = T> + Send>>;
-pub(crate) type PinnedLocalFuture<T> = Pin<Box<dyn Future<Output = T>>>;
+/// A future that has been pinned.
+pub type PinnedFuture<T> = Pin<Box<dyn Future<Output = T> + Send>>;
+/// A future that has been pinned.
+pub type PinnedLocalFuture<T> = Pin<Box<dyn Future<Output = T>>>;
 
-static SPAWN: OnceLock<fn(PinnedFuture<()>)> = OnceLock::new();
-static SPAWN_LOCAL: OnceLock<fn(PinnedLocalFuture<()>)> = OnceLock::new();
+// Type alias for the spawn function pointer.
+type SpawnFn = fn(PinnedFuture<()>);
+// Type alias for the spawn_local function pointer.
+type SpawnLocalFn = fn(PinnedLocalFuture<()>);
+// Type alias for the poll_local function pointer.
+type PollLocalFn = fn();
+
+/// Holds the function pointers for the current global executor.
+#[derive(Clone, Copy)]
+struct ExecutorFns {
+    spawn: SpawnFn,
+    spawn_local: SpawnLocalFn,
+    poll_local: PollLocalFn,
+}
+
+// Use a single OnceLock to ensure atomic initialization of all functions.
+static EXECUTOR_FNS: OnceLock<ExecutorFns> = OnceLock::new();
+
+// No-op functions to use when an executor doesn't support a specific operation.
+#[cfg(any(feature = "tokio", feature = "wasm-bindgen", feature = "glib"))]
+#[cold]
+#[inline(never)]
+fn no_op_poll() {}
+
+#[cfg(all(not(feature = "wasm-bindgen"), not(debug_assertions)))]
+#[cold]
+#[inline(never)]
+fn no_op_spawn(_: PinnedFuture<()>) {
+    #[cfg(debug_assertions)]
+    eprintln!(
+        "Warning: Executor::spawn called, but no global 'spawn' function is \
+         configured (perhaps only spawn_local is supported, e.g., on wasm \
+         without threading?)."
+    );
+}
+
+// Wasm panics if you spawn without an executor
+#[cfg(feature = "wasm-bindgen")]
+#[cold]
+#[inline(never)]
+fn no_op_spawn(_: PinnedFuture<()>) {
+    panic!(
+        "Executor::spawn called, but no global 'spawn' function is configured."
+    );
+}
+
+#[cfg(not(debug_assertions))]
+#[cold]
+#[inline(never)]
+fn no_op_spawn_local(_: PinnedLocalFuture<()>) {
+    panic!(
+        "Executor::spawn_local called, but no global 'spawn_local' function \
+         is configured."
+    );
+}
 
 /// Errors that can occur when using the executor.
 #[derive(Error, Debug)]
 pub enum ExecutorError {
     /// The executor has already been set.
-    #[error("Executor has already been set.")]
+    #[error("Global executor has already been set.")]
     AlreadySet,
 }
 
@@ -51,155 +104,160 @@ pub struct Executor;
 
 impl Executor {
     /// Spawns a thread-safe [`Future`].
-    /// ```rust
-    /// use any_spawner::Executor;
-    /// # if false {
-    /// // spawn a thread-safe Future
-    /// Executor::spawn(async { /* ... */ });
-    /// # }
-    /// ```
+    ///
+    /// Uses the globally configured executor.
+    /// Panics if no global executor has been initialized.
+    #[inline(always)]
     #[track_caller]
     pub fn spawn(fut: impl Future<Output = ()> + Send + 'static) {
-        if let Some(spawner) = SPAWN.get() {
-            spawner(Box::pin(fut))
+        let pinned_fut = Box::pin(fut);
+
+        if let Some(fns) = EXECUTOR_FNS.get() {
+            (fns.spawn)(pinned_fut)
         } else {
-            #[cfg(all(debug_assertions, feature = "tracing"))]
-            tracing::error!(
-                "At {}, tried to spawn a Future with Executor::spawn() before \
-                 the Executor had been set.",
-                std::panic::Location::caller()
-            );
-            #[cfg(all(debug_assertions, not(feature = "tracing")))]
-            panic!(
-                "At {}, tried to spawn a Future with Executor::spawn() before \
-                 the Executor had been set.",
-                std::panic::Location::caller()
-            );
+            // No global executor set.
+            handle_uninitialized_spawn(pinned_fut);
         }
     }
 
     /// Spawns a [`Future`] that cannot be sent across threads.
-    /// ```rust
-    /// use any_spawner::Executor;
     ///
-    /// # if false {
-    /// // spawn a thread-safe Future
-    /// Executor::spawn_local(async { /* ... */ });
-    /// # }
-    /// ```
+    /// Uses the globally configured executor.
+    /// Panics if no global executor has been initialized.
+    #[inline(always)]
     #[track_caller]
     pub fn spawn_local(fut: impl Future<Output = ()> + 'static) {
-        if let Some(spawner) = SPAWN_LOCAL.get() {
-            spawner(Box::pin(fut))
+        let pinned_fut = Box::pin(fut);
+
+        if let Some(fns) = EXECUTOR_FNS.get() {
+            (fns.spawn_local)(pinned_fut)
         } else {
-            #[cfg(all(debug_assertions, feature = "tracing"))]
-            tracing::error!(
-                "At {}, tried to spawn a Future with Executor::spawn_local() \
-                 before the Executor had been set.",
-                std::panic::Location::caller()
-            );
-            #[cfg(all(debug_assertions, not(feature = "tracing")))]
-            panic!(
-                "At {}, tried to spawn a Future with Executor::spawn_local() \
-                 before the Executor had been set.",
-                std::panic::Location::caller()
-            );
+            // No global executor set.
+            handle_uninitialized_spawn_local(pinned_fut);
         }
     }
 
     /// Waits until the next "tick" of the current async executor.
+    /// Respects the global executor.
+    #[inline(always)]
     pub async fn tick() {
         let (tx, rx) = futures::channel::oneshot::channel();
+        #[cfg(not(all(feature = "wasm-bindgen", target_family = "wasm")))]
         Executor::spawn(async move {
             _ = tx.send(());
         });
+        #[cfg(all(feature = "wasm-bindgen", target_family = "wasm"))]
+        Executor::spawn_local(async move {
+            _ = tx.send(());
+        });
+
         _ = rx.await;
     }
+
+    /// Polls the global async executor.
+    ///
+    /// Uses the globally configured executor.
+    /// Does nothing if the global executor does not support polling.
+    #[inline(always)]
+    pub fn poll_local() {
+        if let Some(fns) = EXECUTOR_FNS.get() {
+            (fns.poll_local)()
+        }
+        // If not initialized or doesn't support polling, do nothing gracefully.
+    }
 }
 
 impl Executor {
     /// Globally sets the [`tokio`] runtime as the executor used to spawn tasks.
     ///
-    /// Returns `Err(_)` if an executor has already been set.
+    /// Returns `Err(_)` if a global executor has already been set.
     ///
     /// Requires the `tokio` feature to be activated on this crate.
     #[cfg(feature = "tokio")]
     #[cfg_attr(docsrs, doc(cfg(feature = "tokio")))]
     pub fn init_tokio() -> Result<(), ExecutorError> {
-        SPAWN
-            .set(|fut| {
+        let executor_impl = ExecutorFns {
+            spawn: |fut| {
                 tokio::spawn(fut);
-            })
-            .map_err(|_| ExecutorError::AlreadySet)?;
-        SPAWN_LOCAL
-            .set(|fut| {
+            },
+            spawn_local: |fut| {
                 tokio::task::spawn_local(fut);
-            })
-            .map_err(|_| ExecutorError::AlreadySet)?;
-        Ok(())
+            },
+            // Tokio doesn't have an explicit global poll function like LocalPool::run_until_stalled
+            poll_local: no_op_poll,
+        };
+        EXECUTOR_FNS
+            .set(executor_impl)
+            .map_err(|_| ExecutorError::AlreadySet)
     }
 
     /// Globally sets the [`wasm-bindgen-futures`] runtime as the executor used to spawn tasks.
     ///
-    /// Returns `Err(_)` if an executor has already been set.
+    /// Returns `Err(_)` if a global executor has already been set.
     ///
     /// Requires the `wasm-bindgen` feature to be activated on this crate.
     #[cfg(feature = "wasm-bindgen")]
     #[cfg_attr(docsrs, doc(cfg(feature = "wasm-bindgen")))]
     pub fn init_wasm_bindgen() -> Result<(), ExecutorError> {
-        SPAWN
-            .set(|fut| {
+        let executor_impl = ExecutorFns {
+            // wasm-bindgen-futures only supports spawn_local
+            spawn: no_op_spawn,
+            spawn_local: |fut| {
                 wasm_bindgen_futures::spawn_local(fut);
-            })
-            .map_err(|_| ExecutorError::AlreadySet)?;
-        SPAWN_LOCAL
-            .set(|fut| {
-                wasm_bindgen_futures::spawn_local(fut);
-            })
-            .map_err(|_| ExecutorError::AlreadySet)?;
-        Ok(())
+            },
+            poll_local: no_op_poll,
+        };
+        EXECUTOR_FNS
+            .set(executor_impl)
+            .map_err(|_| ExecutorError::AlreadySet)
     }
 
     /// Globally sets the [`glib`] runtime as the executor used to spawn tasks.
     ///
-    /// Returns `Err(_)` if an executor has already been set.
+    /// Returns `Err(_)` if a global executor has already been set.
     ///
     /// Requires the `glib` feature to be activated on this crate.
     #[cfg(feature = "glib")]
     #[cfg_attr(docsrs, doc(cfg(feature = "glib")))]
     pub fn init_glib() -> Result<(), ExecutorError> {
-        SPAWN
-            .set(|fut| {
+        let executor_impl = ExecutorFns {
+            spawn: |fut| {
                 let main_context = glib::MainContext::default();
                 main_context.spawn(fut);
-            })
-            .map_err(|_| ExecutorError::AlreadySet)?;
-        SPAWN_LOCAL
-            .set(|fut| {
+            },
+            spawn_local: |fut| {
                 let main_context = glib::MainContext::default();
                 main_context.spawn_local(fut);
-            })
-            .map_err(|_| ExecutorError::AlreadySet)?;
-        Ok(())
+            },
+            // Glib needs event loop integration, explicit polling isn't the standard model here.
+            poll_local: no_op_poll,
+        };
+        EXECUTOR_FNS
+            .set(executor_impl)
+            .map_err(|_| ExecutorError::AlreadySet)
     }
 
     /// Globally sets the [`futures`] executor as the executor used to spawn tasks,
     /// lazily creating a thread pool to spawn tasks into.
     ///
-    /// Returns `Err(_)` if an executor has already been set.
+    /// Returns `Err(_)` if a global executor has already been set.
     ///
     /// Requires the `futures-executor` feature to be activated on this crate.
     #[cfg(feature = "futures-executor")]
     #[cfg_attr(docsrs, doc(cfg(feature = "futures-executor")))]
     pub fn init_futures_executor() -> Result<(), ExecutorError> {
         use futures::{
-            executor::{LocalPool, ThreadPool},
+            executor::{LocalPool, LocalSpawner, ThreadPool},
             task::{LocalSpawnExt, SpawnExt},
         };
+        use std::cell::RefCell;
 
+        // Keep the lazy-init ThreadPool and thread-local LocalPool for spawn_local impl
         static THREAD_POOL: OnceLock<ThreadPool> = OnceLock::new();
         thread_local! {
-            static LOCAL_POOL: LocalPool = LocalPool::new();
+            static LOCAL_POOL: RefCell<LocalPool> = RefCell::new(LocalPool::new());
+            // SPAWNER is derived from LOCAL_POOL, keep it for efficiency inside the closure
+            static SPAWNER: LocalSpawner = LOCAL_POOL.with(|pool| pool.borrow().spawner());
         }
 
         fn get_thread_pool() -> &'static ThreadPool {
@@ -209,37 +267,248 @@ impl Executor {
             })
         }
 
-        SPAWN
-            .set(|fut| {
+        let executor_impl = ExecutorFns {
+            spawn: |fut| {
                 get_thread_pool()
                     .spawn(fut)
-                    .expect("failed to spawn future");
-            })
-            .map_err(|_| ExecutorError::AlreadySet)?;
-        SPAWN_LOCAL
-            .set(|fut| {
-                LOCAL_POOL.with(|pool| {
-                    let spawner = pool.spawner();
-                    spawner.spawn_local(fut).expect("failed to spawn future");
+                    .expect("failed to spawn future on ThreadPool");
+            },
+            spawn_local: |fut| {
+                // Use the thread_local SPAWNER derived from LOCAL_POOL
+                SPAWNER.with(|spawner| {
+                    spawner
+                        .spawn_local(fut)
+                        .expect("failed to spawn local future");
                 });
-            })
+            },
+            poll_local: || {
+                // Use the thread_local LOCAL_POOL
+                LOCAL_POOL.with(|pool| {
+                    // Use try_borrow_mut to prevent panic during re-entrant calls
+                    if let Ok(mut pool) = pool.try_borrow_mut() {
+                        pool.run_until_stalled();
+                    }
+                    // If already borrowed, we're likely in a nested poll, so do nothing.
+                });
+            },
+        };
+
+        EXECUTOR_FNS
+            .set(executor_impl)
+            .map_err(|_| ExecutorError::AlreadySet)
+    }
+
+    /// Globally sets the [`async_executor`] executor as the executor used to spawn tasks,
+    /// lazily creating a thread pool to spawn tasks into.
+    ///
+    /// Returns `Err(_)` if a global executor has already been set.
+    ///
+    /// Requires the `async-executor` feature to be activated on this crate.
+    #[cfg(feature = "async-executor")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "async-executor")))]
+    pub fn init_async_executor() -> Result<(), ExecutorError> {
+        use async_executor::{Executor as AsyncExecutor, LocalExecutor};
+
+        // Keep the lazy-init global Executor and thread-local LocalExecutor for spawn_local impl
+        static ASYNC_EXECUTOR: OnceLock<AsyncExecutor<'static>> =
+            OnceLock::new();
+        thread_local! {
+            static LOCAL_EXECUTOR_POOL: LocalExecutor<'static> = const { LocalExecutor::new() };
+        }
+
+        fn get_async_executor() -> &'static AsyncExecutor<'static> {
+            ASYNC_EXECUTOR.get_or_init(AsyncExecutor::new)
+        }
+
+        let executor_impl = ExecutorFns {
+            spawn: |fut| {
+                get_async_executor().spawn(fut).detach();
+            },
+            spawn_local: |fut| {
+                LOCAL_EXECUTOR_POOL.with(|pool| pool.spawn(fut).detach());
+            },
+            poll_local: || {
+                LOCAL_EXECUTOR_POOL.with(|pool| {
+                    // try_tick polls the local executor without blocking
+                    // This prevents issues if called recursively or from within a task.
+                    pool.try_tick();
+                });
+            },
+        };
+        EXECUTOR_FNS
+            .set(executor_impl)
+            .map_err(|_| ExecutorError::AlreadySet)
+    }
+
+    /// Globally sets a custom executor as the executor used to spawn tasks.
+    ///
+    /// Requires the custom executor to be `Send + Sync` as it will be stored statically.
+    ///
+    /// Returns `Err(_)` if a global executor has already been set.
+    pub fn init_custom_executor(
+        custom_executor: impl CustomExecutor + Send + Sync + 'static,
+    ) -> Result<(), ExecutorError> {
+        // Store the custom executor instance itself to call its methods.
+        // Use Box for dynamic dispatch.
+        static CUSTOM_EXECUTOR_INSTANCE: OnceLock<
+            Box<dyn CustomExecutor + Send + Sync>,
+        > = OnceLock::new();
+
+        CUSTOM_EXECUTOR_INSTANCE
+            .set(Box::new(custom_executor))
             .map_err(|_| ExecutorError::AlreadySet)?;
-        Ok(())
+
+        // Now set the ExecutorFns using the stored instance
+        let executor_impl = ExecutorFns {
+            spawn: |fut| {
+                // Unwrap is safe because we just set it successfully or returned Err.
+                CUSTOM_EXECUTOR_INSTANCE.get().unwrap().spawn(fut);
+            },
+            spawn_local: |fut| {
+                CUSTOM_EXECUTOR_INSTANCE.get().unwrap().spawn_local(fut);
+            },
+            poll_local: || {
+                CUSTOM_EXECUTOR_INSTANCE.get().unwrap().poll_local();
+            },
+        };
+
+        EXECUTOR_FNS
+            .set(executor_impl)
+            .map_err(|_| ExecutorError::AlreadySet)
+        // If setting EXECUTOR_FNS fails (extremely unlikely race if called *concurrently*
+        // with another init_* after CUSTOM_EXECUTOR_INSTANCE was set), we technically
+        // leave CUSTOM_EXECUTOR_INSTANCE set but EXECUTOR_FNS not. This is an edge case,
+        // but the primary race condition is solved.
+    }
+
+    /// Sets a custom executor *for the current thread only*.
+    ///
+    /// This overrides the global executor for calls to `spawn`, `spawn_local`, and `poll_local`
+    /// made *from the current thread*. It does not affect other threads or the global state.
+    ///
+    /// The provided `custom_executor` must implement [`CustomExecutor`] and `'static`, but does
+    /// **not** need to be `Send` or `Sync`.
+    ///
+    /// Returns `Err(ExecutorError::AlreadySet)` if a *local* executor has already been set
+    /// *for this thread*.
+    pub fn init_local_custom_executor(
+        custom_executor: impl CustomExecutor + 'static,
+    ) -> Result<(), ExecutorError> {
+        // Store the custom executor instance itself to call its methods.
+        // Use Box for dynamic dispatch.
+        thread_local! {
+            static CUSTOM_EXECUTOR_INSTANCE: OnceLock<
+                Box<dyn CustomExecutor>,
+            > = OnceLock::new();
+        };
+
+        CUSTOM_EXECUTOR_INSTANCE.with(|this| {
+            this.set(Box::new(custom_executor))
+                .map_err(|_| ExecutorError::AlreadySet)
+        })?;
+
+        // Now set the ExecutorFns using the stored instance
+        let executor_impl = ExecutorFns {
+            spawn: |fut| {
+                // Unwrap is safe because we just set it successfully or returned Err.
+                CUSTOM_EXECUTOR_INSTANCE
+                    .with(|this| this.get().unwrap().spawn(fut));
+            },
+            spawn_local: |fut| {
+                CUSTOM_EXECUTOR_INSTANCE
+                    .with(|this| this.get().unwrap().spawn_local(fut));
+            },
+            poll_local: || {
+                CUSTOM_EXECUTOR_INSTANCE
+                    .with(|this| this.get().unwrap().poll_local());
+            },
+        };
+
+        EXECUTOR_FNS
+            .set(executor_impl)
+            .map_err(|_| ExecutorError::AlreadySet)
     }
 }
 
-#[cfg(test)]
-mod tests {
-    #[cfg(feature = "futures-executor")]
-    #[test]
-    fn can_spawn_local_future() {
-        use crate::Executor;
-        use std::rc::Rc;
-        Executor::init_futures_executor().expect("couldn't set executor");
-        let rc = Rc::new(());
-        Executor::spawn_local(async {
-            _ = rc;
-        });
-        Executor::spawn(async {});
+/// A trait for custom executors.
+/// Custom executors can be used to integrate with any executor that supports spawning futures.
+///
+/// If used with `init_custom_executor`, the implementation must be `Send + Sync + 'static`.
+///
+/// All methods can be called recursively. Implementors should be mindful of potential
+/// deadlocks or excessive resource consumption if recursive calls are not handled carefully
+/// (e.g., using `try_borrow_mut` or non-blocking polls within implementations).
+pub trait CustomExecutor {
+    /// Spawns a future, usually on a thread pool.
+    fn spawn(&self, fut: PinnedFuture<()>);
+    /// Spawns a local future. May require calling `poll_local` to make progress.
+    fn spawn_local(&self, fut: PinnedLocalFuture<()>);
+    /// Polls the executor, if it supports polling. Implementations should ideally be
+    /// non-blocking or use mechanisms like `try_tick` or `try_borrow_mut` to handle
+    /// re-entrant calls safely.
+    fn poll_local(&self);
+}
+
+// Ensure CustomExecutor is object-safe
+#[allow(dead_code)]
+fn test_object_safety(_: Box<dyn CustomExecutor + Send + Sync>) {} // Added Send + Sync constraint here for global usage
+
+/// Handles the case where `Executor::spawn` is called without an initialized executor.
+#[cold] // Less likely path
+#[inline(never)]
+#[track_caller]
+fn handle_uninitialized_spawn(_fut: PinnedFuture<()>) {
+    let caller = std::panic::Location::caller();
+    #[cfg(all(debug_assertions, feature = "tracing"))]
+    {
+        tracing::error!(
+            target: "any_spawner",
+            spawn_caller=%caller,
+            "Executor::spawn called before a global executor was initialized. Task dropped."
+        );
+        // Drop the future implicitly after logging
+        drop(_fut);
+    }
+    #[cfg(all(debug_assertions, not(feature = "tracing")))]
+    {
+        panic!(
+            "At {caller}, tried to spawn a Future with Executor::spawn() \
+             before a global executor was initialized."
+        );
+    }
+    // In release builds (without tracing), call the specific no-op function.
+    #[cfg(not(debug_assertions))]
+    {
+        no_op_spawn(_fut);
+    }
+}
+
+/// Handles the case where `Executor::spawn_local` is called without an initialized executor.
+#[cold] // Less likely path
+#[inline(never)]
+#[track_caller]
+fn handle_uninitialized_spawn_local(_fut: PinnedLocalFuture<()>) {
+    let caller = std::panic::Location::caller();
+    #[cfg(all(debug_assertions, feature = "tracing"))]
+    {
+        tracing::error!(
+            target: "any_spawner",
+            spawn_caller=%caller,
+            "Executor::spawn_local called before a global executor was initialized. \
+            Task likely dropped or panicked."
+        );
+        // Fall through to panic or no-op depending on build/target
+    }
+    #[cfg(all(debug_assertions, not(feature = "tracing")))]
+    {
+        panic!(
+            "At {caller}, tried to spawn a Future with \
+             Executor::spawn_local() before a global executor was initialized."
+        );
+    }
+    // In release builds (without tracing), call the specific no-op function (which usually panics).
+    #[cfg(not(debug_assertions))]
+    {
+        no_op_spawn_local(_fut);
     }
 }

any_spawner/tests/already_set_error.rs

@@ -0,0 +1,24 @@
+use any_spawner::{Executor, ExecutorError};
+
+#[test]
+fn test_already_set_error() {
+    struct SimpleExecutor;
+
+    impl any_spawner::CustomExecutor for SimpleExecutor {
+        fn spawn(&self, _fut: any_spawner::PinnedFuture<()>) {}
+        fn spawn_local(&self, _fut: any_spawner::PinnedLocalFuture<()>) {}
+        fn poll_local(&self) {}
+    }
+
+    // First initialization should succeed
+    Executor::init_custom_executor(SimpleExecutor)
+        .expect("First initialization failed");
+
+    // Second initialization should fail with AlreadySet error
+    let result = Executor::init_custom_executor(SimpleExecutor);
+    assert!(matches!(result, Err(ExecutorError::AlreadySet)));
+
+    // First local initialization should fail
+    let result = Executor::init_local_custom_executor(SimpleExecutor);
+    assert!(matches!(result, Err(ExecutorError::AlreadySet)));
+}

any_spawner/tests/async_executor.rs

@@ -0,0 +1,74 @@
+#![cfg(feature = "async-executor")]
+
+use std::{
+    future::Future,
+    pin::Pin,
+    sync::{Arc, Mutex},
+};
+
+// A simple async executor for testing
+struct TestExecutor {
+    tasks: Mutex<Vec<Pin<Box<dyn Future<Output = ()> + Send + 'static>>>>,
+}
+
+impl TestExecutor {
+    fn new() -> Self {
+        TestExecutor {
+            tasks: Mutex::new(Vec::new()),
+        }
+    }
+
+    fn spawn<F>(&self, future: F)
+    where
+        F: Future<Output = ()> + Send + 'static,
+    {
+        self.tasks.lock().unwrap().push(Box::pin(future));
+    }
+
+    fn run_all(&self) {
+        // Take all tasks out to process them
+        let tasks = self.tasks.lock().unwrap().drain(..).collect::<Vec<_>>();
+
+        // Use a basic future executor to run each task to completion
+        for mut task in tasks {
+            // Use futures-lite's block_on to complete the future
+            futures::executor::block_on(async {
+                unsafe {
+                    let task_mut = Pin::new_unchecked(&mut task);
+                    let _ = std::future::Future::poll(
+                        task_mut,
+                        &mut std::task::Context::from_waker(
+                            futures::task::noop_waker_ref(),
+                        ),
+                    );
+                }
+            });
+        }
+    }
+}
+
+#[test]
+fn test_async_executor() {
+    let executor = Arc::new(TestExecutor::new());
+    let executor_clone = executor.clone();
+
+    // Create a spawner function that will use our test executor
+    let spawner = move |future| {
+        executor_clone.spawn(future);
+    };
+
+    // Prepare test data
+    let counter = Arc::new(Mutex::new(0));
+    let counter_clone = counter.clone();
+
+    // Use the spawner to spawn a task
+    spawner(async move {
+        *counter_clone.lock().unwrap() += 1;
+    });
+
+    // Run all tasks
+    executor.run_all();
+
+    // Check if the task completed correctly
+    assert_eq!(*counter.lock().unwrap(), 1);
+}

any_spawner/tests/custom_executor.rs

@@ -0,0 +1,63 @@
+use any_spawner::Executor;
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
+
+#[test]
+fn test_custom_executor() {
+    // Define a simple custom executor
+    struct TestExecutor {
+        spawn_called: Arc<AtomicBool>,
+        spawn_local_called: Arc<AtomicBool>,
+        poll_local_called: Arc<AtomicBool>,
+    }
+
+    impl any_spawner::CustomExecutor for TestExecutor {
+        fn spawn(&self, fut: any_spawner::PinnedFuture<()>) {
+            self.spawn_called.store(true, Ordering::SeqCst);
+            // Execute the future immediately (this works for simple test futures)
+            futures::executor::block_on(fut);
+        }
+
+        fn spawn_local(&self, fut: any_spawner::PinnedLocalFuture<()>) {
+            self.spawn_local_called.store(true, Ordering::SeqCst);
+            // Execute the future immediately
+            futures::executor::block_on(fut);
+        }
+
+        fn poll_local(&self) {
+            self.poll_local_called.store(true, Ordering::SeqCst);
+        }
+    }
+
+    let spawn_called = Arc::new(AtomicBool::new(false));
+    let spawn_local_called = Arc::new(AtomicBool::new(false));
+    let poll_local_called = Arc::new(AtomicBool::new(false));
+
+    let executor = TestExecutor {
+        spawn_called: spawn_called.clone(),
+        spawn_local_called: spawn_local_called.clone(),
+        poll_local_called: poll_local_called.clone(),
+    };
+
+    // Initialize with our custom executor
+    Executor::init_custom_executor(executor)
+        .expect("Failed to initialize custom executor");
+
+    // Test spawn
+    Executor::spawn(async {
+        // Simple task
+    });
+    assert!(spawn_called.load(Ordering::SeqCst));
+
+    // Test spawn_local
+    Executor::spawn_local(async {
+        // Simple local task
+    });
+    assert!(spawn_local_called.load(Ordering::SeqCst));
+
+    // Test poll_local
+    Executor::poll_local();
+    assert!(poll_local_called.load(Ordering::SeqCst));
+}

any_spawner/tests/custom_runtime.rs

@@ -0,0 +1,56 @@
+#![cfg(feature = "futures-executor")]
+
+use any_spawner::{CustomExecutor, Executor, PinnedFuture, PinnedLocalFuture};
+
+#[test]
+fn can_create_custom_executor() {
+    use futures::{
+        executor::{LocalPool, LocalSpawner},
+        task::LocalSpawnExt,
+    };
+    use std::{
+        cell::RefCell,
+        sync::{
+            atomic::{AtomicUsize, Ordering},
+            Arc,
+        },
+    };
+
+    thread_local! {
+        static LOCAL_POOL: RefCell<LocalPool> = RefCell::new(LocalPool::new());
+        static SPAWNER: LocalSpawner = LOCAL_POOL.with(|pool| pool.borrow().spawner());
+    }
+
+    struct CustomFutureExecutor;
+    impl CustomExecutor for CustomFutureExecutor {
+        fn spawn(&self, _fut: PinnedFuture<()>) {
+            panic!("not supported in this test");
+        }
+
+        fn spawn_local(&self, fut: PinnedLocalFuture<()>) {
+            SPAWNER.with(|spawner| {
+                spawner.spawn_local(fut).expect("failed to spawn future");
+            });
+        }
+
+        fn poll_local(&self) {
+            LOCAL_POOL.with(|pool| {
+                if let Ok(mut pool) = pool.try_borrow_mut() {
+                    pool.run_until_stalled();
+                }
+                // If we couldn't borrow_mut, we're in a nested call to poll, so we don't need to do anything.
+            });
+        }
+    }
+
+    Executor::init_custom_executor(CustomFutureExecutor)
+        .expect("couldn't set executor");
+
+    let counter = Arc::new(AtomicUsize::new(0));
+    let counter_clone = Arc::clone(&counter);
+    Executor::spawn_local(async move {
+        counter_clone.store(1, Ordering::Release);
+    });
+    Executor::poll_local();
+    assert_eq!(counter.load(Ordering::Acquire), 1);
+}

any_spawner/tests/executor_tick.rs

@@ -0,0 +1,28 @@
+#![cfg(feature = "tokio")]
+
+use any_spawner::Executor;
+use std::{
+    sync::{Arc, Mutex},
+    time::Duration,
+};
+
+#[tokio::test]
+async fn test_executor_tick() {
+    // Initialize the tokio executor
+    Executor::init_tokio().expect("Failed to initialize tokio executor");
+
+    let value = Arc::new(Mutex::new(false));
+    let value_clone = value.clone();
+
+    // Spawn a task that sets the value after a tick
+    Executor::spawn(async move {
+        Executor::tick().await;
+        *value_clone.lock().unwrap() = true;
+    });
+
+    // Allow some time for the task to complete
+    tokio::time::sleep(Duration::from_millis(50)).await;
+
+    // Check that the value was set
+    assert!(*value.lock().unwrap());
+}

any_spawner/tests/futures_executor.rs

@@ -0,0 +1,44 @@
+#![cfg(feature = "futures-executor")]
+
+use any_spawner::Executor;
+use futures::channel::oneshot;
+use std::{
+    sync::{Arc, Mutex},
+    time::Duration,
+};
+
+#[test]
+fn test_futures_executor() {
+    // Initialize the futures executor
+    Executor::init_futures_executor()
+        .expect("Failed to initialize futures executor");
+
+    let (tx, rx) = oneshot::channel();
+    let result = Arc::new(Mutex::new(None));
+    let result_clone = result.clone();
+
+    // Spawn a task
+    Executor::spawn(async move {
+        tx.send(84).expect("Failed to send value");
+    });
+
+    // Spawn a task that waits for the result
+    Executor::spawn(async move {
+        match rx.await {
+            Ok(val) => *result_clone.lock().unwrap() = Some(val),
+            Err(_) => panic!("Failed to receive value"),
+        }
+    });
+
+    // Poll a few times to ensure the task completes
+    for _ in 0..10 {
+        Executor::poll_local();
+        std::thread::sleep(Duration::from_millis(10));
+
+        if result.lock().unwrap().is_some() {
+            break;
+        }
+    }
+
+    assert_eq!(*result.lock().unwrap(), Some(84));
+}

any_spawner/tests/futures_runtime.rs

@@ -0,0 +1,37 @@
+#![cfg(feature = "futures-executor")]
+
+use any_spawner::Executor;
+// All tests in this file use the same executor.
+
+#[test]
+fn can_spawn_local_future() {
+    use std::rc::Rc;
+
+    let _ = Executor::init_futures_executor();
+    let rc = Rc::new(());
+    Executor::spawn_local(async {
+        _ = rc;
+    });
+    Executor::spawn(async {});
+}
+
+#[test]
+fn can_make_local_progress() {
+    use std::sync::{
+        atomic::{AtomicUsize, Ordering},
+        Arc,
+    };
+    let _ = Executor::init_futures_executor();
+    let counter = Arc::new(AtomicUsize::new(0));
+    Executor::spawn_local({
+        let counter = Arc::clone(&counter);
+        async move {
+            assert_eq!(counter.fetch_add(1, Ordering::AcqRel), 0);
+            Executor::spawn_local(async {
+                // Should not crash
+            });
+        }
+    });
+    Executor::poll_local();
+    assert_eq!(counter.load(Ordering::Acquire), 1);
+}

any_spawner/tests/glib.rs

@@ -0,0 +1,151 @@
+#![cfg(feature = "glib")]
+
+use any_spawner::Executor;
+use glib::{MainContext, MainLoop};
+use serial_test::serial;
+use std::{
+    cell::Cell,
+    future::Future,
+    rc::Rc,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc, Mutex,
+    },
+    time::Duration,
+};
+
+// Helper to run a future to completion on a dedicated glib MainContext.
+// Returns true if the future completed within the timeout, false otherwise.
+fn run_on_glib_context<F>(fut: F)
+where
+    F: Future<Output = ()> + Send + 'static,
+{
+    let _ = Executor::init_glib();
+
+    let context = MainContext::default();
+    let main_loop = MainLoop::new(Some(&context), false);
+    let main_loop_clone = main_loop.clone();
+
+    Executor::spawn(async move {
+        fut.await;
+        main_loop_clone.quit();
+    });
+
+    main_loop.run();
+}
+
+// Helper to run a local (!Send) future on the glib context.
+fn run_local_on_glib_context<F>(fut: F)
+where
+    F: Future<Output = ()> + 'static,
+{
+    let _ = Executor::init_glib();
+
+    let context = MainContext::default();
+    let main_loop = MainLoop::new(Some(&context), false);
+    let main_loop_clone = main_loop.clone();
+
+    Executor::spawn_local(async move {
+        fut.await;
+        main_loop_clone.quit();
+    });
+
+    main_loop.run();
+}
+
+// This test must run after a test that successfully initializes glib,
+// or within its own process.
+#[test]
+#[serial]
+fn test_glib_spawn() {
+    let success_flag = Arc::new(AtomicBool::new(false));
+    let flag_clone = success_flag.clone();
+
+    run_on_glib_context(async move {
+        // Simulate async work
+        futures_lite::future::yield_now().await;
+        flag_clone.store(true, Ordering::SeqCst);
+
+        // We need to give the spawned task time to run.
+        // The run_on_glib_context handles the main loop.
+        // We just need to ensure spawn happened correctly.
+        // Let's wait a tiny bit within the driving future to ensure spawn gets processed.
+        glib::timeout_future(Duration::from_millis(10)).await;
+    });
+
+    assert!(
+        success_flag.load(Ordering::SeqCst),
+        "Spawned future did not complete successfully"
+    );
+}
+
+// Similar conditions as test_glib_spawn regarding initialization state.
+#[test]
+#[serial]
+fn test_glib_spawn_local() {
+    let success_flag = Rc::new(Cell::new(false));
+    let flag_clone = success_flag.clone();
+
+    run_local_on_glib_context(async move {
+        // Use Rc to make the future !Send
+        let non_send_data = Rc::new(Cell::new(10));
+
+        let data = non_send_data.get();
+        assert_eq!(data, 10, "Rc data should be accessible");
+        non_send_data.set(20); // Modify non-Send data
+
+        // Simulate async work
+        futures_lite::future::yield_now().await;
+
+        assert_eq!(
+            non_send_data.get(),
+            20,
+            "Rc data should persist modification"
+        );
+        flag_clone.set(true);
+
+        // Wait a tiny bit
+        glib::timeout_future(Duration::from_millis(10)).await;
+    });
+
+    assert!(
+        success_flag.get(),
+        "Spawned local future did not complete successfully"
+    );
+}
+
+// Test Executor::tick with glib backend
+#[test]
+#[serial]
+fn test_glib_tick() {
+    run_on_glib_context(async {
+        let value = Arc::new(Mutex::new(false));
+        let value_clone = value.clone();
+
+        // Spawn a task that sets the value after a tick
+        Executor::spawn(async move {
+            Executor::tick().await;
+            *value_clone.lock().unwrap() = true;
+        });
+
+        // Allow some time for the task to complete
+        glib::timeout_future(Duration::from_millis(10)).await;
+
+        // Check that the value was set
+        assert!(*value.lock().unwrap());
+    });
+}
+
+// Test Executor::poll_local with glib backend (should be a no-op)
+#[test]
+#[serial]
+fn test_glib_poll_local_is_no_op() {
+    // Ensure glib executor is initialized
+    let _ = Executor::init_glib();
+    // poll_local for glib is configured as a no-op
+    // Calling it should not panic or cause issues.
+    Executor::poll_local();
+    Executor::poll_local();
+
+    println!("Executor::poll_local called successfully (expected no-op).");
+}

any_spawner/tests/local_custom_executor.rs

@@ -0,0 +1,54 @@
+use any_spawner::Executor;
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
+
+#[test]
+fn test_local_custom_executor() {
+    // Define a thread-local custom executor
+    struct LocalTestExecutor {
+        spawn_called: Arc<AtomicBool>,
+        spawn_local_called: Arc<AtomicBool>,
+    }
+
+    impl any_spawner::CustomExecutor for LocalTestExecutor {
+        fn spawn(&self, fut: any_spawner::PinnedFuture<()>) {
+            self.spawn_called.store(true, Ordering::SeqCst);
+            futures::executor::block_on(fut);
+        }
+
+        fn spawn_local(&self, fut: any_spawner::PinnedLocalFuture<()>) {
+            self.spawn_local_called.store(true, Ordering::SeqCst);
+            futures::executor::block_on(fut);
+        }
+
+        fn poll_local(&self) {
+            // No-op for this test
+        }
+    }
+
+    let local_spawn_called = Arc::new(AtomicBool::new(false));
+    let local_spawn_local_called = Arc::new(AtomicBool::new(false));
+
+    let local_executor = LocalTestExecutor {
+        spawn_called: local_spawn_called.clone(),
+        spawn_local_called: local_spawn_local_called.clone(),
+    };
+
+    // Initialize a thread-local executor
+    Executor::init_local_custom_executor(local_executor)
+        .expect("Failed to initialize local custom executor");
+
+    // Test spawn - should use the thread-local executor
+    Executor::spawn(async {
+        // Simple task
+    });
+    assert!(local_spawn_called.load(Ordering::SeqCst));
+
+    // Test spawn_local - should use the thread-local executor
+    Executor::spawn_local(async {
+        // Simple local task
+    });
+    assert!(local_spawn_local_called.load(Ordering::SeqCst));
+}

any_spawner/tests/multiple_tasks.rs

@@ -0,0 +1,35 @@
+#![cfg(feature = "tokio")]
+
+use any_spawner::Executor;
+use futures::channel::oneshot;
+use std::sync::{Arc, Mutex};
+
+#[tokio::test]
+async fn test_multiple_tasks() {
+    Executor::init_tokio().expect("Failed to initialize tokio executor");
+
+    let counter = Arc::new(Mutex::new(0));
+    let tasks = 10;
+    let mut handles = Vec::new();
+
+    // Spawn multiple tasks that increment the counter
+    for _ in 0..tasks {
+        let counter_clone = counter.clone();
+        let (tx, rx) = oneshot::channel();
+
+        Executor::spawn(async move {
+            *counter_clone.lock().unwrap() += 1;
+            tx.send(()).expect("Failed to send completion signal");
+        });
+
+        handles.push(rx);
+    }
+
+    // Wait for all tasks to complete
+    for handle in handles {
+        handle.await.expect("Task failed");
+    }
+
+    // Verify that all tasks incremented the counter
+    assert_eq!(*counter.lock().unwrap(), tasks);
+}

any_spawner/tests/tokio_executor.rs

@@ -0,0 +1,20 @@
+#![cfg(feature = "tokio")]
+
+use any_spawner::Executor;
+use futures::channel::oneshot;
+
+#[tokio::test]
+async fn test_tokio_executor() {
+    // Initialize the tokio executor
+    Executor::init_tokio().expect("Failed to initialize tokio executor");
+
+    let (tx, rx) = oneshot::channel();
+
+    // Spawn a task that sends a value
+    Executor::spawn(async move {
+        tx.send(42).expect("Failed to send value");
+    });
+
+    // Wait for the spawned task to complete
+    assert_eq!(rx.await.unwrap(), 42);
+}

any_spawner/tests/wasm_bindgen_tests.rs

@@ -0,0 +1,88 @@
+#![cfg(all(feature = "wasm-bindgen", target_family = "wasm"))]
+
+use any_spawner::Executor;
+use futures::channel::oneshot;
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+#[wasm_bindgen_test]
+async fn test_wasm_bindgen_spawn_local() {
+    // Initialize the wasm-bindgen executor
+    let _ = Executor::init_wasm_bindgen();
+
+    // Create a channel to verify the task completes
+    let (tx, rx) = oneshot::channel();
+
+    // Spawn a local task (wasm doesn't support sending futures between threads)
+    Executor::spawn_local(async move {
+        // Simulate some async work
+        Executor::tick().await;
+        tx.send(42).expect("Failed to send result");
+    });
+
+    // Wait for the task to complete
+    let result = rx.await.expect("Failed to receive result");
+    assert_eq!(result, 42);
+}
+
+#[wasm_bindgen_test]
+async fn test_wasm_bindgen_tick() {
+    // Initialize the wasm-bindgen executor if not already initialized
+    let _ = Executor::init_wasm_bindgen();
+
+    let flag = Arc::new(AtomicBool::new(false));
+    let flag_clone = flag.clone();
+
+    // Spawn a task that will set the flag
+    Executor::spawn_local(async move {
+        flag_clone.store(true, Ordering::SeqCst);
+    });
+
+    // Wait for a tick, which should allow the spawned task to run
+    Executor::tick().await;
+
+    // Verify the flag was set
+    assert!(flag.load(Ordering::SeqCst));
+}
+
+#[wasm_bindgen_test]
+async fn test_multiple_wasm_bindgen_tasks() {
+    // Initialize once for all tests
+    let _ = Executor::init_wasm_bindgen();
+
+    // Create channels for multiple tasks
+    let (tx1, rx1) = oneshot::channel();
+    let (tx2, rx2) = oneshot::channel();
+
+    // Spawn multiple tasks
+    Executor::spawn_local(async move {
+        tx1.send("task1").expect("Failed to send from task1");
+    });
+
+    Executor::spawn_local(async move {
+        tx2.send("task2").expect("Failed to send from task2");
+    });
+
+    // Wait for both tasks to complete
+    let (result1, result2) = futures::join!(rx1, rx2);
+
+    assert_eq!(result1.unwrap(), "task1");
+    assert_eq!(result2.unwrap(), "task2");
+}
+
+// This test verifies that spawn (not local) fails on wasm as expected
+#[wasm_bindgen_test]
+#[should_panic]
+fn test_wasm_bindgen_spawn_errors() {
+    let _ = Executor::init_wasm_bindgen();
+
+    // Using should_panic to test that Executor::spawn panics in wasm
+    Executor::spawn(async {
+        // This should panic since wasm-bindgen doesn't support Send futures
+    });
+}

benchmarks/Cargo.toml

@@ -2,8 +2,6 @@
 name = "benchmarks"
 version = "0.1.0"
 edition = "2021"
-# std::sync::LazyLock is stabilized in Rust version 1.80.0
-rust-version = "1.80.0"
 
 [dependencies]
 l0410 = { package = "leptos", version = "0.4.10", features = [
@@ -23,7 +21,7 @@ tokio-test = "0.4.0"
 miniserde = "0.1.0"
 gloo = "0.8.0"
 uuid = { version = "1.0", features = ["serde", "v4", "wasm-bindgen"] }
-wasm-bindgen = "0.2.0"
+wasm-bindgen = "0.2.100"
 lazy_static = "1.0"
 log = "0.4.0"
 strum = "0.24.0"

cargo-make/check-minimal-versions.toml

@@ -0,0 +1,14 @@
+[tasks.check-minimal-versions]
+condition = { channels = ["nightly"] }
+command = "cargo"
+args = [
+  "all-features",
+  "minimal-versions",
+  "check",
+  "--ignore-private",
+  "--detach-path-deps",
+  "--direct",
+]
+install_script = '''
+cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+'''

cargo-make/check.toml

@@ -1,7 +0,0 @@
-[tasks.check]
-alias = "check-all"
-
-[tasks.check-all]
-command = "cargo"
-args = ["check-all-features"]
-install_crate = "cargo-all-features"

cargo-make/lint.toml

@@ -6,13 +6,15 @@ env = { LEPTOS_PROJECT_DIRECTORY = "../" }
 args = ["fmt", "--", "--check", "--config-path", "${LEPTOS_PROJECT_DIRECTORY}"]
 
 [tasks.clippy-each-feature]
-dependencies = ["install-clippy"]
 command = "cargo"
 args = [
-    "clippy",
-    "--all-features",
-    "--no-deps",
-    "--",
-    "-D",
-    "clippy::print_stdout",
+  "all-features",
+  "clippy",
+  "--no-deps",
+  "--",
+  "-D",
+  "clippy::print_stdout",
 ]
+install_script = '''
+cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+'''

cargo-make/main.toml

@@ -1,7 +1,7 @@
 extend = [
-    { path = "./check.toml" },
-    { path = "./lint.toml" },
-    { path = "./test.toml" },
+  { path = "./lint.toml" },
+  { path = "./test.toml" },
+  { path = "./check-minimal-versions.toml" },
 ]
 
 [env]
@@ -12,4 +12,4 @@ LEPTOS_OUTPUT_NAME = "ci" # allows examples to check/build without cargo-leptos
 RUSTFLAGS = "-D warnings"
 
 [tasks.ci]
-dependencies = ["lint", "test"]
+dependencies = ["lint", "test-each-feature", "doctests"]

cargo-make/test.toml

@@ -1,7 +1,16 @@
-[tasks.test]
-alias = "test-all"
-
-[tasks.test-all]
+[tasks.test-each-feature]
+env = { "NEXTEST_NO_TESTS" = "warn" }
 command = "cargo"
-args = ["test-all-features"]
-install_crate = "cargo-all-features"
+args = ["all-features", "nextest", "run", "--all-targets"]
+install_script = '''
+cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+'''
+
+# This can be removed once doctests is supported in nextest
+# https://github.com/nextest-rs/nextest/issues/16
+[tasks.doctests]
+command = "cargo"
+args = ["all-features", "test", "--doc"]
+install_script = '''
+cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+'''

cargo-make/wasm-test.toml

@@ -0,0 +1,7 @@
+[tasks.post-test]
+dependencies = ["test-wasm"]
+
+[tasks.test-wasm]
+env = { CARGO_MAKE_WASM_TEST_ARGS = "--headless --chrome --features=wasm-bindgen" }
+command = "cargo"
+args = ["make", "wasm-pack-test"]

const_str_slice_concat/src/lib.rs

@@ -31,7 +31,7 @@ pub const fn const_concat(
         let mut i = 0;
 
         // have it iterate over bytes manually, because, again,
-        // no mutable refernces in const fns
+        // no mutable references in const fns
         while i < x.len() {
             buffer[position] = x[i];
             position += 1;
@@ -59,7 +59,7 @@ pub const fn const_concat_with_prefix(
         let mut i = 0;
 
         // have it iterate over bytes manually, because, again,
-        // no mutable refernces in const fns
+        // no mutable references in const fns
         while i < x.len() {
             buffer[position] = x[i];
             position += 1;
@@ -116,7 +116,7 @@ pub const fn const_concat_with_separator(
         let mut i = 0;
 
         // have it iterate over bytes manually, because, again,
-        // no mutable refernces in const fns
+        // no mutable references in const fns
         while i < x.len() {
             buffer[position] = x[i];
             position += 1;

either_of/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "either_of"
-version = "0.1.0"
+version = "0.1.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -10,4 +10,9 @@ rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
-pin-project-lite = "0.2.14"
+pin-project-lite = { workspace = true, default-features = true }
+paste = { workspace = true, default-features = true }
+
+[features]
+default = ["no_std"]
+no_std = []

examples/axum_js_ssr/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-axum = { version = "0.7.5", optional = true }
+axum = { version = "0.8.1", optional = true }
 console_error_panic_hook = "0.1.7"
 console_log = "1.0"
 gloo-utils = "0.2.0"
@@ -19,19 +19,28 @@ leptos_meta = { path = "../../meta" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_router = { path = "../../router" }
 serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0"
-tokio = { version = "1.39", features = [ "rt-multi-thread", "macros", "time" ], optional = true }
+thiserror = "2.0.12"
+tokio = { version = "1.39", features = [
+  "rt-multi-thread",
+  "macros",
+  "time",
+], optional = true }
 tower = { version = "0.4.13", optional = true }
 tower-http = { version = "0.5.2", features = ["fs"], optional = true }
 wasm-bindgen = "0.2.92"
-web-sys = { version = "0.3.69", features = [ "AddEventListenerOptions", "Document", "Element", "Event", "EventListener", "EventTarget", "Performance", "Window" ], optional = true }
+web-sys = { version = "0.3.69", features = [
+  "AddEventListenerOptions",
+  "Document",
+  "Element",
+  "Event",
+  "EventListener",
+  "EventTarget",
+  "Performance",
+  "Window",
+], optional = true }
 
 [features]
-hydrate = [
-  "leptos/hydrate",
-  "dep:js-sys",
-  "dep:web-sys",
-]
+hydrate = ["leptos/hydrate", "dep:js-sys", "dep:web-sys"]
 ssr = [
   "dep:axum",
   "dep:http-body-util",
@@ -56,7 +65,7 @@ panic = "abort"
 
 [package.metadata.cargo-all-features]
 denylist = ["axum", "tower", "tower-http", "tokio", "sqlx", "leptos_axum"]
-skip_feature_sets = [["ssr", "hydrate"]]
+skip_feature_sets = [["ssr", "hydrate"], []]
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name

examples/axum_js_ssr/node_modules/@highlightjs/cdn-assets/es/highlight.min.js

@@ -1227,4 +1227,4 @@ begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0
 ;return c.pop(),c.push(i),r.contains=c,{name:"YAML",case_insensitive:!0,
 aliases:["yml"],contains:l}}});const Ke=te;for(const e of Object.keys(Pe)){
 const n=e.replace("grmr_","").replace("_","-");Ke.registerLanguage(n,Pe[e])}
-export{Ke as default};
+export{Ke as defaultMod};

examples/axum_js_ssr/rust-toolchain.toml

@@ -1,2 +0,0 @@
-[toolchain]
-channel = "stable" # test change

examples/axum_js_ssr/src/hljs.rs

@@ -13,13 +13,13 @@ mod csr {
     extern "C" {
         type HighlightOptions;
 
-        #[wasm_bindgen(catch, js_namespace = default, js_name = highlight)]
+        #[wasm_bindgen(catch, js_namespace = defaultMod, js_name = highlight)]
         fn highlight_lang(
             code: String,
             options: Object,
         ) -> Result<Object, JsValue>;
 
-        #[wasm_bindgen(js_namespace = default, js_name = highlightAll)]
+        #[wasm_bindgen(js_namespace = defaultMod, js_name = highlightAll)]
         pub fn highlight_all();
     }
 

examples/axum_js_ssr/src/main.rs

@@ -26,7 +26,7 @@ async fn main() {
     };
     use axum_js_ssr::app::*;
     use http_body_util::BodyExt;
-    use leptos::prelude::*;
+    use leptos::{logging::log, prelude::*};
     use leptos_axum::{generate_route_list, LeptosRoutes};
 
     latency::LATENCY.get_or_init(|| [0, 4, 40, 400].iter().cycle().into());

examples/cargo-make/cargo-leptos-compress.toml

@@ -1,7 +1,3 @@
-extend = [
-    { path = "./lint.toml" }
-]
-
 [tasks.make-target-site-dir]
 command = "mkdir"
 args = ["-p", "target/site"]
@@ -24,21 +20,16 @@ clear = true
 dependencies = ["check-debug", "check-release"]
 
 [tasks.check-debug]
-toolchain = "stable"
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["check-all-features"]
-install_crate = "cargo-all-features"
+args = ["all-features", "clippy"]
 
 [tasks.check-release]
-toolchain = "stable"
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["check-all-features", "--release"]
-install_crate = "cargo-all-features"
-
-[tasks.lint]
-dependencies = ["make-target-site-dir", "check-style"]
+args = ["all-features", "clippy", "--release"]
 
 [tasks.start-client]
 dependencies = ["install-cargo-leptos"]
 command = "cargo"
-args = ["leptos", "watch", "--release", "-P"]
+args = ["leptos", "watch", "--release", "-P"]

examples/cargo-make/cargo-leptos-split-webdriver-test.toml

@@ -0,0 +1,11 @@
+extend = [
+    { path = "./cargo-leptos.toml" },
+    { path = "../cargo-make/webdriver.toml" },
+]
+
+[tasks.integration-test]
+dependencies = [
+    "install-cargo-leptos",
+    "start-webdriver",
+    "cargo-leptos-e2e-split",
+]

examples/cargo-make/cargo-leptos.toml

@@ -1,10 +1,20 @@
+[tasks.cargo-all-features]
+install_script = '''
+cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+'''
+
 [tasks.install-cargo-leptos]
 install_crate = { crate_name = "cargo-leptos", binary = "cargo-leptos", test_arg = "--help" }
+args = ["--locked"]
 
 [tasks.cargo-leptos-e2e]
 command = "cargo"
 args = ["leptos", "end-to-end"]
 
+[tasks.cargo-leptos-e2e-split]
+command = "cargo"
+args = ["leptos", "end-to-end", "--split"]
+
 [tasks.build]
 clear = true
 command = "cargo"
@@ -15,16 +25,14 @@ clear = true
 dependencies = ["check-debug", "check-release"]
 
 [tasks.check-debug]
-toolchain = "stable"
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["check-all-features"]
-install_crate = "cargo-all-features"
+args = ["all-features", "clippy"]
 
 [tasks.check-release]
-toolchain = "stable"
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["check-all-features", "--release"]
-install_crate = "cargo-all-features"
+args = ["all-features", "clippy", "--release"]
 
 [tasks.start-client]
 dependencies = ["install-cargo-leptos"]

examples/cargo-make/compile.toml

@@ -1,11 +1,9 @@
-[tasks.build]
-toolchain = "stable"
-command = "cargo"
-args = ["build-all-features"]
-install_crate = "cargo-all-features"
+[tasks.cargo-all-features]
+install_script = '''
+cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+'''
 
-[tasks.check]
-toolchain = "stable"
+[tasks.build]
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["check-all-features"]
-install_crate = "cargo-all-features"
+args = ["all-features", "build"]

examples/cargo-make/deno-build.toml

@@ -1,3 +1,8 @@
+[tasks.cargo-all-features]
+install_script = '''
+cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+'''
+
 [tasks.build]
 install_crate = { crate_name = "wasm-pack", binary = "wasm-pack", test_arg = "--help" }
 clear = true
@@ -14,13 +19,11 @@ clear = true
 dependencies = ["check-debug", "check-release"]
 
 [tasks.check-debug]
-toolchain = "stable"
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["check-all-features"]
-install_crate = "cargo-all-features"
+args = ["all-features", "clippy"]
 
 [tasks.check-release]
-toolchain = "stable"
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["check-all-features", "--release"]
-install_crate = "cargo-all-features"
+args = ["all-features", "clippy", "--release"]

examples/cargo-make/lint.toml

@@ -1,8 +1,15 @@
-[tasks.pre-clippy]
-env = { CARGO_MAKE_CLIPPY_ARGS = "--no-deps --all-targets --all-features -- -D warnings" }
+[tasks.cargo-all-features]
+install_script = '''
+cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
+'''
 
-[tasks.check-style]
-dependencies = ["check-format-flow", "clippy-flow"]
+[tasks.lint]
+dependencies = ["check-format-flow", "clippy-each-feature"]
+
+[tasks.clippy-each-feature]
+dependencies = ["cargo-all-features"]
+command = "cargo"
+args = ["all-features", "clippy", "--no-deps", "--", "-D", "warnings"]
 
 [tasks.check-format]
 env = { LEPTOS_PROJECT_DIRECTORY = "../../" }

examples/cargo-make/main.toml

@@ -1,22 +1,19 @@
 extend = [
-    { path = "./compile.toml" },
-    { path = "./clean.toml" },
-    { path = "./lint.toml" },
-    { path = "./node.toml" },
-    { path = "./process.toml" },
+  { path = "./compile.toml" },
+  { path = "./clean.toml" },
+  { path = "./lint.toml" },
+  { path = "./node.toml" },
+  { path = "./process.toml" },
 ]
 
 # CI Stages
 
 [tasks.ci]
-dependencies = ["prepare", "lint", "build", "test-flow", "integration-test"]
+dependencies = ["prepare", "lint", "test-flow", "integration-test"]
 
 [tasks.prepare]
 dependencies = ["setup-node"]
 
-[tasks.lint]
-dependencies = ["check-style"]
-
 [tasks.integration-test]
 
 # Support Local Runs

examples/cargo-make/playwright-trunk-test.toml

@@ -1,22 +1,8 @@
 extend = [
-    { path = "../cargo-make/playwright.toml" },
-    { path = "../cargo-make/trunk_server.toml" },
+  { path = "../cargo-make/playwright.toml" },
+  { path = "../cargo-make/trunk_server.toml" },
 ]
 
 [tasks.integration-test]
+dependencies = ["build", "start-client", "test-playwright"]
 description = "Run integration test with automated start and stop of processes"
-env = { SPAWN_CLIENT_PROCESS = "1" }
-run_task = { name = ["start", "wait-test-stop"], parallel = true }
-
-[tasks.wait-test-stop]
-private = true
-dependencies = ["wait-server", "test-playwright", "stop"]
-
-[tasks.wait-server]
-script = '''
-for run in {1..12}; do
-    echo "Waiting to ensure server is started..."
-    sleep 10
-done
-echo "Times up, running tests"
-'''

examples/cargo-make/trunk_server.toml

@@ -6,5 +6,6 @@ command = "trunk"
 args = ["build"]
 
 [tasks.start-client]
-command = "trunk"
-args = ["serve", "${@}"]
+script = '''
+trunk serve -q "${@}" &
+'''

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/index.html

@@ -1,8 +1,9 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
-	<head>
-		<link data-trunk rel="rust" data-wasm-opt="z"/>
-		<link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico"/>
-	</head>
-	<body></body>
-</html>
+  <head>
+    <link data-trunk rel="rust" data-wasm-opt="z" />
+    <link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico" />
+  </head>
+  <body></body>
+</html>
+

examples/counter/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/counter/tests/web.rs

@@ -1,7 +1,7 @@
+#![allow(dead_code)]
+
 use counter::*;
-use leptos::mount::mount_to;
-use leptos::prelude::*;
-use leptos::spawn::tick;
+use leptos::{mount::mount_to, prelude::*, task::tick};
 use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;
 

examples/counter_isomorphic/Cargo.toml

@@ -2,8 +2,6 @@
 name = "counter_isomorphic"
 version = "0.1.0"
 edition = "2021"
-# std::sync::LazyLock is stabilized in Rust version 1.80.0
-rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -23,7 +21,6 @@ leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
 log = "0.4.22"
-once_cell = "1.19"
 gloo-net = { version = "0.6.0" }
 wasm-bindgen = "0.2.93"
 serde = { version = "1.0", features = ["derive"] }
@@ -44,7 +41,7 @@ ssr = [
 
 [package.metadata.cargo-all-features]
 denylist = ["actix-files", "actix-web", "leptos_actix"]
-skip_feature_sets = [["ssr", "hydrate"]]
+skip_feature_sets = [["ssr", "hydrate"], []]
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name

examples/counter_isomorphic/src/counters.rs

@@ -1,4 +1,4 @@
-use leptos::{prelude::*, reactive_graph::actions::Action};
+use leptos::prelude::*;
 use leptos_router::{
     components::{FlatRoutes, Route, Router, A},
     StaticSegment,

examples/counter_isomorphic/src/main.rs

@@ -63,7 +63,7 @@ async fn main() -> std::io::Result<()> {
                         </html>
                     }
             }})
-            .service(Files::new("/", site_root))
+            .service(Files::new("/", site_root.as_ref()))
     })
     .bind(&addr)?
     .run()

examples/counter_url_query/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/counter_without_macros/Makefile.toml

@@ -1,17 +1,15 @@
 extend = [
-    { path = "../cargo-make/main.toml" },
-    { path = "../cargo-make/wasm-test.toml" },
-    { path = "../cargo-make/trunk_server.toml" },
+  { path = "../cargo-make/main.toml" },
+  { path = "../cargo-make/wasm-test.toml" },
+  { path = "../cargo-make/trunk_server.toml" },
 ]
 
 [tasks.build]
-toolchain = "stable"
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["build-all-features"]
-install_crate = "cargo-all-features"
+args = ["all-features", "build"]
 
 [tasks.check]
-toolchain = "stable"
+dependencies = ["cargo-all-features"]
 command = "cargo"
-args = ["check-all-features"]
-install_crate = "cargo-all-features"
+args = ["all-features", "clippy"]

examples/counter_without_macros/tests/web.rs

@@ -1,5 +1,7 @@
+#![allow(dead_code)]
+
 use counter_without_macros::counter;
-use leptos::{prelude::*, spawn::tick};
+use leptos::{prelude::*, task::tick};
 use pretty_assertions::assert_eq;
 use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;

examples/counters/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/counters/tests/web.rs

@@ -1,10 +1,11 @@
+#![allow(dead_code)]
+
 use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
 use counters::Counters;
-use leptos::prelude::*;
-use leptos::spawn::tick;
+use leptos::{prelude::*, task::tick};
 use web_sys::HtmlElement;
 
 #[wasm_bindgen_test]
@@ -22,8 +23,9 @@ async fn inc() {
     assert_eq!(
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: \
-         <span data-testid=\"total\">0</span> from <span data-testid=\"counters\">0</span> counters.</p><ul><!----></ul>"
+         Counters</button><button>Clear Counters</button><p>Total: <span \
+         data-testid=\"total\">0</span> from <span \
+         data-testid=\"counters\">0</span> counters.</p><ul><!----></ul>"
     );
 
     // add 3 counters
@@ -37,8 +39,9 @@ async fn inc() {
     assert_eq!(
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: \
-         <span data-testid=\"total\">0</span> from <span data-testid=\"counters\">3</span> \
+         Counters</button><button>Clear Counters</button><p>Total: <span \
+         data-testid=\"total\">0</span> from <span \
+         data-testid=\"counters\">3</span> \
          counters.</p><ul><li><button>-1</button><input \
          type=\"text\"><span>0</span><button>+1</button><button>x</button></\
          li><li><button>-1</button><input \
@@ -79,8 +82,9 @@ async fn inc() {
     assert_eq!(
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: \
-         <span data-testid=\"total\">6</span> from <span data-testid=\"counters\">3</span> \
+         Counters</button><button>Clear Counters</button><p>Total: <span \
+         data-testid=\"total\">6</span> from <span \
+         data-testid=\"counters\">3</span> \
          counters.</p><ul><li><button>-1</button><input \
          type=\"text\"><span>1</span><button>+1</button><button>x</button></\
          li><li><button>-1</button><input \
@@ -104,8 +108,9 @@ async fn inc() {
     assert_eq!(
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: \
-         <span data-testid=\"total\">5</span> from <span data-testid=\"counters\">2</span> \
+         Counters</button><button>Clear Counters</button><p>Total: <span \
+         data-testid=\"total\">5</span> from <span \
+         data-testid=\"counters\">2</span> \
          counters.</p><ul><li><button>-1</button><input \
          type=\"text\"><span>2</span><button>+1</button><button>x</button></\
          li><li><button>-1</button><input \

examples/directives/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/directives/tests/web.rs

@@ -1,5 +1,7 @@
+#![allow(dead_code)]
+
 use directives::App;
-use leptos::{prelude::*, spawn::tick};
+use leptos::{prelude::*, task::tick};
 use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;
 use web_sys::HtmlElement;

examples/error_boundary/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/errors_axum/Cargo.toml

@@ -13,12 +13,12 @@ leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
 serde = { version = "1.0", features = ["derive"] }
-axum = { version = "0.7.5", optional = true }
+axum = { version = "0.8.1", optional = true }
 tower = { version = "0.4.13", optional = true }
 tower-http = { version = "0.5.2", features = ["fs"], optional = true }
 tokio = { version = "1.39", features = ["full"], optional = true }
 http = { version = "1.1" }
-thiserror = "1.0"
+thiserror = "2.0.12"
 wasm-bindgen = "0.2.93"
 
 [features]
@@ -36,7 +36,7 @@ ssr = [
 
 [package.metadata.cargo-all-features]
 denylist = ["axum", "tower", "tower-http", "tokio", "leptos_axum"]
-skip_feature_sets = [["ssr", "hydrate"]]
+skip_feature_sets = [["ssr", "hydrate"], []]
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name

examples/errors_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/errors_axum/src/error_template.rs

@@ -6,9 +6,7 @@ use leptos_axum::ResponseOptions;
 // A basic function to display errors served by the error boundaries.
 // Feel free to do more complicated things here than just displaying them.
 #[component]
-pub fn ErrorTemplate(
-    #[prop(into)] errors: MaybeSignal<Errors>,
-) -> impl IntoView {
+pub fn ErrorTemplate(#[prop(into)] errors: Signal<Errors>) -> impl IntoView {
     // Get Errors from Signal
     // Downcast lets us take a type that implements `std::error::Error`
     let errors = Memo::new(move |_| {

examples/errors_axum/src/main.rs

@@ -45,7 +45,7 @@ async fn main() {
 
     // build our application with a route
     let app = Router::new()
-        .route("/special/:id", get(custom_handler))
+        .route("/special/{id}", get(custom_handler))
         .leptos_routes(&leptos_options, routes, {
             let leptos_options = leptos_options.clone();
             move || shell(leptos_options.clone())

examples/fetch/Cargo.toml

@@ -15,7 +15,7 @@ serde = { version = "1.0", features = ["derive"] }
 log = "0.4.22"
 console_log = "1.0"
 console_error_panic_hook = "0.1.7"
-thiserror = "1.0"
+thiserror = "2.0.12"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 tracing-subscriber-wasm = "0.1.0"

examples/fetch/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/fetch/src/lib.rs

@@ -1,5 +1,4 @@
 use leptos::prelude::*;
-use leptos::tachys::html::style::style;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
@@ -16,7 +15,7 @@ pub enum CatError {
 
 type CatCount = usize;
 
-async fn fetch_cats(count: CatCount) -> Result<Vec<String>> {
+async fn fetch_cats(count: CatCount) -> Result<Vec<String>, Error> {
     if count > 0 {
         gloo_timers::future::TimeoutFuture::new(1000).await;
         // make the request
@@ -42,11 +41,7 @@ async fn fetch_cats(count: CatCount) -> Result<Vec<String>> {
 pub fn fetch_example() -> impl IntoView {
     let (cat_count, set_cat_count) = signal::<CatCount>(1);
 
-    // we use new_unsync here because the reqwasm request type isn't Send
-    // if we were doing SSR, then
-    // 1) we'd want to use a Resource, so the data would be serialized to the client
-    // 2) we'd need to make sure there was a thread-local spawner set up
-    let cats = AsyncDerived::new_unsync(move || fetch_cats(cat_count.get()));
+    let cats = LocalResource::new(move || fetch_cats(cat_count.get()));
 
     let fallback = move |errors: ArcRwSignal<Errors>| {
         let error_list = move || {
@@ -66,8 +61,6 @@ pub fn fetch_example() -> impl IntoView {
         }
     };
 
-    let spreadable = style(("background-color", "AliceBlue"));
-
     view! {
         <div>
             <label>
@@ -82,7 +75,7 @@ pub fn fetch_example() -> impl IntoView {
                 />
 
             </label>
-            <Transition fallback=|| view! { <div>"Loading..."</div> } {..spreadable}>
+            <Transition fallback=|| view! { <div>"Loading..."</div> }>
                 <ErrorBoundary fallback>
                     <ul>
                         {move || Suspend::new(async move {
@@ -92,7 +85,7 @@ pub fn fetch_example() -> impl IntoView {
                                         .map(|s| {
                                             view! {
                                                 <li>
-                                                    <img src=s.clone()/>
+                                                    <img src=s.clone() />
                                                 </li>
                                             }
                                         })

examples/fetch/src/main.rs

@@ -7,7 +7,7 @@ pub fn main() {
 
     fmt()
         .with_writer(
-            // To avoide trace events in the browser from showing their
+            // To avoid trace events in the browser from showing their
             // JS backtrace, which is very annoying, in my opinion
             MakeConsoleWriter::default()
                 .map_trace_level_to(tracing::Level::DEBUG),

examples/hackernews/Cargo.toml

@@ -43,7 +43,7 @@ codegen-units = 1
 
 [package.metadata.cargo-all-features]
 denylist = ["actix-files", "actix-web", "leptos_actix"]
-skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"], []]
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name   

examples/hackernews/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/hackernews/src/api.rs

@@ -1,5 +1,4 @@
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 pub fn story(path: &str) -> String {
     format!("https://node-hnapi.herokuapp.com/{path}")

examples/hackernews/src/lib.rs

@@ -4,7 +4,7 @@ mod routes;
 use leptos_meta::{provide_meta_context, Link, Meta, Stylesheet};
 use leptos_router::{
     components::{FlatRoutes, Route, Router, RoutingProgress},
-    ParamSegment, StaticSegment,
+    OptionalParamSegment, ParamSegment, StaticSegment,
 };
 use routes::{nav::*, stories::*, story::*, users::*};
 use std::time::Duration;
@@ -28,9 +28,7 @@ pub fn App() -> impl IntoView {
                 <FlatRoutes fallback=|| "Not found.">
                     <Route path=(StaticSegment("users"), ParamSegment("id")) view=User/>
                     <Route path=(StaticSegment("stories"), ParamSegment("id")) view=Story/>
-                    <Route path=ParamSegment("stories") view=Stories/>
-                    // TODO allow optional params without duplication
-                    <Route path=StaticSegment("") view=Stories/>
+                    <Route path=OptionalParamSegment("stories") view=Stories/>
                 </FlatRoutes>
             </main>
         </Router>

examples/hackernews/src/main.rs

@@ -56,7 +56,7 @@ async fn main() -> std::io::Result<()> {
                         </html>
                     }
             }})
-            .service(Files::new("/", site_root))
+            .service(Files::new("/", site_root.as_ref()))
         //.wrap(middleware::Compress::default())
     })
     .bind(&addr)?

examples/hackernews/src/routes/nav.rs

@@ -21,10 +21,16 @@ pub fn Nav() -> impl IntoView {
                 <A href="/job">
                     <strong>"Jobs"</strong>
                 </A>
-                <a class="github" href="http://github.com/leptos-rs/leptos" target="_blank" rel="noreferrer">
+                <a
+                    class="github"
+                    href="http://github.com/leptos-rs/leptos"
+                    target="_blank"
+                    rel="noreferrer"
+                >
                     "Built with Leptos"
                 </a>
             </nav>
         </header>
     }
+    .into_any()
 }

examples/hackernews/src/routes/stories.rs

@@ -50,30 +50,42 @@ pub fn Stories() -> impl IntoView {
         <div class="news-view">
             <div class="news-list-nav">
                 <span>
-                    {move || if page() > 1 {
-                        Either::Left(view! {
-                            <a class="page-link"
-                                href=move || format!("/{}?page={}", story_type(), page() - 1)
-                                aria-label="Previous Page"
-                            >
-                                "< prev"
-                            </a>
-                        })
-                    } else {
-                        Either::Right(view! {
-                            <span class="page-link disabled" aria-hidden="true">
-                                "< prev"
-                            </span>
-                        })
+                    {move || {
+                        if page() > 1 {
+                            Either::Left(
+                                view! {
+                                    <a
+                                        class="page-link"
+                                        href=move || {
+                                            format!("/{}?page={}", story_type(), page() - 1)
+                                        }
+                                        aria-label="Previous Page"
+                                    >
+                                        "< prev"
+                                    </a>
+                                },
+                            )
+                        } else {
+                            Either::Right(
+                                view! {
+                                    <span class="page-link disabled" aria-hidden="true">
+                                        "< prev"
+                                    </span>
+                                },
+                            )
+                        }
                     }}
+
                 </span>
                 <span>"page " {page}</span>
                 <Suspense>
-                    <span class="page-link"
+                    <span
+                        class="page-link"
                         class:disabled=hide_more_link
                         aria-hidden=hide_more_link
                     >
-                        <a href=move || format!("/{}?page={}", story_type(), page() + 1)
+                        <a
+                            href=move || format!("/{}?page={}", story_type(), page() + 1)
                             aria-label="Next Page"
                         >
                             "more >"
@@ -83,14 +95,10 @@ pub fn Stories() -> impl IntoView {
             </div>
             <main class="news-list">
                 <div>
-                    <Transition
-                        fallback=move || view! { <p>"Loading..."</p> }
-                        set_pending
-                    >
-                        <Show when=move || stories.read().as_ref().map(Option::is_none).unwrap_or(false)>
-                        >
-                            <p>"Error loading stories."</p>
-                        </Show>
+                    <Transition fallback=move || view! { <p>"Loading..."</p> } set_pending>
+                        <Show when=move || {
+                            stories.read().as_ref().map(Option::is_none).unwrap_or(false)
+                        }>> <p>"Error loading stories."</p></Show>
                         <ul>
                             <For
                                 each=move || stories.get().unwrap_or_default().unwrap_or_default()
@@ -105,54 +113,78 @@ pub fn Stories() -> impl IntoView {
             </main>
         </div>
     }
+    .into_any()
 }
 
 #[component]
 fn Story(story: api::Story) -> impl IntoView {
     view! {
-         <li class="news-item">
+        <li class="news-item">
             <span class="score">{story.points}</span>
             <span class="title">
                 {if !story.url.starts_with("item?id=") {
-                    Either::Left(view! {
-                        <span>
-                            <a href=story.url target="_blank" rel="noreferrer">
-                                {story.title.clone()}
-                            </a>
-                            <span class="host">"("{story.domain}")"</span>
-                        </span>
-                    })
+                    Either::Left(
+                        view! {
+                            <span>
+                                <a href=story.url target="_blank" rel="noreferrer">
+                                    {story.title.clone()}
+                                </a>
+                                <span class="host">"(" {story.domain} ")"</span>
+                            </span>
+                        },
+                    )
                 } else {
                     let title = story.title.clone();
                     Either::Right(view! { <A href=format!("/stories/{}", story.id)>{title}</A> })
                 }}
+
             </span>
-            <br />
+            <br/>
             <span class="meta">
                 {if story.story_type != "job" {
-                    Either::Left(view! {
-                        <span>
-                            {"by "}
-                            {story.user.map(|user| view ! {  <A href=format!("/users/{user}")>{user.clone()}</A>})}
-                            {format!(" {} | ", story.time_ago)}
-                            <A href=format!("/stories/{}", story.id)>
-                                {if story.comments_count.unwrap_or_default() > 0 {
-                                    format!("{} comments", story.comments_count.unwrap_or_default())
-                                } else {
-                                    "discuss".into()
-                                }}
-                            </A>
-                        </span>
-                    })
+                    Either::Left(
+                        view! {
+                            <span>
+                                {"by "}
+                                {story
+                                    .user
+                                    .map(|user| {
+                                        view! {
+                                            <A href=format!("/users/{user}")>{user.clone()}</A>
+                                        }
+                                    })} {format!(" {} | ", story.time_ago)}
+                                <A href=format!(
+                                    "/stories/{}",
+                                    story.id,
+                                )>
+                                    {if story.comments_count.unwrap_or_default() > 0 {
+                                        format!(
+                                            "{} comments",
+                                            story.comments_count.unwrap_or_default(),
+                                        )
+                                    } else {
+                                        "discuss".into()
+                                    }}
+
+                                </A>
+                            </span>
+                        },
+                    )
                 } else {
                     let title = story.title.clone();
                     Either::Right(view! { <A href=format!("/item/{}", story.id)>{title}</A> })
                 }}
+
             </span>
-            {(story.story_type != "link").then(|| view! {
-                " "
-                <span class="label">{story.story_type}</span>
-            })}
+            {(story.story_type != "link")
+                .then(|| {
+                    view! {
+                        " "
+                        <span class="label">{story.story_type}</span>
+                    }
+                })}
+
         </li>
     }
+    .into_any()
 }

examples/hackernews/src/routes/story.rs

@@ -1,14 +1,12 @@
 use crate::api;
-use leptos::either::Either;
-use leptos::prelude::*;
+use leptos::{either::Either, prelude::*};
 use leptos_meta::Meta;
-use leptos_router::components::A;
-use leptos_router::hooks::use_params_map;
+use leptos_router::{components::A, hooks::use_params_map};
 
 #[component]
 pub fn Story() -> impl IntoView {
     let params = use_params_map();
-    let story = Resource::new(
+    let story = Resource::new_blocking(
         move || params.read().get("id").unwrap_or_default(),
         move |id| async move {
             if id.is_empty() {
@@ -28,18 +26,21 @@ pub fn Story() -> impl IntoView {
                     <Meta name="description" content=story.title.clone()/>
                     <div class="item-view">
                         <div class="item-view-header">
-                        <a href=story.url target="_blank">
-                            <h1>{story.title}</h1>
-                        </a>
-                        <span class="host">
-                            "("{story.domain}")"
-                        </span>
-                        {story.user.map(|user| view! {  <p class="meta">
-                            {story.points}
-                            " points | by "
-                            <A href=format!("/users/{user}")>{user.clone()}</A>
-                            {format!(" {}", story.time_ago)}
-                        </p>})}
+                            <a href=story.url target="_blank">
+                                <h1>{story.title}</h1>
+                            </a>
+                            <span class="host">"(" {story.domain} ")"</span>
+                            {story
+                                .user
+                                .map(|user| {
+                                    view! {
+                                        <p class="meta">
+                                            {story.points} " points | by "
+                                            <A href=format!("/users/{user}")>{user.clone()}</A>
+                                            {format!(" {}", story.time_ago)}
+                                        </p>
+                                    }
+                                })}
                         </div>
                         <div class="item-view-comments">
                             <p class="item-view-comments-header">
@@ -48,6 +49,7 @@ pub fn Story() -> impl IntoView {
                                 } else {
                                     "No comments yet.".into()
                                 }}
+
                             </p>
                             <ul class="comment-children">
                                 <For
@@ -55,7 +57,7 @@ pub fn Story() -> impl IntoView {
                                     key=|comment| comment.id
                                     let:comment
                                 >
-                                    <Comment comment />
+                                    <Comment comment/>
                                 </For>
                             </ul>
                         </div>
@@ -64,6 +66,7 @@ pub fn Story() -> impl IntoView {
             }
         }
     }))).build())
+    .into_any()
 }
 
 #[component]
@@ -72,43 +75,65 @@ pub fn Comment(comment: api::Comment) -> impl IntoView {
 
     view! {
         <li class="comment">
-        <div class="by">
-            <A href=format!("/users/{}", comment.user.clone().unwrap_or_default())>{comment.user.clone()}</A>
-            {format!(" {}", comment.time_ago)}
-        </div>
-        <div class="text" inner_html=comment.content></div>
-        {(!comment.comments.is_empty()).then(|| {
-            view! {
-                <div>
-                    <div class="toggle" class:open=open>
-                        <a on:click=move |_| set_open.update(|n| *n = !*n)>
-                            {
-                                let comments_len = comment.comments.len();
-                                move || if open.get() {
-                                    "[-]".into()
-                                } else {
-                                    format!("[+] {}{} collapsed", comments_len, pluralize(comments_len))
-                                }
-                            }
-                        </a>
-                    </div>
-                    {move || open.get().then({
-                        let comments = comment.comments.clone();
-                        move || view! {
-                            <ul class="comment-children">
-                                <For
-                                    each=move || comments.clone()
-                                    key=|comment| comment.id
-                                    let:comment
-                                >
-                                    <Comment comment />
-                                </For>
-                            </ul>
-                        }
-                    })}
-                </div>
-            }
-        })}
+            <div class="by">
+                <A href=format!(
+                    "/users/{}",
+                    comment.user.clone().unwrap_or_default(),
+                )>{comment.user.clone()}</A>
+                {format!(" {}", comment.time_ago)}
+            </div>
+            <div class="text" inner_html=comment.content></div>
+            {(!comment.comments.is_empty())
+                .then(|| {
+                    view! {
+                        <div>
+                            <div class="toggle" class:open=open>
+                                <a on:click=move |_| {
+                                    set_open.update(|n| *n = !*n)
+                                }>
+
+                                    {
+                                        let comments_len = comment.comments.len();
+                                        move || {
+                                            if open.get() {
+                                                "[-]".into()
+                                            } else {
+                                                format!(
+                                                    "[+] {}{} collapsed",
+                                                    comments_len,
+                                                    pluralize(comments_len),
+                                                )
+                                            }
+                                        }
+                                    }
+
+                                </a>
+                            </div>
+                            {move || {
+                                open
+                                    .get()
+                                    .then({
+                                        let comments = comment.comments.clone();
+                                        move || {
+                                            view! {
+                                                <ul class="comment-children">
+                                                    <For
+                                                        each=move || comments.clone()
+                                                        key=|comment| comment.id
+                                                        let:comment
+                                                    >
+                                                        <Comment comment/>
+                                                    </For>
+                                                </ul>
+                                            }
+                                        }
+                                    })
+                            }}
+
+                        </div>
+                    }
+                })}
+
         </li>
     }.into_any()
 }

examples/hackernews/src/routes/users.rs

@@ -1,6 +1,5 @@
 use crate::api::{self, User};
-use leptos::server::Resource;
-use leptos::{either::Either, prelude::*};
+use leptos::{either::Either, prelude::*, server::Resource};
 use leptos_router::hooks::use_params_map;
 
 #[component]
@@ -18,30 +17,48 @@ pub fn User() -> impl IntoView {
     );
     view! {
         <div class="user-view">
-            <Suspense fallback=|| view! { "Loading..." }>
-                {move || Suspend::new(async move { match user.await.clone() {
-                    None => Either::Left(view! {  <h1>"User not found."</h1> }),
-                    Some(user) => Either::Right(view! {
-                        <div>
-                            <h1>"User: " {user.id.clone()}</h1>
-                            <ul class="meta">
-                                <li>
-                                    <span class="label">"Created: "</span> {user.created}
-                                </li>
-                                <li>
-                                <span class="label">"Karma: "</span> {user.karma}
-                                </li>
-                                <li inner_html={user.about} class="about"></li>
-                            </ul>
-                            <p class="links">
-                                <a href=format!("https://news.ycombinator.com/submitted?id={}", user.id)>"submissions"</a>
-                                " | "
-                                <a href=format!("https://news.ycombinator.com/threads?id={}", user.id)>"comments"</a>
-                            </p>
-                        </div>
-                    })
-                }})}
+            <Suspense fallback=|| {
+                view! { "Loading..." }
+            }>
+                {move || Suspend::new(async move {
+                    match user.await.clone() {
+                        None => Either::Left(view! { <h1>"User not found."</h1> }),
+                        Some(user) => {
+                            Either::Right(
+                                view! {
+                                    <div>
+                                        <h1>"User: " {user.id.clone()}</h1>
+                                        <ul class="meta">
+                                            <li>
+                                                <span class="label">"Created: "</span>
+                                                {user.created}
+                                            </li>
+                                            <li>
+                                                <span class="label">"Karma: "</span>
+                                                {user.karma}
+                                            </li>
+                                            <li inner_html=user.about class="about"></li>
+                                        </ul>
+                                        <p class="links">
+                                            <a href=format!(
+                                                "https://news.ycombinator.com/submitted?id={}",
+                                                user.id,
+                                            )>"submissions"</a>
+                                            " | "
+                                            <a href=format!(
+                                                "https://news.ycombinator.com/threads?id={}",
+                                                user.id,
+                                            )>"comments"</a>
+                                        </p>
+                                    </div>
+                                },
+                            )
+                        }
+                    }
+                })}
+
             </Suspense>
         </div>
     }
+    .into_any()
 }

examples/hackernews_axum/Cargo.toml

@@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] }
 tracing = "0.1.40"
 gloo-net = { version = "0.6.0", features = ["http"] }
 reqwest = { version = "0.12.5", features = ["json"] }
-axum = { version = "0.7.5", optional = true }
+axum = { version = "0.8.1", optional = true }
 tower = { version = "0.4.13", optional = true }
 tower-http = { version = "0.5.2", features = ["fs"], optional = true }
 tokio = { version = "1.39", features = ["full"], optional = true }
@@ -47,7 +47,7 @@ ssr = [
 
 [package.metadata.cargo-all-features]
 denylist = ["axum", "tower", "tower-http", "tokio", "http", "leptos_axum"]
-skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"], []]
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name

examples/hackernews_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable" # test change
+targets = ["wasm32-unknown-unknown"]

examples/hackernews_axum/src/api.rs

@@ -1,6 +1,5 @@
 use leptos::logging;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 pub fn story(path: &str) -> String {
     format!("https://node-hnapi.herokuapp.com/{path}")

examples/hackernews_axum/src/lib.rs

@@ -4,7 +4,7 @@ mod routes;
 use leptos_meta::{provide_meta_context, Link, Meta, MetaTags, Stylesheet};
 use leptos_router::{
     components::{FlatRoutes, Route, Router, RoutingProgress},
-    ParamSegment, StaticSegment,
+    Lazy, OptionalParamSegment, ParamSegment, StaticSegment,
 };
 use routes::{nav::*, stories::*, story::*, users::*};
 use std::time::Duration;
@@ -44,11 +44,9 @@ pub fn App() -> impl IntoView {
             <Nav />
             <main>
                 <FlatRoutes fallback=|| "Not found.">
-                    <Route path=(StaticSegment("users"), ParamSegment("id")) view=User/>
-                    <Route path=(StaticSegment("stories"), ParamSegment("id")) view=Story/>
-                    <Route path=ParamSegment("stories") view=Stories/>
-                    // TODO allow optional params without duplication
-                    <Route path=StaticSegment("") view=Stories/>
+                    <Route path=(StaticSegment("users"), ParamSegment("id")) view={Lazy::<UserRoute>::new()}/>
+                    <Route path=(StaticSegment("stories"), ParamSegment("id")) view={Lazy::<StoryRoute>::new()}/>
+                    <Route path=OptionalParamSegment("stories") view=Stories/>
                 </FlatRoutes>
             </main>
         </Router>

examples/hackernews_axum/src/main.rs

@@ -1,7 +1,7 @@
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::Router;
+    use axum::{routing::get, Router};
     use hackernews_axum::{shell, App};
     use leptos::config::get_configuration;
     use leptos_axum::{generate_route_list, LeptosRoutes};
@@ -13,6 +13,15 @@ async fn main() {
 
     // build our application with a route
     let app = Router::new()
+        .route(
+            "/favicon.ico",
+            get(|| async {
+                (
+                    [("content-type", "image/x-icon")],
+                    include_bytes!("../public/favicon.ico"),
+                )
+            }),
+        )
         .leptos_routes(&leptos_options, routes, {
             let leptos_options = leptos_options.clone();
             move || shell(leptos_options.clone())

examples/hackernews_axum/src/routes/story.rs

@@ -1,26 +1,38 @@
-use crate::api;
-use leptos::either::Either;
-use leptos::prelude::*;
+use crate::api::{self, Story};
+use leptos::{either::Either, prelude::*};
 use leptos_meta::Meta;
-use leptos_router::components::A;
-use leptos_router::hooks::use_params_map;
+use leptos_router::{
+    components::A, hooks::use_params_map, lazy_route, LazyRoute,
+};
 
-#[component]
-pub fn Story() -> impl IntoView {
-    let params = use_params_map();
-    let story = Resource::new(
-        move || params.read().get("id").unwrap_or_default(),
-        move |id| async move {
-            if id.is_empty() {
-                None
-            } else {
-                api::fetch_api::<api::Story>(&api::story(&format!("item/{id}")))
+#[derive(Debug)]
+pub struct StoryRoute {
+    story: Resource<Option<Story>>,
+}
+
+#[lazy_route]
+impl LazyRoute for StoryRoute {
+    fn data() -> Self {
+        let params = use_params_map();
+        let story = Resource::new_blocking(
+            move || params.read().get("id").unwrap_or_default(),
+            move |id| async move {
+                if id.is_empty() {
+                    None
+                } else {
+                    api::fetch_api::<api::Story>(&api::story(&format!(
+                        "item/{id}"
+                    )))
                     .await
-            }
-        },
-    );
+                }
+            },
+        );
+        Self { story }
+    }
 
-    Suspense(SuspenseProps::builder().fallback(|| "Loading...").children(ToChildren::to_children(move || Suspend::new(async move {
+    fn view(this: Self) -> AnyView {
+        let StoryRoute { story } = this;
+        Suspense(SuspenseProps::builder().fallback(|| "Loading...").children(ToChildren::to_children(move || Suspend::new(async move {
         match story.await.clone() {
             None => Either::Left("Story not found."),
             Some(story) => {
@@ -63,7 +75,8 @@ pub fn Story() -> impl IntoView {
                 })
             }
         }
-    }))).build())
+    }))).build()).into_any()
+    }
 }
 
 #[component]

examples/hackernews_axum/src/routes/users.rs

@@ -1,47 +1,58 @@
 use crate::api::{self, User};
-use leptos::server::Resource;
-use leptos::{either::Either, prelude::*};
-use leptos_router::hooks::use_params_map;
+use leptos::{either::Either, prelude::*, server::Resource};
+use leptos_router::{hooks::use_params_map, lazy_route, LazyRoute};
 
-#[component]
-pub fn User() -> impl IntoView {
-    let params = use_params_map();
-    let user = Resource::new(
-        move || params.read().get("id").unwrap_or_default(),
-        move |id| async move {
-            if id.is_empty() {
-                None
-            } else {
-                api::fetch_api::<User>(&api::user(&id)).await
-            }
-        },
-    );
-    view! {
-        <div class="user-view">
-            <Suspense fallback=|| view! { "Loading..." }>
-                {move || Suspend::new(async move { match user.await.clone() {
-                    None => Either::Left(view! {  <h1>"User not found."</h1> }),
-                    Some(user) => Either::Right(view! {
-                        <div>
-                            <h1>"User: " {user.id.clone()}</h1>
-                            <ul class="meta">
-                                <li>
-                                    <span class="label">"Created: "</span> {user.created}
-                                </li>
-                                <li>
-                                <span class="label">"Karma: "</span> {user.karma}
-                                </li>
-                                <li inner_html={user.about} class="about"></li>
-                            </ul>
-                            <p class="links">
-                                <a href=format!("https://news.ycombinator.com/submitted?id={}", user.id)>"submissions"</a>
-                                " | "
-                                <a href=format!("https://news.ycombinator.com/threads?id={}", user.id)>"comments"</a>
-                            </p>
-                        </div>
-                    })
-                }})}
-            </Suspense>
-        </div>
+#[derive(Debug)]
+pub struct UserRoute {
+    user: Resource<Option<User>>,
+}
+
+#[lazy_route]
+impl LazyRoute for UserRoute {
+    fn data() -> Self {
+        let params = use_params_map();
+        let user = Resource::new(
+            move || params.read().get("id").unwrap_or_default(),
+            move |id| async move {
+                if id.is_empty() {
+                    None
+                } else {
+                    api::fetch_api::<User>(&api::user(&id)).await
+                }
+            },
+        );
+        UserRoute { user }
+    }
+
+    fn view(this: Self) -> AnyView {
+        let UserRoute { user } = this;
+        view! {
+            <div class="user-view">
+                <Suspense fallback=|| view! { "Loading..." }>
+                    {move || Suspend::new(async move { match user.await.clone() {
+                        None => Either::Left(view! {  <h1>"User not found."</h1> }),
+                        Some(user) => Either::Right(view! {
+                            <div>
+                                <h1>"User: " {user.id.clone()}</h1>
+                                <ul class="meta">
+                                    <li>
+                                        <span class="label">"Created: "</span> {user.created}
+                                    </li>
+                                    <li>
+                                    <span class="label">"Karma: "</span> {user.karma}
+                                    </li>
+                                    <li inner_html={user.about} class="about"></li>
+                                </ul>
+                                <p class="links">
+                                    <a href=format!("https://news.ycombinator.com/submitted?id={}", user.id)>"submissions"</a>
+                                    " | "
+                                    <a href=format!("https://news.ycombinator.com/threads?id={}", user.id)>"comments"</a>
+                                </p>
+                            </div>
+                        })
+                    }})}
+                </Suspense>
+            </div>
+        }.into_any()
     }
 }

examples/hackernews_islands_axum/Cargo.toml

@@ -12,7 +12,7 @@ lto = true
 
 [dependencies]
 console_error_panic_hook = "0.1.7"
-leptos = { path = "../../leptos", features = ["experimental-islands"] }
+leptos = { path = "../../leptos", features = ["islands"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
@@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] }
 tracing = "0.1.40"
 gloo-net = { version = "0.6.0", features = ["http"] }
 reqwest = { version = "0.12.5", features = ["json"] }
-axum = { version = "0.7.5", optional = true, features = ["http2"] }
+axum = { version = "0.8.1", optional = true, features = ["http2"] }
 tower = { version = "0.4.13", optional = true }
 tower-http = { version = "0.5.2", features = [
   "fs",
@@ -57,7 +57,8 @@ ssr = [
 
 [package.metadata.cargo-all-features]
 denylist = ["axum", "tower", "tower-http", "tokio", "http", "leptos_axum"]
-skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"], []]
+max_combination_size = 2
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name