fix: correctly track source in create_local_resource

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

@@ -29,4 +29,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2024-03-31
+      toolchain: nightly

.github/workflows/ci-examples.yml

@@ -24,4 +24,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2024-03-31
+      toolchain: nightly

.github/workflows/ci-semver.yml

@@ -1,22 +0,0 @@
-name: CI semver
-
-on: workflow_dispatch # Only run this workflow manually
-
-jobs:
-  get-leptos-changed:
-    uses: ./.github/workflows/get-leptos-changed.yml
-
-  test:
-    needs: [get-leptos-changed]
-    if: needs.get-leptos-changed.outputs.leptos_changed == 'true'
-    name: Run semver check (nightly-2024-03-31)
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Sember Checks
-        uses: obi1kenobi/cargo-semver-checks-action@v2
-        with:
-          rust-toolchain: nightly-2024-03-31

.github/workflows/ci.yml

@@ -40,4 +40,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2024-03-31
+      toolchain: nightly

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

@@ -31,9 +31,10 @@ jobs:
           dir_names: true
           dir_names_max_depth: "2"
           files: |
-            examples/**
-            !examples/cargo-make/**
-            !examples/gtk/**
+            examples
+            !examples/cargo-make
+            !examples/gtk
+            !examples/hackernews_js_fetch
             !examples/Makefile.toml
             !examples/*.md
           json: true

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

@@ -21,12 +21,12 @@ jobs:
 
       - name: Get example files that changed
         id: changed-files
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v41
         with:
           files: |
             examples/**
-            !examples/cargo-make/**
-            !examples/gtk/**
+            !examples/cargo-make
+            !examples/gtk
             !examples/Makefile.toml
             !examples/*.md
 

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

@@ -17,8 +17,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install jq
-        run: sudo apt-get install jq
+      - name: Install JQ Tool
+        uses: mbround18/install-jq@v1
 
       - name: Set Matrix
         id: set-matrix

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

@@ -19,7 +19,7 @@ jobs:
 
       - name: Get source files that changed
         id: changed-source
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v41
         with:
           files: |
             integrations/**

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

@@ -27,9 +27,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Rust
-        uses: dtolnay/rust-toolchain@master
+        uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ inputs.toolchain }}
+          override: true
+          components: rustfmt
 
       - name: Add wasm32-unknown-unknown
         run: rustup target add wasm32-unknown-unknown
@@ -42,18 +44,6 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
-      - name: Install binstall
-        uses: cargo-bins/cargo-binstall@main
-
-      - name: Install wasm-bindgen
-        run: cargo binstall wasm-bindgen-cli --no-confirm
-
-      - name: Install wasm-pack
-        run: cargo binstall wasm-pack --no-confirm
-
-      - name: Install cargo-leptos
-        run: cargo binstall cargo-leptos --no-confirm
-
       - name: Install Trunk
         uses: jetli/trunk-action@v0.4.0
         with:
@@ -65,9 +55,9 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 18
 
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v2
         name: Install pnpm
         id: pnpm-install
         with:
@@ -79,7 +69,7 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v3
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
@@ -117,11 +107,6 @@ jobs:
             fi
           done
 
-      - name: Install Deno
-        uses: denoland/setup-deno@v1
-        with:
-          deno-version: v1.x
-
       # Run Cargo Make Task
       - name: ${{ inputs.cargo_make_task }}
         run: |

Cargo.toml

@@ -25,23 +25,22 @@ members = [
 exclude = ["benchmarks", "examples"]
 
 [workspace.package]
-version = "0.6.9"
-rust-version = "1.75"
+version = "0.6.3"
 
 [workspace.dependencies]
-leptos = { path = "./leptos", version = "0.6.9" }
-leptos_dom = { path = "./leptos_dom", version = "0.6.9" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.6.9" }
-leptos_macro = { path = "./leptos_macro", version = "0.6.9" }
-leptos_reactive = { path = "./leptos_reactive", version = "0.6.9" }
-leptos_server = { path = "./leptos_server", version = "0.6.9" }
-server_fn = { path = "./server_fn", version = "0.6.9" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.6.9" }
+leptos = { path = "./leptos", version = "0.6.3" }
+leptos_dom = { path = "./leptos_dom", version = "0.6.3" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.6.3" }
+leptos_macro = { path = "./leptos_macro", version = "0.6.3" }
+leptos_reactive = { path = "./leptos_reactive", version = "0.6.3" }
+leptos_server = { path = "./leptos_server", version = "0.6.3" }
+server_fn = { path = "./server_fn", version = "0.6.3" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.6.3" }
 server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.6" }
-leptos_config = { path = "./leptos_config", version = "0.6.9" }
-leptos_router = { path = "./router", version = "0.6.9" }
-leptos_meta = { path = "./meta", version = "0.6.9" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.6.9" }
+leptos_config = { path = "./leptos_config", version = "0.6.3" }
+leptos_router = { path = "./router", version = "0.6.3" }
+leptos_meta = { path = "./meta", version = "0.6.3" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.6.3" }
 
 [profile.release]
 codegen-units = 1

README.md

@@ -150,7 +150,7 @@ There are several people in the community using Leptos right now for internal ap
 
 ### Can I use this for native GUI?
 
-Sure! Obviously the `view` macro is for generating DOM nodes but you can use the reactive system to drive any native GUI toolkit that uses the same kind of object-oriented, event-callback-based framework as the DOM pretty easily. The principles are the same:
+Sure! Obviously the `view` macro is for generating DOM nodes but you can use the reactive system to drive native any GUI toolkit that uses the same kind of object-oriented, event-callback-based framework as the DOM pretty easily. The principles are the same:
 
 - Use signals, derived signals, and memos to create your reactive system
 - Create GUI widgets

benchmarks/Cargo.toml

@@ -2,7 +2,6 @@
 name = "benchmarks"
 version = "0.1.0"
 edition = "2021"
-rust-version.workspace = true
 
 [dependencies]
 l0410 = { package = "leptos", version = "0.4.10", features = [

cargo-make/check.toml

@@ -3,5 +3,5 @@ alias = "check-all"
 
 [tasks.check-all]
 command = "cargo"
-args = ["+nightly-2024-03-31", "check-all-features"]
+args = ["+nightly", "check-all-features"]
 install_crate = "cargo-all-features"

cargo-make/lint.toml

@@ -8,11 +8,4 @@ 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",
-]
+args = ["hack", "clippy", "--all", "--each-feature", "--no-dev-deps"]

cargo-make/test.toml

@@ -3,5 +3,5 @@ alias = "test-all"
 
 [tasks.test-all]
 command = "cargo"
-args = ["+nightly-2024-03-31", "test-all-features"]
+args = ["+nightly", "test-all-features"]
 install_crate = "cargo-all-features"

examples/Makefile.toml

@@ -5,7 +5,6 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = ""
 CARGO_MAKE_WORKSPACE_EMULATION = true
 CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
-  "action-form-error-handling",
   "animated_show",
   "counter",
   "counter_isomorphic",
@@ -13,33 +12,27 @@ CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
   "counters_stable",
   "counter_url_query",
   "counter_without_macros",
-  "directives",
   "error_boundary",
   "errors_axum",
   "fetch",
   "hackernews",
   "hackernews_axum",
-  "hackernews_islands_axum",
-  "hackernews_js_fetch",
   "js-framework-benchmark",
   "login_with_token_csr_only",
   "parent_child",
-  "portal",
   "router",
   "server_fns_axum",
   "session_auth_axum",
   "slots",
-  "sso_auth_axum",
   "ssr_modes",
   "ssr_modes_axum",
   "suspense_tests",
   "tailwind_actix",
-  "tailwind_axum",
   "tailwind_csr",
+  "tailwind_axum",
   "timer",
   "todo_app_sqlite",
   "todo_app_sqlite_axum",
-  "todo_app_sqlite_csr",
   "todomvc",
 ]
 
@@ -58,5 +51,103 @@ echo "CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = $examples"
 
 [tasks.test-report]
 workspace = false
-description = "show the cargo-make configuration for web examples [web|all|help]"
-script = { file = "./cargo-make/scripts/web-report.sh" }
+description = "report web testing technology used by examples - OPTION: [all]"
+script = '''
+set -emu
+
+BOLD="\e[1m"
+GREEN="\e[0;32m"
+ITALIC="\e[3m"
+YELLOW="\e[0;33m"
+RESET="\e[0m"
+
+echo
+echo "${YELLOW}Web Test Technology${RESET}"
+echo
+
+makefile_paths=$(find . -name Makefile.toml -not -path '*/target/*' -not -path '*/node_modules/*' |
+  sed 's%./%%' |
+  sed 's%/Makefile.toml%%' |
+  grep -v Makefile.toml |
+  sort -u)
+
+start_path=$(pwd)
+
+for path in $makefile_paths; do
+  cd $path
+
+  crate_symbols=
+
+  pw_count=$(find . -name playwright.config.ts | wc -l)
+
+  while read -r line; do
+      case $line in
+      *"cucumber"*)
+          crate_symbols=$crate_symbols"C"
+          ;;
+      *"fantoccini"*)
+          crate_symbols=$crate_symbols"D"
+          ;;
+      esac
+  done <"./Cargo.toml"
+
+  while read -r line; do
+    case $line in
+      *"cargo-make/wasm-test.toml"*)
+          crate_symbols=$crate_symbols"W"
+        ;;
+      *"cargo-make/playwright-test.toml"*)
+          crate_symbols=$crate_symbols"P"
+          crate_symbols=$crate_symbols"N"
+        ;;
+      *"cargo-make/playwright-trunk-test.toml"*)
+          crate_symbols=$crate_symbols"P"
+          crate_symbols=$crate_symbols"T"
+        ;;
+      *"cargo-make/trunk_server.toml"*)
+          crate_symbols=$crate_symbols"T"
+        ;;
+      *"cargo-make/cargo-leptos-webdriver-test.toml"*)
+          crate_symbols=$crate_symbols"L"
+        ;;
+      *"cargo-make/cargo-leptos-test.toml"*)
+          crate_symbols=$crate_symbols"L"
+          if [ $pw_count -gt 0 ]; then
+            crate_symbols=$crate_symbols"P"
+          fi
+        ;;
+    esac
+  done <"./Makefile.toml"
+
+  # Sort list of tools
+  sorted_crate_symbols=$(echo ${crate_symbols} | grep -o . | sort | tr -d "\n") 
+
+  formatted_crate_symbols=" ➤ ${BOLD}${YELLOW}${sorted_crate_symbols}${RESET}"
+  crate_line=$path
+  if [ ! -z ${1+x} ]; then
+    # Show all examples
+    if [ ! -z $crate_symbols ]; then
+      crate_line=$crate_line$formatted_crate_symbols
+    fi
+    echo $crate_line
+  elif [ ! -z $crate_symbols ]; then
+    # Filter out examples that do not run tests in `ci`
+    crate_line=$crate_line$formatted_crate_symbols
+    echo $crate_line
+  fi
+
+  cd ${start_path}
+done
+
+c="${BOLD}${YELLOW}C${RESET} = Cucumber"
+d="${BOLD}${YELLOW}D${RESET} = WebDriver"
+l="${BOLD}${YELLOW}L${RESET} = Cargo Leptos"
+n="${BOLD}${YELLOW}N${RESET} = Node"
+p="${BOLD}${YELLOW}P${RESET} = Playwright"
+t="${BOLD}${YELLOW}T${RESET} = Trunk"
+w="${BOLD}${YELLOW}W${RESET} = WASM"
+
+echo
+echo "${ITALIC}Keys:${RESET} $c, $d, $l, $n, $p, $t, $w"
+echo
+'''

examples/README.md

@@ -16,7 +16,7 @@ You can also run any of the examples using [`cargo-make`](https://github.com/sag
 
 Follow these steps to get any example up and running.
 
-1. `cd` to the example you want to run
+1. `cd` to the example root directory
 2. Run `cargo make ci` to setup and test the example
 3. Run `cargo make start` to run the example
 4. Open the client URL in the console output (<http://127.0.0.1:8080> or <http://127.0.0.1:3000> by default)

examples/cargo-make/cargo-leptos.toml

@@ -15,13 +15,13 @@ clear = true
 dependencies = ["check-debug", "check-release"]
 
 [tasks.check-debug]
-toolchain = "nightly-2024-03-31"
+toolchain = "nightly"
 command = "cargo"
 args = ["check-all-features"]
 install_crate = "cargo-all-features"
 
 [tasks.check-release]
-toolchain = "nightly-2024-03-31"
+toolchain = "nightly"
 command = "cargo"
 args = ["check-all-features", "--release"]
 install_crate = "cargo-all-features"

examples/cargo-make/clean.toml

@@ -4,13 +4,11 @@ dependencies = [
   "clean-trunk",
   "clean-node_modules",
   "clean-playwright",
-  "clean-pkg",
 ]
 
 [tasks.clean-cargo]
-script = '''
-find . -type d -name target | xargs rm -rf
-'''
+command = "rm"
+args = ["-rf", "target"]
 
 [tasks.clean-trunk]
 script = '''
@@ -29,8 +27,3 @@ fi
 script = '''
 find . -name playwright-report -name playwright -name test-results | xargs rm -rf
 '''
-
-[tasks.clean-pkg]
-script = '''
-find . -type d -name pkg | xargs rm -rf
-'''

examples/cargo-make/client-process.toml

@@ -3,36 +3,32 @@
 [tasks.stop-client]
 condition = { env_set = ["CLIENT_PROCESS_NAME"] }
 script = '''
-  if pidof -q ${CLIENT_PROCESS_NAME}; then
-    echo "  Stopping ${CLIENT_PROCESS_NAME}"
+  if [ ! -z $(pidof ${CLIENT_PROCESS_NAME}) ]; then
     pkill -ef ${CLIENT_PROCESS_NAME}
-  else
-    echo "  ${CLIENT_PROCESS_NAME} is already stopped"
   fi
 '''
 
 [tasks.client-status]
 condition = { env_set = ["CLIENT_PROCESS_NAME"] }
 script = '''
-  if pidof -q ${CLIENT_PROCESS_NAME}; then
-    echo "  ${CLIENT_PROCESS_NAME} is up"
-  else
+  if [ -z $(pidof ${CLIENT_PROCESS_NAME}) ]; then
     echo "  ${CLIENT_PROCESS_NAME} is not running"
+  else
+    echo "  ${CLIENT_PROCESS_NAME} is up"
   fi
 '''
 
 [tasks.maybe-start-client]
 condition = { env_set = ["CLIENT_PROCESS_NAME"] }
 script = '''
-  if pidof -q ${CLIENT_PROCESS_NAME}; then
-    echo "  ${CLIENT_PROCESS_NAME} is already started"
-  else
+  if [ -z $(pidof ${CLIENT_PROCESS_NAME}) ]; then
     echo "  Starting ${CLIENT_PROCESS_NAME}"
-    if [ -n "${SPAWN_CLIENT_PROCESS}" ];then
-      echo "Spawning process..."
+    if [ -z ${SPAWN_CLIENT_PROCESS} ];then
       cargo make start-client ${@} &
     else
       cargo make start-client ${@}
     fi
+  else
+    echo "  ${CLIENT_PROCESS_NAME} is already started"
   fi
 '''

examples/cargo-make/compile.toml

@@ -1,11 +1,11 @@
 [tasks.build]
-toolchain = "nightly-2024-03-31"
+toolchain = "nightly"
 command = "cargo"
 args = ["build-all-features"]
 install_crate = "cargo-all-features"
 
 [tasks.check]
-toolchain = "nightly-2024-03-31"
+toolchain = "nightly"
 command = "cargo"
 args = ["check-all-features"]
 install_crate = "cargo-all-features"

examples/cargo-make/deno-build.toml

@@ -1,24 +0,0 @@
-[tasks.build]
-clear = true
-command = "deno"
-args = ["task", "build"]
-
-[tasks.start-client]
-command = "deno"
-args = ["task", "start"]
-
-[tasks.check]
-clear = true
-dependencies = ["check-debug", "check-release"]
-
-[tasks.check-debug]
-toolchain = "nightly-2024-03-31"
-command = "cargo"
-args = ["check-all-features"]
-install_crate = "cargo-all-features"
-
-[tasks.check-release]
-toolchain = "nightly-2024-03-31"
-command = "cargo"
-args = ["check-all-features", "--release"]
-install_crate = "cargo-all-features"

examples/cargo-make/lint.toml

@@ -1,5 +1,5 @@
 [tasks.pre-clippy]
-env = { CARGO_MAKE_CLIPPY_ARGS = "--no-deps --all-targets --all-features -- -D warnings" }
+env = { CARGO_MAKE_CLIPPY_ARGS = "--all-targets --all-features -- -D warnings" }
 
 [tasks.check-style]
 dependencies = ["check-format-flow", "clippy-flow"]

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

@@ -6,17 +6,9 @@ extend = [
 [tasks.integration-test]
 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 }
+dependencies = ["start", "wait-one", "test-playwright", "stop"]
 
-[tasks.wait-test-stop]
-private = true
-dependencies = ["wait-server", "test-playwright", "stop"]
-
-[tasks.wait-server]
+[tasks.wait-one]
 script = '''
-for run in {1..12}; do
-    echo "Waiting to ensure server is started..."
-    sleep 10
-done
-echo "Times up, running tests"
+sleep 1
 '''

examples/cargo-make/scripts/web-report.sh

@@ -1,176 +0,0 @@
-#!/bin/bash
-
-set -emu
-
-BOLD="\e[1m"
-ITALIC="\e[3m"
-YELLOW="\e[1;33m"
-BLUE="\e[1;36m"
-RESET="\e[0m"
-
-function web { #task: only include examples with web cargo-make configuration
-    print_header
-    print_crate_tags "$@"
-    print_footer
-}
-
-function all { #task: includes all examples
-    print_header
-    print_crate_tags "all"
-    print_footer
-}
-
-function print_header {
-    echo -e "${YELLOW}Cargo Make Web Report${RESET}"
-    echo
-    echo -e "${ITALIC}Show how crates are configured to run and test web examples with cargo-make${RESET}"
-    echo
-}
-
-function print_crate_tags {
-    local makefile_paths
-    makefile_paths=$(find_makefile_lines)
-
-    local start_path
-    start_path=$(pwd)
-
-    for path in $makefile_paths; do
-        cd "$path"
-
-        local crate_tags=
-
-        # Add cargo tags
-        while read -r line; do
-            case $line in
-            *"cucumber"*)
-                crate_tags=$crate_tags"C"
-                ;;
-            *"fantoccini"*)
-                crate_tags=$crate_tags"F"
-                ;;
-            *"package.metadata.leptos"*)
-                crate_tags=$crate_tags"M"
-                ;;
-            esac
-        done <"./Cargo.toml"
-
-        #Add makefile tags
-
-        local pw_count
-        pw_count=$(find . -name playwright.config.ts | wc -l)
-
-        while read -r line; do
-            case $line in
-            *"cargo-make/wasm-test.toml"*)
-                crate_tags=$crate_tags"W"
-                ;;
-            *"cargo-make/playwright-test.toml"*)
-                crate_tags=$crate_tags"P"
-                crate_tags=$crate_tags"N"
-                ;;
-            *"cargo-make/playwright-trunk-test.toml"*)
-                crate_tags=$crate_tags"P"
-                crate_tags=$crate_tags"T"
-                ;;
-            *"cargo-make/trunk_server.toml"*)
-                crate_tags=$crate_tags"T"
-                ;;
-            *"cargo-make/cargo-leptos-webdriver-test.toml"*)
-                crate_tags=$crate_tags"L"
-                ;;
-            *"cargo-make/cargo-leptos-test.toml"*)
-                crate_tags=$crate_tags"L"
-                if [ "$pw_count" -gt 0 ]; then
-                    crate_tags=$crate_tags"P"
-                fi
-                ;;
-            *"cargo-make/cargo-leptos.toml"*)
-                crate_tags=$crate_tags"L"
-                ;;
-            *"cargo-make/deno-build.toml"*)
-                crate_tags=$crate_tags"D"
-                ;;
-            esac
-        done <"./Makefile.toml"
-
-        # Sort tags
-        local keys
-        keys=$(echo "$crate_tags" | grep -o . | sort | tr -d "\n")
-
-        # Find leptos projects that are not configured to build with cargo-leptos
-        keys=${keys//"LM"/"L"}
-
-        # Find leptos projects that are not configured to build with deno
-        keys=${keys//"DM"/"D"}
-
-        # Maybe print line
-        local crate_line=$path
-
-        if [ -n "$crate_tags" ]; then
-            local color=$YELLOW
-            case $keys in
-            *"M"*)
-                color=$BLUE
-                ;;
-            esac
-
-            crate_line="$crate_line ➤ ${color}$keys${RESET}"
-            echo -e "$crate_line"
-        elif [ "$#" -gt 0 ]; then
-            crate_line="${BOLD}$crate_line${RESET}"
-            echo -e "$crate_line"
-        fi
-
-        cd "$start_path"
-    done
-}
-
-function find_makefile_lines {
-    find . -name Makefile.toml -not -path '*/target/*' -not -path '*/node_modules/*' |
-        sed 's%./%%' |
-        sed 's%/Makefile.toml%%' |
-        grep -v Makefile.toml |
-        sort -u
-}
-
-function print_footer {
-    c="${BOLD}${YELLOW}C${RESET} = Cucumber Test Runner"
-    d="${BOLD}${YELLOW}D${RESET} = Deno"
-    f="${BOLD}${YELLOW}F${RESET} = Fantoccini WebDriver"
-    l="${BOLD}${YELLOW}L${RESET} = Cargo Leptos"
-    m="${BOLD}${BLUE}M${RESET} = Cargo Leptos Metadata Only (${ITALIC}ci is not configured to build with cargo-leptos or deno${RESET})"
-    n="${BOLD}${YELLOW}N${RESET} = Node"
-    p="${BOLD}${YELLOW}P${RESET} = Playwright Test"
-    t="${BOLD}${YELLOW}T${RESET} = Trunk"
-    w="${BOLD}${YELLOW}W${RESET} = WASM Test"
-
-    echo
-    echo -e "${ITALIC}Report Keys:${RESET}\n $c\n $d\n $f\n $l\n $m\n $n\n $p\n $t\n $w"
-    echo
-}
-
-###################
-# HELP
-###################
-
-function list_help_for {
-    local task=$1
-    grep -E "^function.+ #$task" "$0" |
-        sed 's/function/ /' |
-        sed -e "s| { #$task: |~|g" |
-        column -s"~" -t |
-        sort
-}
-
-function help { #help: show task descriptions
-    echo -e "${BOLD}Usage:${RESET} ./$(basename "$0") <task> [options]"
-    echo
-    echo "Show the cargo-make configuration for web examples"
-    echo
-    echo -e "${BOLD}Tasks:${RESET}"
-    list_help_for task
-    echo
-}
-
-TIMEFORMAT="./web-report.sh completed in %3lR"
-time "${@:-all}" # Show the report by default

examples/cargo-make/server-process.toml

@@ -3,21 +3,18 @@
 [tasks.stop-server]
 condition = { env_set = ["SERVER_PROCESS_NAME"] }
 script = '''
-  if pidof -q ${SERVER_PROCESS_NAME}; then
-    echo "  Stopping ${SERVER_PROCESS_NAME}"
+  if [ ! -z $(pidof ${SERVER_PROCESS_NAME}) ]; then
     pkill -ef ${SERVER_PROCESS_NAME}
-  else
-    echo "  ${SERVER_PROCESS_NAME} is already stopped"
   fi
 '''
 
 [tasks.server-status]
 condition = { env_set = ["SERVER_PROCESS_NAME"] }
 script = '''
-  if pidof -q ${SERVER_PROCESS_NAME}; then
-    echo "  ${SERVER_PROCESS_NAME} is up"
-  else
+  if [ -z $(pidof ${SERVER_PROCESS_NAME}) ]; then
     echo "  ${SERVER_PROCESS_NAME} is not running"
+  else
+    echo "  ${SERVER_PROCESS_NAME} is up"
   fi
 '''
 
@@ -27,11 +24,11 @@ script = '''
   YELLOW="\e[0;33m"
   RESET="\e[0m"
 
-  if pidof -q ${SERVER_PROCESS_NAME}; then
-    echo "  ${SERVER_PROCESS_NAME} is already started"
-  else
+  if [ -z $(pidof ${SERVER_PROCESS_NAME}) ]; then
     echo "  Starting ${SERVER_PROCESS_NAME}"
     echo "  ${YELLOW}>> Run cargo make stop to end process${RESET}"
     cargo make start-server ${@} & 
+  else
+    echo "  ${SERVER_PROCESS_NAME} is already started"
   fi
 '''

examples/cargo-make/webdriver.toml

@@ -6,33 +6,25 @@ script = '''
   RESET="\e[0m"
 
   if command -v chromedriver; then
-    if pidof -q chromedriver; then
-      echo "  chromedriver is already started"
-    else
-      echo "Starting chomedriver"
+    if [ -z $(pidof chromedriver) ]; then
       chromedriver --port=4444 &
     fi
   else
-    echo "${RED}${BOLD}ERROR${RESET} - chromedriver not found"
+    echo "${RED}${BOLD}ERROR${RESET} - chromedriver is required by this task"
     exit 1
   fi
 '''
 
 [tasks.stop-webdriver]
 script = '''
-  if pidof -q chromedriver; then
-    echo "  Stopping chromedriver"
-    pkill -ef "chromedriver"
-  else
-    echo "  chromedriver is already stopped"
-  fi
+  pkill -f "chromedriver"
 '''
 
 [tasks.webdriver-status]
 script = '''
-  if pidof -q chromedriver; then
-    echo chromedriver is up
-  else
+  if [ -z $(pidof chromedriver) ]; then
     echo chromedriver is not running
+  else
+    echo chromedriver is up
   fi
 '''

examples/counter/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/counter_isomorphic/Cargo.toml

@@ -25,7 +25,7 @@ leptos_router = { path = "../../router" }
 log = "0.4"
 once_cell = "1.18"
 gloo-net = { git = "https://github.com/rustwasm/gloo" }
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.87"
 serde = { version = "1", features = ["derive"] }
 simple_logger = "4.3"
 tracing = { version = "0.1", optional = true }
@@ -69,7 +69,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/counter_isomorphic/src/counters.rs

@@ -132,6 +132,15 @@ pub fn Counter() -> impl IntoView {
         |_| get_server_count(),
     );
 
+    let value =
+        move || counter.get().map(|count| count.unwrap_or(0)).unwrap_or(0);
+    let error_msg = move || {
+        counter.get().and_then(|res| match res {
+            Ok(_) => None,
+            Err(e) => Some(e),
+        })
+    };
+
     view! {
         <div>
             <h2>"Simple Counter"</h2>
@@ -141,24 +150,15 @@ pub fn Counter() -> impl IntoView {
             <div>
                 <button on:click=move |_| clear.dispatch(())>"Clear"</button>
                 <button on:click=move |_| dec.dispatch(())>"-1"</button>
-                <span>
-                    "Value: "
-                    <Suspense>
-                        {move || counter.and_then(|count| *count)} "!"
-                    </Suspense>
-                </span>
+                <span>"Value: " {value} "!"</span>
                 <button on:click=move |_| inc.dispatch(())>"+1"</button>
             </div>
-            <Suspense>
-              {move || {
-                counter.get().and_then(|res| match res {
-                  Ok(_) => None,
-                  Err(e) => Some(e),
-                }).map(|msg| {
-                  view! { <p>"Error: " {msg.to_string()}</p> }
-                })
-              }}
-            </Suspense>
+            {move || {
+                error_msg()
+                    .map(|msg| {
+                        view! { <p>"Error: " {msg.to_string()}</p> }
+                    })
+            }}
         </div>
     }
 }
@@ -204,7 +204,7 @@ pub fn FormCounter() -> impl IntoView {
                     <input type="hidden" name="msg" value="form value down"/>
                     <input type="submit" value="-1"/>
                 </ActionForm>
-                <span>"Value: " <Suspense>{move || value().to_string()} "!"</Suspense></span>
+                <span>"Value: " {move || value().to_string()} "!"</span>
                 <ActionForm action=adjust>
                     <input type="hidden" name="delta" value="1"/>
                     <input type="hidden" name="msg" value="form value up"/>

examples/counter_url_query/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/counter_without_macros/Cargo.toml

@@ -2,7 +2,6 @@
 name = "counter_without_macros"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.75"
 
 [profile.release]
 codegen-units = 1
@@ -15,7 +14,7 @@ log = "0.4"
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.84"
 wasm-bindgen-test = "0.3.34"
 pretty_assertions = "1.3.0"
 rstest = "0.17.0"

examples/counter_without_macros/src/lib.rs

@@ -1,4 +1,4 @@
-use leptos::{html::*, *};
+use leptos::{ev, html::*, *};
 
 /// A simple counter view.
 // A component is really just a function call: it runs once to create the DOM and reactive system

examples/counters/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/counters/src/lib.rs

@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::{For, *};
 
 const MANY_COUNTERS: usize = 1000;
 

examples/counters_stable/Cargo.toml

@@ -2,7 +2,6 @@
 name = "counters_stable"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.75"
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
@@ -12,7 +11,7 @@ console_log = "1"
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.87"
 wasm-bindgen-test = "0.3.37"
 pretty_assertions = "1.4.0"
 

examples/directives/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/directives/src/lib.rs

@@ -1,6 +1,5 @@
 use leptos::{ev::click, html::AnyElement, *};
 
-// no extra parameter
 pub fn highlight(el: HtmlElement<AnyElement>) {
     let mut highlighted = false;
 
@@ -15,7 +14,6 @@ pub fn highlight(el: HtmlElement<AnyElement>) {
     });
 }
 
-// one extra parameter
 pub fn copy_to_clipboard(el: HtmlElement<AnyElement>, content: &str) {
     let content = content.to_string();
 
@@ -33,35 +31,6 @@ pub fn copy_to_clipboard(el: HtmlElement<AnyElement>, content: &str) {
     });
 }
 
-// custom parameter
-
-#[derive(Clone)]
-pub struct Amount(usize);
-
-impl From<usize> for Amount {
-    fn from(value: usize) -> Self {
-        Self(value)
-    }
-}
-
-// a 'default' value if no value is passed in
-impl From<()> for Amount {
-    fn from(_: ()) -> Self {
-        Self(1)
-    }
-}
-
-// .into() will automatically be called on the parameter
-pub fn add_dot(el: HtmlElement<AnyElement>, amount: Amount) {
-    _ = el.clone().on(click, move |_| {
-        el.set_inner_text(&format!(
-            "{}{}",
-            el.inner_text(),
-            ".".repeat(amount.0)
-        ))
-    })
-}
-
 #[component]
 pub fn SomeComponent() -> impl IntoView {
     view! {
@@ -77,11 +46,6 @@ pub fn App() -> impl IntoView {
 
     view! {
         <a href="#" use:copy_to_clipboard=data>"Copy \"" {data} "\" to clipboard"</a>
-        // automatically applies the directive to every root element in `SomeComponent`
         <SomeComponent use:highlight />
-        // no value will default to `().into()`
-        <button use:add_dot>"Add a dot"</button>
-        // `5.into()` automatically called
-        <button use:add_dot=5>"Add 5 dots"</button>
     }
 }

examples/error_boundary/README.md

@@ -8,7 +8,7 @@ See the [Examples README](../README.md) for setup and run instructions.
 
 ## Testing
 
-This project is configured to run start and stop of processes for integration tests without the use of Cargo Leptos or Node.
+This project is configured to run start and stop of processes for integration tests wihtout the use of Cargo Leptos or Node.
 
 ## Quick Start
 

examples/error_boundary/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/errors_axum/Cargo.toml

@@ -61,7 +61,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/errors_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/errors_axum/src/error_template.rs

@@ -1,5 +1,5 @@
 use crate::errors::AppError;
-use leptos::{logging::log, *};
+use leptos::{logging::log, Errors, *};
 #[cfg(feature = "ssr")]
 use leptos_axum::ResponseOptions;
 

examples/fetch/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/gtk/Makefile.toml

@@ -0,0 +1,8 @@
+[env]
+VERIFY_GTK = false
+
+[tasks.verify-flow]
+condition = { env_set = ["VERIFY_GTK"] }
+
+[tasks.verify]
+condition = { env_set = ["VERIFY_GTK"] }

examples/hackernews/Cargo.toml

@@ -70,7 +70,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/hackernews/src/routes/stories.rs

@@ -62,18 +62,16 @@ pub fn Stories() -> impl IntoView {
                     }}
                 </span>
                 <span>"page " {page}</span>
-                <Suspense>
-                    <span class="page-link"
-                        class:disabled=hide_more_link
-                        aria-hidden=hide_more_link
+                <span class="page-link"
+                    class:disabled=hide_more_link
+                    aria-hidden=hide_more_link
+                >
+                    <a href=move || format!("/{}?page={}", story_type(), page() + 1)
+                        aria-label="Next Page"
                     >
-                        <a href=move || format!("/{}?page={}", story_type(), page() + 1)
-                            aria-label="Next Page"
-                        >
-                            "more >"
-                        </a>
-                    </span>
-                </Suspense>
+                        "more >"
+                    </a>
+                </span>
             </div>
             <main class="news-list">
                 <div>

examples/hackernews_axum/Cargo.toml

@@ -71,7 +71,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/hackernews_islands_axum/Cargo.toml

@@ -81,7 +81,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews_islands_axum/Makefile.toml

@@ -1,8 +1 @@
-extend = [
-    { path = "../cargo-make/main.toml" },
-    { path = "../cargo-make/cargo-leptos.toml" },
-]
-
-[env]
-
-CLIENT_PROCESS_NAME = "hackernews_islands"
+extend = [{ path = "../cargo-make/main.toml" }]

examples/hackernews_islands_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/hackernews_js_fetch/Cargo.toml

@@ -78,7 +78,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews_js_fetch/Makefile.toml

@@ -1,8 +1 @@
-extend = [
-    { path = "../cargo-make/main.toml" },
-    { path = "../cargo-make/deno-build.toml" },
-]
-
-[env]
-
-CLIENT_PROCESS_NAME = "deno"
+extend = [{ path = "../cargo-make/main.toml" }]

examples/js-framework-benchmark/Makefile.toml

@@ -5,13 +5,13 @@ extend = [
 ]
 
 [tasks.build]
-toolchain = "nightly-2024-03-31"
+toolchain = "nightly"
 command = "cargo"
 args = ["build-all-features", "--target", "wasm32-unknown-unknown"]
 install_crate = "cargo-all-features"
 
 [tasks.check]
-toolchain = "nightly-2024-03-31"
+toolchain = "nightly"
 command = "cargo"
 args = ["check-all-features", "--target", "wasm32-unknown-unknown"]
 install_crate = "cargo-all-features"

examples/js-framework-benchmark/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/login_with_token_csr_only/client/src/components/credentials.rs

@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::{ev, *};
 
 #[component]
 pub fn CredentialsForm(

examples/login_with_token_csr_only/server/src/application.rs

@@ -16,7 +16,7 @@ impl AppState {
         credentials: Credentials,
     ) -> Result<(), CreateUserError> {
         let Credentials { email, password } = credentials;
-        let user_exists = self.users.contains_key(&email);
+        let user_exists = self.users.get(&email).is_some();
         if user_exists {
             return Err(CreateUserError::UserExists);
         }
@@ -124,7 +124,6 @@ impl EmailAddress {
 #[derive(Clone)]
 pub struct CurrentUser {
     pub email: EmailAddress,
-    #[allow(dead_code)] // possibly a lint regression, this is used at line 65
     pub token: Uuid,
 }
 

examples/parent_child/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/portal/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/router/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/server_fns_axum/Cargo.toml

@@ -15,7 +15,7 @@ leptos = { path = "../../leptos", features = ["nightly"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta", features = ["nightly"] }
 leptos_router = { path = "../../router", features = ["nightly"] }
-server_fn = { path = "../../server_fn", features = ["serde-lite", "rkyv", "multipart"] }
+server_fn = { path = "../../server_fn", features = ["serde-lite", "rkyv", "multipart" ]}
 log = "0.4"
 simple_logger = "4.0"
 serde = { version = "1", features = ["derive"] }
@@ -31,9 +31,6 @@ web-sys = { version = "0.3.67", features = ["FileList", "File"] }
 strum = { version = "0.25.0", features = ["strum_macros", "derive"] }
 notify = { version = "6.1.1", optional = true }
 pin-project-lite = "0.2.13"
-dashmap = { version = "5.5.3", optional = true }
-once_cell = { version = "1.19.0", optional = true }
-async-broadcast = { version = "0.6.0", optional = true }
 
 [features]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
@@ -46,10 +43,7 @@ ssr = [
 	"leptos_meta/ssr",
 	"leptos_router/ssr",
 	"dep:leptos_axum",
-	"dep:notify",
-	"dep:dashmap",
-	"dep:once_cell",
-	"dep:async-broadcast",
+	"dep:notify"
 ]
 
 [package.metadata.cargo-all-features]
@@ -77,7 +71,7 @@ end2end-cmd = "cargo make test-ui"
 end2end-dir = "e2e"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/server_fns_axum/migrations/20221118172000_create_todo_table.sql

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

examples/server_fns_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/server_fns_axum/src/app.rs

@@ -5,15 +5,13 @@ use leptos_meta::{provide_meta_context, Link, Meta, Stylesheet};
 use leptos_router::{ActionForm, Route, Router, Routes};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use server_fn::{
-    client::{browser::BrowserClient, Client},
     codec::{
         Encoding, FromReq, FromRes, GetUrl, IntoReq, IntoRes, MultipartData,
         MultipartFormData, Rkyv, SerdeLite, StreamingText, TextStream,
     },
-    request::{browser::BrowserRequest, ClientReq, Req},
-    response::{browser::BrowserResponse, ClientRes, Res},
+    request::{ClientReq, Req},
+    response::{ClientRes, Res},
 };
-use std::future::Future;
 #[cfg(feature = "ssr")]
 use std::sync::{
     atomic::{AtomicU8, Ordering},
@@ -57,10 +55,8 @@ pub fn HomePage() -> impl IntoView {
         <ServerFnArgumentExample/>
         <RkyvExample/>
         <FileUpload/>
-        <FileUploadWithProgress/>
         <FileWatcher/>
         <CustomEncoding/>
-        <CustomClientExample/>
     }
 }
 
@@ -320,7 +316,7 @@ pub fn RkyvExample() -> impl IntoView {
                 set_input(value);
             }
         >
-            Click to capitalize
+            Click to see length
         </button>
         <p>{input}</p>
         <Transition>
@@ -335,8 +331,8 @@ pub fn FileUpload() -> impl IntoView {
     ///
     /// On the server, this uses the `multer` crate, which provides a streaming API.
     #[server(
-        input = MultipartFormData,
-    )]
+    input = MultipartFormData,
+)]
     pub async fn file_length(
         data: MultipartData,
     ) -> Result<usize, ServerFnError> {
@@ -394,168 +390,6 @@ pub fn FileUpload() -> impl IntoView {
     }
 }
 
-/// This component uses server functions to upload a file, while streaming updates on the upload
-/// progress.
-#[component]
-pub fn FileUploadWithProgress() -> impl IntoView {
-    /// In theory, you could create a single server function which
-    /// 1) received multipart form data
-    /// 2) returned a stream that contained updates on the progress
-    ///
-    /// In reality, browsers do not actually support duplexing requests in this way. In other
-    /// words, every existing browser actually requires that the request stream be complete before
-    /// it begins processing the response stream.
-    ///
-    /// Instead, we can create two separate server functions:
-    /// 1) one that receives multipart form data and begins processing the upload
-    /// 2) a second that returns a stream of updates on the progress
-    ///
-    /// This requires us to store some global state of all the uploads. In a real app, you probably
-    /// shouldn't do exactly what I'm doing here in the demo. For example, this map just
-    /// distinguishes between files by filename, not by user.
-
-    #[cfg(feature = "ssr")]
-    mod progress {
-        use async_broadcast::{broadcast, Receiver, Sender};
-        use dashmap::DashMap;
-        use futures::Stream;
-        use once_cell::sync::Lazy;
-
-        struct File {
-            total: usize,
-            tx: Sender<usize>,
-            rx: Receiver<usize>,
-        }
-
-        static FILES: Lazy<DashMap<String, File>> = Lazy::new(DashMap::new);
-
-        pub async fn add_chunk(filename: &str, len: usize) {
-            println!("[{filename}]\tadding {len}");
-            let mut entry =
-                FILES.entry(filename.to_string()).or_insert_with(|| {
-                    println!("[{filename}]\tinserting channel");
-                    let (tx, rx) = broadcast(128);
-                    File { total: 0, tx, rx }
-                });
-            entry.total += len;
-            let new_total = entry.total;
-
-            // we're about to do an async broadcast, so we don't want to hold a lock across it
-            let tx = entry.tx.clone();
-            drop(entry);
-
-            // now we send the message and don't have to worry about it
-            tx.broadcast(new_total)
-                .await
-                .expect("couldn't send a message over channel");
-        }
-
-        pub fn for_file(filename: &str) -> impl Stream<Item = usize> {
-            let entry =
-                FILES.entry(filename.to_string()).or_insert_with(|| {
-                    println!("[{filename}]\tinserting channel");
-                    let (tx, rx) = broadcast(128);
-                    File { total: 0, tx, rx }
-                });
-            entry.rx.clone()
-        }
-    }
-
-    #[server(
-        input = MultipartFormData,
-    )]
-    pub async fn upload_file(data: MultipartData) -> Result<(), ServerFnError> {
-        let mut data = data.into_inner().unwrap();
-
-        while let Ok(Some(mut field)) = data.next_field().await {
-            let name =
-                field.file_name().expect("no filename on field").to_string();
-            while let Ok(Some(chunk)) = field.chunk().await {
-                let len = chunk.len();
-                println!("[{name}]\t{len}");
-                progress::add_chunk(&name, len).await;
-                // in a real server function, you'd do something like saving the file here
-            }
-        }
-
-        Ok(())
-    }
-
-    #[server(output = StreamingText)]
-    pub async fn file_progress(
-        filename: String,
-    ) -> Result<TextStream, ServerFnError> {
-        println!("getting progress on {filename}");
-        // get the stream of current length for the file
-        let progress = progress::for_file(&filename);
-        // separate each number with a newline
-        // the HTTP response might pack multiple lines of this into a single chunk
-        // we need some way of dividing them up
-        let progress = progress.map(|bytes| Ok(format!("{bytes}\n")));
-        Ok(TextStream::new(progress))
-    }
-
-    let (filename, set_filename) = create_signal(None);
-    let (max, set_max) = create_signal(None);
-    let (current, set_current) = create_signal(None);
-    let on_submit = move |ev: SubmitEvent| {
-        ev.prevent_default();
-        let target = ev.target().unwrap().unchecked_into::<HtmlFormElement>();
-        let form_data = FormData::new_with_form(&target).unwrap();
-        let file = form_data
-            .get("file_to_upload")
-            .unchecked_into::<web_sys::File>();
-        let filename = file.name();
-        let size = file.size() as usize;
-        set_filename(Some(filename.clone()));
-        set_max(Some(size));
-        set_current(None::<usize>);
-
-        spawn_local(async move {
-            let mut progress = file_progress(filename)
-                .await
-                .expect("couldn't initialize stream")
-                .into_inner();
-            while let Some(Ok(len)) = progress.next().await {
-                // the TextStream from the server function will be a series of `usize` values
-                // however, the response itself may pack those chunks into a smaller number of
-                // chunks, each with more text in it
-                // so we've padded them with newspace, and will split them out here
-                // each value is the latest total, so we'll just take the last one
-                let len = len
-                    .split('\n')
-                    .filter(|n| !n.is_empty())
-                    .last()
-                    .expect(
-                        "expected at least one non-empty value from \
-                         newline-delimited rows",
-                    )
-                    .parse::<usize>()
-                    .expect("invalid length");
-                set_current(Some(len));
-            }
-        });
-        spawn_local(async move {
-            upload_file(form_data.into())
-                .await
-                .expect("couldn't upload file");
-        });
-    };
-
-    view! {
-        <h3>File Upload with Progress</h3>
-        <p>A file upload with progress can be handled with two separate server functions.</p>
-        <aside>See the doc comment on the component for an explanation.</aside>
-        <form on:submit=on_submit>
-            <input type="file" name="file_to_upload"/>
-            <input type="submit"/>
-        </form>
-        {move || filename().map(|filename| view! { <p>Uploading {filename}</p> })}
-        {move || max().map(|max| view! {
-            <progress max=max value=move || current().unwrap_or_default()/>
-        })}
-    }
-}
 #[component]
 pub fn FileWatcher() -> impl IntoView {
     #[server(input = GetUrl, output = StreamingText)]
@@ -798,55 +632,3 @@ pub fn CustomEncoding() -> impl IntoView {
         <p>{result}</p>
     }
 }
-
-/// Middleware lets you modify the request/response on the server.
-///
-/// On the client, you might also want to modify the request. For example, you may need to add a
-/// custom header for authentication on every request. You can do this by creating a "custom
-/// client."
-#[component]
-pub fn CustomClientExample() -> impl IntoView {
-    // Define a type for our client.
-    pub struct CustomClient;
-
-    // Implement the `Client` trait for it.
-    impl<CustErr> Client<CustErr> for CustomClient {
-        // BrowserRequest and BrowserResponse are the defaults used by other server functions.
-        // They are wrappers for the underlying Web Fetch API types.
-        type Request = BrowserRequest;
-        type Response = BrowserResponse;
-
-        // Our custom `send()` implementation does all the work.
-        fn send(
-            req: Self::Request,
-        ) -> impl Future<Output = Result<Self::Response, ServerFnError<CustErr>>>
-               + Send {
-            // BrowserRequest derefs to the underlying Request type from gloo-net,
-            // so we can get access to the headers here
-            let headers = req.headers();
-            // modify the headers by appending one
-            headers.append("X-Custom-Header", "foobar");
-            // delegate back out to BrowserClient to send the modified request
-            BrowserClient::send(req)
-        }
-    }
-
-    // Specify our custom client with `client = `
-    #[server(client = CustomClient)]
-    pub async fn fn_with_custom_client() -> Result<(), ServerFnError> {
-        use http::header::HeaderMap;
-        use leptos_axum::extract;
-
-        let headers: HeaderMap = extract().await?;
-        let custom_header = headers.get("X-Custom-Header");
-        println!("X-Custom-Header = {custom_header:?}");
-        Ok(())
-    }
-
-    view! {
-        <h3>Custom clients</h3>
-        <p>You can define a custom server function client to do something like adding a header to every request.</p>
-        <p>Check the network request in your browser devtools to see how this client adds a custom header.</p>
-        <button on:click=|_| spawn_local(async { fn_with_custom_client().await.unwrap() })>Click me</button>
-    }
-}

examples/server_fns_axum/src/error_template.rs

@@ -1,5 +1,5 @@
 use crate::errors::TodoAppError;
-use leptos::*;
+use leptos::{Errors, *};
 #[cfg(feature = "ssr")]
 use leptos_axum::ResponseOptions;
 

examples/session_auth_axum/Cargo.toml

@@ -19,7 +19,7 @@ leptos_router = { path = "../../router", features = ["nightly"] }
 log = "0.4"
 simple_logger = "4.0"
 serde = { version = "1.0", features = ["derive"] }
-axum = { version = "0.7", optional = true, features = ["macros"] }
+axum = { version = "0.7", optional = true, features=["macros"] }
 tower = { version = "0.4", optional = true }
 tower-http = { version = "0.5", features = ["fs"], optional = true }
 tokio = { version = "1", features = ["full"], optional = true }
@@ -30,10 +30,10 @@ sqlx = { version = "0.7.2", features = [
 ], optional = true }
 thiserror = "1.0"
 wasm-bindgen = "0.2"
-axum_session_auth = { version = "0.12.1", features = [
+axum_session_auth = { version = "0.10", features = [
 	"sqlite-rustls",
 ], optional = true }
-axum_session = { version = "0.12.4", features = [
+axum_session = { version = "0.10", features = [
 	"sqlite-rustls",
 ], optional = true }
 bcrypt = { version = "0.15", optional = true }
@@ -83,7 +83,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/session_auth_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/session_auth_axum/src/auth.rs

@@ -6,13 +6,10 @@ use std::collections::HashSet;
 pub struct User {
     pub id: i64,
     pub username: String,
+    pub password: String,
     pub permissions: HashSet<String>,
 }
 
-// Explicitly is not Serialize/Deserialize!
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct UserPasshash(String);
-
 impl Default for User {
     fn default() -> Self {
         let permissions = HashSet::new();
@@ -20,6 +17,7 @@ impl Default for User {
         Self {
             id: -1,
             username: "Guest".into(),
+            password: "".into(),
             permissions,
         }
     }
@@ -27,7 +25,7 @@ impl Default for User {
 
 #[cfg(feature = "ssr")]
 pub mod ssr {
-    pub use super::{User, UserPasshash};
+    pub use super::User;
     pub use axum_session_auth::{
         Authentication, HasPermission, SessionSqlitePool,
     };
@@ -44,10 +42,7 @@ pub mod ssr {
     pub use bcrypt::{hash, verify, DEFAULT_COST};
 
     impl User {
-        pub async fn get_with_passhash(
-            id: i64,
-            pool: &SqlitePool,
-        ) -> Option<(Self, UserPasshash)> {
+        pub async fn get(id: i64, pool: &SqlitePool) -> Option<Self> {
             let sqluser = sqlx::query_as::<_, SqlUser>(
                 "SELECT * FROM users WHERE id = ?",
             )
@@ -56,7 +51,7 @@ pub mod ssr {
             .await
             .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )
@@ -68,43 +63,28 @@ pub mod ssr {
             Some(sqluser.into_user(Some(sql_user_perms)))
         }
 
-        pub async fn get(id: i64, pool: &SqlitePool) -> Option<Self> {
-            User::get_with_passhash(id, pool)
-                .await
-                .map(|(user, _)| user)
-        }
-
-        pub async fn get_from_username_with_passhash(
-            name: String,
-            pool: &SqlitePool,
-        ) -> Option<(Self, UserPasshash)> {
-            let sqluser = sqlx::query_as::<_, SqlUser>(
-                "SELECT * FROM users WHERE username = ?",
-            )
-            .bind(name)
-            .fetch_one(pool)
-            .await
-            .ok()?;
-
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
-            let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
-                "SELECT token FROM user_permissions WHERE user_id = ?;",
-            )
-            .bind(sqluser.id)
-            .fetch_all(pool)
-            .await
-            .ok()?;
-
-            Some(sqluser.into_user(Some(sql_user_perms)))
-        }
-
         pub async fn get_from_username(
             name: String,
             pool: &SqlitePool,
         ) -> Option<Self> {
-            User::get_from_username_with_passhash(name, pool)
-                .await
-                .map(|(user, _)| user)
+            let sqluser = sqlx::query_as::<_, SqlUser>(
+                "SELECT * FROM users WHERE username = ?",
+            )
+            .bind(name)
+            .fetch_one(pool)
+            .await
+            .ok()?;
+
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
+            let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
+                "SELECT token FROM user_permissions WHERE user_id = ?;",
+            )
+            .bind(sqluser.id)
+            .fetch_all(pool)
+            .await
+            .ok()?;
+
+            Some(sqluser.into_user(Some(sql_user_perms)))
         }
     }
 
@@ -157,22 +137,20 @@ pub mod ssr {
         pub fn into_user(
             self,
             sql_user_perms: Option<Vec<SqlPermissionTokens>>,
-        ) -> (User, UserPasshash) {
-            (
-                User {
-                    id: self.id,
-                    username: self.username,
-                    permissions: if let Some(user_perms) = sql_user_perms {
-                        user_perms
-                            .into_iter()
-                            .map(|x| x.token)
-                            .collect::<HashSet<String>>()
-                    } else {
-                        HashSet::<String>::new()
-                    },
+        ) -> User {
+            User {
+                id: self.id,
+                username: self.username,
+                password: self.password,
+                permissions: if let Some(user_perms) = sql_user_perms {
+                    user_perms
+                        .into_iter()
+                        .map(|x| x.token)
+                        .collect::<HashSet<String>>()
+                } else {
+                    HashSet::<String>::new()
                 },
-                UserPasshash(self.password),
-            )
+            }
         }
     }
 }
@@ -202,12 +180,11 @@ pub async fn login(
     let pool = pool()?;
     let auth = auth()?;
 
-    let (user, UserPasshash(expected_passhash)) =
-        User::get_from_username_with_passhash(username, &pool)
-            .await
-            .ok_or_else(|| ServerFnError::new("User does not exist."))?;
+    let user: User = User::get_from_username(username, &pool)
+        .await
+        .ok_or_else(|| ServerFnError::new("User does not exist."))?;
 
-    match verify(password, &expected_passhash)? {
+    match verify(password, &user.password)? {
         true => {
             auth.login_user(user.id);
             auth.remember_user(remember.is_some());

examples/session_auth_axum/src/error_template.rs

@@ -1,5 +1,5 @@
 use crate::errors::TodoAppError;
-use leptos::*;
+use leptos::{Errors, *};
 #[cfg(feature = "ssr")]
 use leptos_axum::ResponseOptions;
 

examples/session_auth_axum/src/main.rs

@@ -70,7 +70,7 @@ async fn main() {
         SessionConfig::default().with_table_name("axum_sessions");
     let auth_config = AuthConfig::<i64>::default();
     let session_store = SessionStore::<SessionSqlitePool>::new(
-        Some(SessionSqlitePool::from(pool.clone())),
+        Some(pool.clone().into()),
         session_config,
     )
     .await

examples/slots/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/slots/src/lib.rs

@@ -1,6 +1,6 @@
 use leptos::*;
 
-// Slots are created in similar manner to components, except that they use the #[slot] macro.
+// Slots are created in simillar manner to components, except that they use the #[slot] macro.
 #[slot]
 struct Then {
     children: ChildrenFn,

examples/sso_auth_axum/Cargo.toml

@@ -86,7 +86,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/sso_auth_axum/src/auth.rs

@@ -47,7 +47,7 @@ pub mod ssr_imports {
             .await
             .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )
@@ -71,7 +71,7 @@ pub mod ssr_imports {
             .await
             .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )

examples/sso_auth_axum/src/main.rs

@@ -8,12 +8,12 @@ use axum::{
     Router,
 };
 use axum_session::{Key, SessionConfig, SessionLayer, SessionStore};
-use axum_session_auth::{AuthConfig, AuthSessionLayer};
+use axum_session_auth::{AuthConfig, AuthSessionLayer, SessionSqlitePool};
 use leptos::{get_configuration, logging::log, provide_context, view};
 use leptos_axum::{
     generate_route_list, handle_server_fns_with_context, LeptosRoutes,
 };
-use sqlx::sqlite::SqlitePoolOptions;
+use sqlx::{sqlite::SqlitePoolOptions, SqlitePool};
 use sso_auth_axum::{
     auth::*, fallback::file_and_error_handler, state::AppState,
 };

examples/ssr_modes/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/ssr_modes/src/app.rs

@@ -9,13 +9,12 @@ use thiserror::Error;
 pub fn App() -> impl IntoView {
     // Provides context that manages stylesheets, titles, meta tags, etc.
     provide_meta_context();
-    let fallback = || view! { "Page not found." }.into_view();
 
     view! {
         <Stylesheet id="leptos" href="/pkg/ssr_modes.css"/>
         <Title text="Welcome to Leptos"/>
 
-        <Router fallback>
+        <Router>
             <main>
                 <Routes>
                     // We’ll load the home page with out-of-order streaming and <Suspense/>

examples/ssr_modes_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/ssr_modes_axum/src/app.rs

@@ -9,13 +9,12 @@ use thiserror::Error;
 pub fn App() -> impl IntoView {
     // Provides context that manages stylesheets, titles, meta tags, etc.
     provide_meta_context();
-    let fallback = || view! { "Page not found." }.into_view();
 
     view! {
         <Stylesheet id="leptos" href="/pkg/ssr_modes.css"/>
         <Title text="Welcome to Leptos"/>
 
-        <Router fallback>
+        <Router>
             <main>
                 <Routes>
                     // We’ll load the home page with out-of-order streaming and <Suspense/>

examples/suspense_tests/Cargo.toml

@@ -16,7 +16,7 @@ leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
 log = "0.4"
 simple_logger = "4"
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.87"
 serde = "1.0.159"
 tokio = { version = "1.29", features = ["time", "rt"], optional = true }
 

examples/tailwind_actix/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib", "rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+
 [dependencies]
 leptos = { path = "../../leptos", features = ["nightly"] }
 leptos_actix = { path = "../../integrations/actix", optional = true }
@@ -16,12 +17,12 @@ leptos_router = { path = "../../router", features = ["nightly"] }
 gloo-net = { version = "0.2", features = ["http"] }
 log = "0.4"
 
-# dependencies for client (enable when csr or hydrate set)
+# dependecies for client (enable when csr or hydrate set)
 wasm-bindgen = { version = "0.2", optional = true }
 console_log = { version = "1", optional = true }
 console_error_panic_hook = { version = "0.1", optional = true }
 
-# dependencies for server (enable when ssr set)
+# dependecies for server (enable when ssr set)
 actix-files = { version = "0.6", optional = true }
 actix-web = { version = "4", features = ["macros"], optional = true }
 futures = { version = "0.3", optional = true }
@@ -96,7 +97,7 @@ end2end-cmd = "npx playwright test"
 end2end-dir = "end2end"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/tailwind_actix/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/tailwind_axum/Cargo.toml

@@ -44,7 +44,7 @@ skip_feature_sets = [["ssr", "hydrate"]]
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
-output-name = "leptos_tailwind"
+output-name = "tailwind_axum"
 # The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
 site-root = "target/site"
 # The site-root relative folder where all compiled output (JS, WASM and CSS) is written

examples/tailwind_axum/README.md

@@ -1,4 +1,4 @@
-# Leptos with Axum + TailwindCSS Template
+# Leptos with Axum + TailwindCSS Tempate
 
 This is a template demonstrating how to integrate [TailwindCSS](https://tailwindcss.com/) with the [Leptos](https://github.com/leptos-rs/leptos) web framework, Axum server, and the [cargo-leptos](https://github.com/akesson/cargo-leptos) tool.
 

examples/tailwind_axum/package-lock.json

@@ -0,0 +1,926 @@
+{
+  "name": "leptos-tailwind",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "leptos-tailwind",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "preline": "^1.8.0",
+        "tailwindcss": "^3.3.2"
+      }
+    },
+    "node_modules/@alloc/quick-lru": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/camelcase-css": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
+      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/didyoumean": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
+    },
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/jiti": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
+      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
+      "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.6",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-js": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+      "dependencies": {
+        "camelcase-css": "^2.0.1"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >= 16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.21"
+      }
+    },
+    "node_modules/postcss-load-config": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
+      "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
+      "dependencies": {
+        "lilconfig": "^2.0.5",
+        "yaml": "^2.1.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": ">=8.0.9",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/postcss-nested": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.11"
+      },
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.14"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+    },
+    "node_modules/preline": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/preline/-/preline-1.8.0.tgz",
+      "integrity": "sha512-guttn86Fc/+AbvN9oKcr2z3zU7DL3Q5dl7nhcR4nTi5F02LXQc7WIYwgIXMR97kymCs52feiju6glXO3dUIpvA==",
+      "dependencies": {
+        "@popperjs/core": "^2.11.2"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "dependencies": {
+        "is-core-module": "^2.11.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sucrase": {
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+      "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "7.1.6",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tailwindcss": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
+      "dependencies": {
+        "@alloc/quick-lru": "^5.2.0",
+        "arg": "^5.0.2",
+        "chokidar": "^3.5.3",
+        "didyoumean": "^1.2.2",
+        "dlv": "^1.1.3",
+        "fast-glob": "^3.2.12",
+        "glob-parent": "^6.0.2",
+        "is-glob": "^4.0.3",
+        "jiti": "^1.18.2",
+        "lilconfig": "^2.1.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "object-hash": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.23",
+        "postcss-import": "^15.1.0",
+        "postcss-js": "^4.0.1",
+        "postcss-load-config": "^4.0.1",
+        "postcss-nested": "^6.0.1",
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0",
+        "resolve": "^1.22.2",
+        "sucrase": "^3.32.0"
+      },
+      "bin": {
+        "tailwind": "lib/cli.js",
+        "tailwindcss": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/yaml": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+      "engines": {
+        "node": ">= 14"
+      }
+    }
+  }
+}

examples/tailwind_axum/package.json

@@ -4,13 +4,13 @@
   "description": "<picture>\r     <source srcset=\"https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_Solid_White.svg\" media=\"(prefers-color-scheme: dark)\">\r     <img src=\"https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_RGB.svg\" alt=\"Leptos Logo\">\r </picture>",
   "main": "index.js",
   "scripts": {
-    "build": "npx tailwindcss -i ./input.css -o ./style/output.css",
-    "watch": "npx tailwindcss -i ./input.css -o ./style/output.css --watch"
+    "build":"npx tailwindcss -i ./input.css -o ./style/output.css",
+    "watch":"npx tailwindcss -i ./input.css -o ./style/output.css --watch"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "tailwindcss": "^3.4.1"
+    "tailwindcss": "^3.3.2"
   }
-}
+}

examples/tailwind_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/tailwind_axum/src/app.rs

@@ -7,7 +7,8 @@ pub fn App() -> impl IntoView {
     provide_meta_context();
 
     view! {
-        <Stylesheet id="leptos" href="/pkg/leptos_tailwind.css"/>
+
+        <Stylesheet id="leptos" href="/pkg/tailwind_axum.css"/>
         <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
         <Router>
             <Routes>

examples/tailwind_csr/Cargo.toml

@@ -10,7 +10,9 @@ leptos_router = { path = "../../router", features = ["csr", "nightly"] }
 log = "0.4"
 gloo-net = { version = "0.2", features = ["http"] }
 
-# dependencies for client (enable when csr or hydrate set)
+
+# dependecies for client (enable when csr or hydrate set)
 wasm-bindgen = { version = "0.2" }
-console_log = { version = "1" }
-console_error_panic_hook = { version = "0.1" }
+console_log = { version = "1"}
+console_error_panic_hook = { version = "0.1"}
+

examples/tailwind_csr/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/tailwind_csr/src/app.rs

@@ -8,7 +8,7 @@ pub fn App() -> impl IntoView {
 
     view! {
 
-        <Stylesheet id="leptos" href="/style/output.css"/>
+        <Stylesheet id="leptos" href="/pkg/tailwind.css"/>
         <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
         <Router>
             <Routes>

examples/timer/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/todo_app_sqlite/Cargo.toml

@@ -67,7 +67,7 @@ end2end-cmd = "cargo make test-ui"
 end2end-dir = "e2e"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/todo_app_sqlite/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/todo_app_sqlite_axum/Cargo.toml

@@ -69,7 +69,7 @@ end2end-cmd = "cargo make test-ui"
 end2end-dir = "e2e"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/todo_app_sqlite_axum/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-03-31"
+channel = "nightly"

examples/todo_app_sqlite_axum/src/error_template.rs

@@ -1,5 +1,5 @@
 use crate::errors::TodoAppError;
-use leptos::*;
+use leptos::{Errors, *};
 #[cfg(feature = "ssr")]
 use leptos_axum::ResponseOptions;
 

examples/todo_app_sqlite_csr/Cargo.toml

@@ -70,7 +70,7 @@ end2end-cmd = "cargo make test-ui"
 end2end-dir = "e2e"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"