fmt

Merge branch 'main' into 0.7.0-docs
Update router/src/ssr_mode.rs
2025-12-28 21:53:07 -05:00 · 2024-11-11 19:58:17 -05:00 · 2024-11-11 17:37:06 -05:00 · 2024-11-11 17:36:41 -05:00 · 2024-11-11 17:36:35 -05:00 · 2024-11-11 17:36:31 -05:00
56 changed files with 204 additions and 5807 deletions
--- a/.github/workflows/autofix.yml
+++ b/.github/workflows/autofix.yml
@@ -1,49 +0,0 @@
-name: autofix.ci
-on:
-  pull_request:
-  # Running this workflow on main branch pushes requires write permission to apply changes.
-  # Leave it alone for future uses.
-  # push:
-  #   branches: ["main"]
-permissions:
-  contents: read
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: 1
-jobs:
-  autofix:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: {toolchain: nightly, components: "rustfmt, clippy", target: "wasm32-unknown-unknown", rustflags: ""}
-      - name: Install jq
-        run: sudo apt-get install jq
-      - run: |
-          echo "Formatting the workspace"
-          cargo fmt --all
-
-          echo "Running Clippy against each member's features (default features included)"
-          for member in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | .name'); do
-              echo "Working on member $member":
-              echo -e "\tdefault-features/no-features:"
-              # this will also run on members with no features or default features
-              cargo clippy --allow-dirty --fix --lib --package "$member"
-
-              features=$(cargo metadata --no-deps --format-version 1 | jq -r ".packages[] | select(.name == \"$member\") | .features | keys[]")
-              for feature in $features; do
-                  if [ "$feature" = "default" ]; then
-                    continue
-                  fi
-                  echo -e "\tfeature $feature"
-                  cargo clippy --allow-dirty --fix --lib --package "$member" --features "$feature"
-              done
-          done
-      - uses: autofix-ci/action@v1.3.1
-        if: ${{ always() }}
-        with:
-          fail-fast: false
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,3 @@ blob.rs

 .vscode
 vendor
-hash.txt
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -278,7 +278,7 @@ dependencies = [
 "async-executor",
 "futures",
 "glib",
- "thiserror 2.0.3",
+ "thiserror 2.0.0",
 "tokio",
 "tracing",
 "wasm-bindgen-futures",
@@ -400,9 +400,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

 [[package]]
 name = "axum"
-version = "0.7.8"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c41b948da08fb481a94546cd874843adc1142278b0af4badf9b1b78599d68d"
+checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
 dependencies = [
 "async-trait",
 "axum-core",
@@ -1171,9 +1171,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"

 [[package]]
 name = "gio-sys"
-version = "0.20.6"
+version = "0.20.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b965df6f3534c84816b5c1a7d9efcb5671ae790822de5abe8e299797039529bc"
+checksum = "217f464cad5946ae4369c355155e2d16b488c08920601083cb4891e352ae777b"
 dependencies = [
 "glib-sys",
 "gobject-sys",
@@ -1184,9 +1184,9 @@ dependencies = [

 [[package]]
 name = "glib"
-version = "0.20.6"
+version = "0.20.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86bd3e4ee7998ab5a135d900db56930cc19ad16681adf245daff54f618b9d5e1"
+checksum = "358431b0e0eb15b9d02db52e1f19c805b953c5c168099deb3de88beab761768c"
 dependencies = [
 "bitflags",
 "futures-channel",
@@ -1218,9 +1218,9 @@ dependencies = [

 [[package]]
 name = "glib-sys"
-version = "0.20.6"
+version = "0.20.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0b1827e8621fc42c0dfb228e5d57ff6a71f9699e666ece8113f979ad87c2de"
+checksum = "8a5911863ab7ecd4a6f8d5976f12eeba076b23669c49b066d877e742544aa389"
 dependencies = [
 "libc",
 "system-deps",
@@ -1792,7 +1792,7 @@ dependencies = [
 "server_fn",
 "slotmap",
 "tachys",
- "thiserror 2.0.3",
+ "thiserror 2.0.0",
 "throw_error",
 "tracing",
 "typed-builder",
@@ -1870,7 +1870,7 @@ dependencies = [
 "serde",
 "temp-env",
 "tempfile",
- "thiserror 2.0.3",
+ "thiserror 2.0.0",
 "tokio",
 "typed-builder",
 ]
@@ -1981,7 +1981,7 @@ dependencies = [
 "reactive_graph",
 "send_wrapper",
 "tachys",
- "thiserror 2.0.3",
+ "thiserror 2.0.0",
 "tracing",
 "url",
 "wasm-bindgen",
@@ -2291,7 +2291,7 @@ version = "0.2.0"
 dependencies = [
 "serde",
 "serde_json",
- "thiserror 2.0.3",
+ "thiserror 2.0.0",
 ]

 [[package]]
@@ -2739,7 +2739,7 @@ dependencies = [
 "send_wrapper",
 "serde",
 "slotmap",
- "thiserror 2.0.3",
+ "thiserror 2.0.0",
 "tokio",
 "tokio-test",
 "tracing",
@@ -3156,9 +3156,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
 "serde_derive",
 ]
@@ -3197,9 +3197,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3290,7 +3290,7 @@ dependencies = [
 "serde_json",
 "serde_qs",
 "server_fn_macro_default",
- "thiserror 2.0.3",
+ "thiserror 2.0.0",
 "throw_error",
 "tower",
 "tower-layer",
@@ -3627,11 +3627,11 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "15291287e9bff1bc6f9ff3409ed9af665bec7a5fc8ac079ea96be07bca0e2668"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.0",
 ]

 [[package]]
@@ -3647,9 +3647,9 @@ dependencies = [

 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "22efd00f33f93fa62848a7cab956c3d38c8d43095efda1decfc2b3a5dc0b8972"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/any_spawner/Cargo.toml
+++ b/any_spawner/Cargo.toml
@@ -11,7 +11,7 @@ edition.workspace = true
 [dependencies]
 async-executor = { version = "1.13.1", optional = true }
 futures = "0.3.31"
-glib = { version = "0.20.6", optional = true }
+glib = { version = "0.20.5", optional = true }
 thiserror = "2.0"
 tokio = { version = "1.41", optional = true, default-features = false, features = [
  "rt",
--- a/examples/hackernews_islands_axum/Cargo.toml
+++ b/examples/hackernews_islands_axum/Cargo.toml
@@ -12,7 +12,7 @@ lto = true

 [dependencies]
 console_error_panic_hook = "0.1.7"
-leptos = { path = "../../leptos", features = ["islands"] }
+leptos = { path = "../../leptos", features = ["experimental-islands"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
--- a/examples/islands/Cargo.toml
+++ b/examples/islands/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3.30"
 http = "1.1"
 leptos = { path = "../../leptos", features = [
  "tracing",
-  "islands",
+  "experimental-islands",
 ] }
 server_fn = { path = "../../server_fn", features = ["serde-lite"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
--- a/examples/islands_router/Cargo.toml
+++ b/examples/islands_router/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3.30"
 http = "1.1"
 leptos = { path = "../../leptos", features = [
  "tracing",
-  "islands",
+  "experimental-islands",
 ] }
 leptos_router = { path = "../../router" }
 server_fn = { path = "../../server_fn", features = ["serde-lite"] }
--- a/examples/suspense_tests/Cargo.toml
+++ b/examples/suspense_tests/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
 actix-files = { version = "0.6.6", optional = true }
 actix-web = { version = "4.8", optional = true, features = ["macros"] }
 console_error_panic_hook = "0.1.7"
-js-sys = { version = "0.3.72" }
+js-sys = { version = "0.3.70", optional = true }
 leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
@@ -21,7 +21,7 @@ tokio = { version = "1.39", features = ["time", "rt"], optional = true }

 [features]
 hydrate = [
-
+  "dep:js-sys",
  "leptos/hydrate",
 ]
 ssr = [
--- a/examples/suspense_tests/e2e/features/check_aria_current.feature
+++ b/examples/suspense_tests/e2e/features/check_aria_current.feature
@@ -1,121 +0,0 @@
-@check_aria_current
-Feature: Check aria-current being applied to make links bolded
-
-    Background:
-
-        Given I see the app
-
-    Scenario: Should see the base case working
-        Then I see the Out-of-Order link being bolded
-        And I see the following links being bolded
-            | Out-of-Order |
-            | Nested       |
-        And I see the In-Order link not being bolded
-        And I see the following links not being bolded
-            | In-Order     |
-            | Single       |
-
-    Scenario: Should see client-side render the correct bolded links
-        When I select the link In-Order
-        And I select the link Single
-        Then I see the following links being bolded
-            | In-Order     |
-            | Single       |
-        And I see the following links not being bolded
-            | Out-of-Order |
-            | Nested       |
-
-    Scenario: Should see server-side render the correct bolded links
-        When I select the link In-Order
-        And I select the link Single
-        And I reload the page
-        Then I see the following links being bolded
-            | In-Order     |
-            | Single       |
-        And I see the following links not being bolded
-            | Out-of-Order |
-            | Nested       |
-
-    Scenario: Check that the base nested route links are working
-        When I select the link Instrumented
-        Then I see the Instrumented link being bolded
-        And I see the Item Listing link not being bolded
-
-    Scenario: Should see going deep down into nested routes bold links
-        When I select the link Instrumented
-        And I select the link Target 421
-        Then I see the following links being bolded
-            | Instrumented |
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | Target 421   |
-            | field1       |
-
-    Scenario: Should see going deep down into nested routes in SSR bold links
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I reload the page
-        Then I see the following links being bolded
-            | Instrumented |
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | Target 421   |
-            | field1       |
-
-    Scenario: Going deep down navigate around nested links bold correctly
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I select the link Inspect path2/field3
-        Then I see the following links being bolded
-            | Instrumented |
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | field3       |
-        And I see the following links not being bolded
-            | Target 421   |
-            | field1       |
-
-    Scenario: Going deep down navigate around nested links bold correctly, SSR
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I select the link Inspect path2/field3
-        And I reload the page
-        Then I see the following links being bolded
-            | Instrumented |
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | field3       |
-        And I see the following links not being bolded
-            | Target 421   |
-            | field1       |
-
-    Scenario: Going deep down back out nested routes reset bolded states
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I select the link Counters
-        Then I see the following links being bolded
-            | Instrumented |
-            | Counters     |
-        And I see the following links not being bolded
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | Target 421   |
-
-    Scenario: Going deep down back out nested routes reset bolded states, SSR
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I select the link Counters
-        And I reload the page
-        Then I see the following links being bolded
-            | Instrumented |
-            | Counters     |
-        And I see the following links not being bolded
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | Target 421   |
--- a/examples/suspense_tests/e2e/tests/fixtures/check.rs
+++ b/examples/suspense_tests/e2e/tests/fixtures/check.rs
@@ -81,20 +81,3 @@ pub async fn instrumented_counts(

    Ok(())
 }
-
-pub async fn link_text_is_aria_current(client: &Client, text: &str) -> Result<()> {
-    let link = find::link_with_text(client, text).await?;
-
-    link.attr("aria-current").await?
-        .expect(format!("aria-current missing for {text}").as_str());
-
-    Ok(())
-}
-
-pub async fn link_text_is_not_aria_current(client: &Client, text: &str) -> Result<()> {
-    let link = find::link_with_text(client, text).await?;
-
-    link.attr("aria-current").await?
-        .map(|_| anyhow::bail!("aria-current mistakenly set for {text}"))
-        .unwrap_or(Ok(()))
-}
--- a/examples/suspense_tests/e2e/tests/fixtures/find.rs
+++ b/examples/suspense_tests/e2e/tests/fixtures/find.rs
@@ -124,12 +124,3 @@ async fn component_message(client: &Client, id: &str) -> Result<String> {

    Ok(text)
 }
-
-pub async fn link_with_text(client: &Client, text: &str) -> Result<Element> {
-    let link = client
-        .wait()
-        .for_element(Locator::LinkText(text))
-        .await
-        .expect(format!("Link not found by `{}`", text).as_str());
-    Ok(link)
-}
--- a/examples/suspense_tests/e2e/tests/fixtures/world/check_steps.rs
+++ b/examples/suspense_tests/e2e/tests/fixtures/world/check_steps.rs
@@ -80,58 +80,6 @@ async fn i_see_the_second_count_is(
    Ok(())
 }

-#[then(regex = r"^I see the (.*) link being bolded$")]
-async fn i_see_the_link_being_bolded(
-    world: &mut AppWorld,
-    text: String,
-) -> Result<()> {
-    let client = &world.client;
-    check::link_text_is_aria_current(client, &text).await?;
-
-    Ok(())
-}
-
-#[then(expr = "I see the following links being bolded")]
-async fn i_see_the_following_links_being_bolded(
-    world: &mut AppWorld,
-    step: &Step,
-) -> Result<()> {
-    let client = &world.client;
-    if let Some(table) = step.table.as_ref() {
-        for row in table.rows.iter() {
-            check::link_text_is_aria_current(client, &row[0]).await?;
-        }
-    }
-
-    Ok(())
-}
-
-#[then(regex = r"^I see the (.*) link not being bolded$")]
-async fn i_see_the_link_being_not_bolded(
-    world: &mut AppWorld,
-    text: String,
-) -> Result<()> {
-    let client = &world.client;
-    check::link_text_is_not_aria_current(client, &text).await?;
-
-    Ok(())
-}
-
-#[then(expr = "I see the following links not being bolded")]
-async fn i_see_the_following_links_not_being_bolded(
-    world: &mut AppWorld,
-    step: &Step,
-) -> Result<()> {
-    let client = &world.client;
-    if let Some(table) = step.table.as_ref() {
-        for row in table.rows.iter() {
-            check::link_text_is_not_aria_current(client, &row[0]).await?;
-        }
-    }
-
-    Ok(())
-}
-
 #[then(expr = "I see the following counters under section")]
 #[then(expr = "the following counters under section")]
 async fn i_see_the_following_counters_under_section(
--- a/hydration_context/src/lib.rs
+++ b/hydration_context/src/lib.rs
@@ -83,14 +83,15 @@ pub trait SharedContext: Debug {

    /// Reads the current value of some data from the shared context, if it has been
    /// sent from the server. This returns the serialized data as a `String` that should
-    /// be deserialized.
+    /// be deserialized using [`Serializable::de`].
    ///
    /// On the server and in client-side rendered implementations, this should
    /// always return [`None`].
    fn read_data(&self, id: &SerializedDataId) -> Option<String>;

    /// Returns a [`Future`] that resolves with a `String` that should
-    /// be deserialized once the given piece of server data has resolved.
+    /// be deserialized using [`Serializable::de`] once the given piece of server
+    /// data has resolved.
    ///
    /// On the server and in client-side rendered implementations, this should
    /// return a [`Future`] that is immediately ready with [`None`].
@@ -147,8 +148,8 @@ pub trait SharedContext: Debug {

    /// Adds a `Future` to the set of “blocking resources” that should prevent the server’s
    /// response stream from beginning until all are resolved. The `Future` returned by
-    /// blocking resources will not resolve until every `Future` added by this method
-    /// has resolved.
+    /// [`blocking_resources`](Self::blocking_resources) will not resolve until every `Future`
+    /// added by this method has resolved.
    ///
    /// In browser implementations, this should be a no-op.
    fn defer_stream(&self, wait_for: PinnedFuture<()>);
--- a/integrations/actix/src/lib.rs
+++ b/integrations/actix/src/lib.rs
@@ -82,7 +82,7 @@ impl ResponseParts {
    }
 }

-/// A wrapper for an Actix [`HttpRequest`] that allows it to be used in an
+/// A wrapper for an Actix [`HttpRequest`](actix_web::HttpRequest) that allows it to be used in an
 /// `Send`/`Sync` setting like Leptos's Context API.
 #[derive(Debug, Clone)]
 pub struct Request(SendWrapper<HttpRequest>);
@@ -419,6 +419,12 @@ pub fn handle_server_fns_with_context(
 /// will include fallback content for any `<Suspense/>` nodes, and be immediately interactive,
 /// but requires some client-side JavaScript.
 ///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_stream](leptos::ssr::render_to_stream), and
+/// includes everything described in the documentation for that function.
+///
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use actix_web::{App, HttpServer};
@@ -459,6 +465,7 @@ pub fn handle_server_fns_with_context(
 /// - [ResponseOptions]
 /// - [Request]
 /// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -478,6 +485,13 @@ where
 /// This stream will pause at each `<Suspense/>` node and wait for it to resolve before
 /// sending down its HTML. The app will become interactive once it has fully loaded.
 ///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using
+/// [render_to_stream_in_order](leptos::ssr::render_to_stream_in_order),
+/// and includes everything described in the documentation for that function.
+///
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use actix_web::{App, HttpServer};
@@ -520,6 +534,7 @@ where
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
 /// - [Request]
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -536,7 +551,13 @@ where

 /// Returns an Actix [struct@Route](actix_web::Route) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
-/// `async` resources have loaded.
+/// `async` [Resource](leptos::Resource)s have loaded.
+///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to the app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_string_async](leptos::ssr::render_to_string_async), and
+/// includes everything described in the documentation for that function.
 ///
 /// This can then be set up at an appropriate route in your application:
 /// ```
@@ -669,6 +690,7 @@ where
 /// - [ResponseOptions]
 /// - [Request]
 /// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -691,7 +713,7 @@ where

 /// Returns an Actix [struct@Route](actix_web::Route) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously serving the page once all `async`
-/// resources have loaded.
+/// [Resource](leptos::Resource)s have loaded.
 ///
 /// This function allows you to provide additional information to Leptos for your route.
 /// It could be used to pass in Path Info, Connection Info, or anything your heart desires.
--- a/integrations/axum/Cargo.toml
+++ b/integrations/axum/Cargo.toml
@@ -11,7 +11,7 @@ edition.workspace = true
 [dependencies]
 any_spawner = { workspace = true, features = ["tokio"] }
 hydration_context = { workspace = true }
-axum = { version = "0.7.8", default-features = false, features = [
+axum = { version = "0.7.7", default-features = false, features = [
  "matched-path",
 ] }
 dashmap = "6"
@@ -30,7 +30,7 @@ tower-http = "0.6.1"
 tracing = { version = "0.1.40", optional = true }

 [dev-dependencies]
-axum = "0.7.8"
+axum = "0.7.7"
 tokio = { version = "1.41", features = ["net", "rt-multi-thread"] }

 [features]
--- a/integrations/axum/src/lib.rs
+++ b/integrations/axum/src/lib.rs
@@ -16,7 +16,7 @@
 //! - `default`: supports running in a typical native Tokio/Axum environment
 //! - `wasm`: with `default-features = false`, supports running in a JS Fetch-based
 //!   environment
-//! - `islands`: activates Leptos [islands mode](https://leptos-rs.github.io/leptos/islands.html)
+//! - `experimental-islands`: activates Leptos [islands mode](https://leptos-rs.github.io/leptos/islands.html)
 //!
 //! ### Important Note
 //! Prior to 0.5, using `default-features = false` on `leptos_axum` simply did nothing. Now, it actively
@@ -197,9 +197,9 @@ impl ExtendResponse for AxumResponse {
 /// 2. A server function that is called from WASM running in the client (e.g., a dispatched action
 ///    or a spawned `Future`).
 /// 3. A `<form>` submitted to the server function endpoint using default browser APIs (often due
-///    to using [`ActionForm`] without JS/WASM present.)
+///    to using [`ActionForm`](leptos::form::ActionForm) without JS/WASM present.)
 ///
-/// Using it with a non-blocking [`Resource`] will not work if you are using streaming rendering,
+/// Using it with a non-blocking [`Resource`](leptos::server::Resource) will not work if you are using streaming rendering,
 /// as the response's headers will already have been sent by the time the server function calls `redirect()`.
 ///
 /// ### Implementation
@@ -442,6 +442,12 @@ pub type PinnedHtmlStream =
 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], serving an HTML stream of your application.
 ///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_stream](leptos::ssr::render_to_stream), and
+/// includes everything described in the documentation for that function.
+///
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use axum::{handler::Handler, Router};
@@ -479,7 +485,8 @@ pub type PinnedHtmlStream =
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -530,6 +537,12 @@ where
 /// This stream will pause at each `<Suspense/>` node and wait for it to resolve before
 /// sending down its HTML. The app will become interactive once it has fully loaded.
 ///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_stream_in_order], and includes everything described in
+/// the documentation for that function.
+///
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use axum::{handler::Handler, Router};
@@ -567,7 +580,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -620,7 +634,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -751,7 +766,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -818,7 +834,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -935,7 +952,13 @@ fn provide_contexts(

 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
-/// `async` resources have loaded.
+/// `async` [Resource](leptos::Resource)s have loaded.
+///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_string_async], and includes everything described in
+/// the documentation for that function.
 ///
 /// This can then be set up at an appropriate route in your application:
 /// ```
@@ -975,7 +998,8 @@ fn provide_contexts(
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -996,7 +1020,7 @@ where

 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
-/// `async` resources have loaded.
+/// `async` [Resource](leptos::Resource)s have loaded.
 ///
 /// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
 /// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
@@ -1029,7 +1053,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
@@ -1063,7 +1088,7 @@ where

 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
-/// `async` resources have loaded.
+/// `async` [Resource](leptos::Resource)s have loaded.
 ///
 /// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
 /// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
@@ -1096,7 +1121,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
    feature = "tracing",
    tracing::instrument(level = "trace", fields(error), skip_all)
--- a/leptos/Cargo.toml
+++ b/leptos/Cargo.toml
@@ -86,7 +86,7 @@ tracing = [
 ]
 nonce = ["base64", "rand"]
 spin = ["leptos-spin-macro"]
-islands = ["leptos_macro/islands", "dep:serde_json"]
+experimental-islands = ["leptos_macro/experimental-islands", "dep:serde_json"]
 trace-component-props = [
  "leptos_macro/trace-component-props",
  "leptos_dom/trace-component-props"
@@ -104,7 +104,7 @@ denylist = [
  "rkyv", # was causing clippy issues on nightly
  "trace-component-props",
  "spin",
-  "islands",
+  "experimental-islands",
 ]
 skip_feature_sets = [
  ["csr", "ssr"],
--- a/leptos/src/callback.rs
+++ b/leptos/src/callback.rs
@@ -31,13 +31,13 @@
 //! *Notes*:
 //! - The `render_number` prop can receive any type that implements `Fn(i32) -> String`.
 //! - Callbacks are most useful when you want optional generic props.
-//! - All callbacks implement the [`Callable`](leptos::callback::Callable) trait, and can be invoked with `my_callback.run(input)`.
+//! - All callbacks implement the [`Callable`] trait, and can be invoked with `my_callback.run(input)`.
 //! - The callback types implement [`Copy`], so they can easily be moved into and out of other closures, just like signals.
 //!
 //! # Types
 //! This modules implements 2 callback types:
-//! - [`Callback`](leptos::callback::Callback)
-//! - [`UnsyncCallback`](leptos::callback::UnsyncCallback)
+//! - [`Callback`]
+//! - [`UnsyncCallback`]
 //!
 //! Use `SyncCallback` if the function is not `Sync` and `Send`.

@@ -223,14 +223,14 @@ mod tests {
    #[test]
    fn clone_callback() {
        let callback = Callback::new(move |_no_clone: NoClone| NoClone {});
-        let _cloned = callback;
+        let _cloned = callback.clone();
    }

    #[test]
    fn clone_unsync_callback() {
        let callback =
            UnsyncCallback::new(move |_no_clone: NoClone| NoClone {});
-        let _cloned = callback;
+        let _cloned = callback.clone();
    }

    #[test]
--- a/leptos/src/children.rs
+++ b/leptos/src/children.rs
@@ -246,7 +246,7 @@ where
    }
 }

-/// A typed equivalent to [`ChildrenFnMut`], which takes a generic but preserves type information to
+/// A typed equivalent to [`ChildrenMut`], which takes a generic but preserves type information to
 /// allow the compiler to optimize the view more effectively.
 pub struct TypedChildrenMut<T>(Box<dyn FnMut() -> View<T> + Send>);

--- a/leptos/src/form.rs
+++ b/leptos/src/form.rs
@@ -72,7 +72,9 @@ use web_sys::{
 #[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
 #[component]
 pub fn ActionForm<ServFn>(
-    /// The action from which to build the form.
+    /// The action from which to build the form. This should include a URL, which can be generated
+    /// by default using [`create_server_action`](leptos_server::create_server_action) or added
+    /// manually using [`using_server_fn`](leptos_server::Action::using_server_fn).
    action: ServerAction<ServFn>,
    /// A [`NodeRef`] in which the `<form>` element should be stored.
    #[prop(optional)]
@@ -147,7 +149,9 @@ where
 /// progressively enhanced to use client-side routing.
 #[component]
 pub fn MultiActionForm<ServFn>(
-    /// The action from which to build the form.
+    /// The action from which to build the form. This should include a URL, which can be generated
+    /// by default using [create_server_action](leptos_server::create_server_action) or added
+    /// manually using [leptos_server::Action::using_server_fn].
    action: ServerMultiAction<ServFn>,
    /// A [`NodeRef`] in which the `<form>` element should be stored.
    #[prop(optional)]
--- a/leptos/src/hydration/mod.rs
+++ b/leptos/src/hydration/mod.rs
@@ -47,7 +47,7 @@ pub fn AutoReload(
 pub fn HydrationScripts(
    /// Configuration options for this project.
    options: LeptosOptions,
-    /// Should be `true` to hydrate in `islands` mode.
+    /// Should be `true` to hydrate in `experimental-islands` mode.
    #[prop(optional)]
    islands: bool,
    /// A base url, not including a trailing slash
--- a/leptos/src/lib.rs
+++ b/leptos/src/lib.rs
@@ -39,7 +39,7 @@
 //!   server actions, forms, and server-sent events (SSE).
 //! - **[`todomvc`]** shows the basics of building an isomorphic web app. Both the server and the client import the same app code.
 //!   The server renders the app directly to an HTML string, and the client hydrates that HTML to make it interactive.
-//!   You might also want to see how we use [`Effect::new`](leptos::prelude::Effect) to
+//!   You might also want to see how we use [`Effect::new`](leptos::prelude::Effect::new) to
 //!   [serialize JSON to `localStorage`](https://github.com/leptos-rs/leptos/blob/20af4928b2fffe017408d3f4e7330db22cf68277/examples/todomvc/src/lib.rs#L191-L209)
 //!   and [reactively call DOM methods](https://github.com/leptos-rs/leptos/blob/16f084a71268ac325fbc4a5e50c260df185eadb6/examples/todomvc/src/lib.rs#L292-L296)
 //!   on [references to elements](https://github.com/leptos-rs/leptos/blob/20af4928b2fffe017408d3f4e7330db22cf68277/examples/todomvc/src/lib.rs#L228).
@@ -78,7 +78,7 @@
 //!   + `async` interop: [`Resource`](leptos::prelude::Resource) for loading data using `async` functions
 //!     and [`Action`](leptos::prelude::Action) to mutate data or imperatively call `async` functions.
 //!   + reactions: [`Effect`](leptos::prelude::Effect) and [`RenderEffect`](leptos::prelude::RenderEffect).
-//! - **Templating/Views**: the [`view`] macro and [`IntoView`] trait.
+//! - **Templating/Views**: the [`view`] macro and [`IntoView`](leptos::IntoView) trait.
 //! - **Routing**: the [`leptos_router`](https://docs.rs/leptos_router/latest/leptos_router/) crate
 //! - **Server Functions**: the [`server`](macro@leptos::prelude::server) macro and [`ServerAction`](leptos::prelude::ServerAction).
 //!
@@ -318,10 +318,10 @@ pub mod task {
 }

 // these reexports are used in islands
-#[cfg(feature = "islands")]
+#[cfg(feature = "experimental-islands")]
 #[doc(hidden)]
 pub use serde;
-#[cfg(feature = "islands")]
+#[cfg(feature = "experimental-islands")]
 #[doc(hidden)]
 pub use serde_json;
 #[cfg(feature = "tracing")]
--- a/leptos/tests/test_examples/suspense-tests/Cargo.lock
+++ b/leptos/tests/test_examples/suspense-tests/Cargo.lock
--- a/leptos_config/src/tests.rs
+++ b/leptos_config/src/tests.rs
@@ -30,14 +30,14 @@ fn ws_from_str_test() {

 #[test]
 fn env_w_default_test() {
-    temp_env::with_var("LEPTOS_CONFIG_ENV_TEST", Some("custom"), || {
+    _ = temp_env::with_var("LEPTOS_CONFIG_ENV_TEST", Some("custom"), || {
        assert_eq!(
            env_w_default("LEPTOS_CONFIG_ENV_TEST", "default").unwrap(),
            String::from("custom")
        );
    });

-    temp_env::with_var_unset("LEPTOS_CONFIG_ENV_TEST", || {
+    _ = temp_env::with_var_unset("LEPTOS_CONFIG_ENV_TEST", || {
        assert_eq!(
            env_w_default("LEPTOS_CONFIG_ENV_TEST", "default").unwrap(),
            String::from("default")
@@ -47,14 +47,14 @@ fn env_w_default_test() {

 #[test]
 fn env_wo_default_test() {
-    temp_env::with_var("LEPTOS_CONFIG_ENV_TEST", Some("custom"), || {
+    _ = temp_env::with_var("LEPTOS_CONFIG_ENV_TEST", Some("custom"), || {
        assert_eq!(
            env_wo_default("LEPTOS_CONFIG_ENV_TEST").unwrap(),
            Some(String::from("custom"))
        );
    });

-    temp_env::with_var_unset("LEPTOS_CONFIG_ENV_TEST", || {
+    _ = temp_env::with_var_unset("LEPTOS_CONFIG_ENV_TEST", || {
        assert_eq!(env_wo_default("LEPTOS_CONFIG_ENV_TEST").unwrap(), None);
    });
 }
--- a/leptos_macro/Cargo.toml
+++ b/leptos_macro/Cargo.toml
@@ -44,7 +44,7 @@ hydrate = []
 ssr = ["server_fn_macro/ssr", "leptos/ssr"]
 nightly = ["server_fn_macro/nightly"]
 tracing = ["dep:tracing"]
-islands = []
+experimental-islands = []
 trace-component-props = []
 actix = ["server_fn_macro/actix"]
 axum = ["server_fn_macro/axum"]
--- a/leptos_macro/src/lib.rs
+++ b/leptos_macro/src/lib.rs
@@ -1,4 +1,4 @@
-//! Macros for use with the Leptos framework.
+//! Macros for use with the [`leptos`] framework.

 #![cfg_attr(feature = "nightly", feature(proc_macro_span))]
 #![forbid(unsafe_code)]
@@ -272,8 +272,8 @@ pub fn view(tokens: TokenStream) -> TokenStream {
    view_macro_impl(tokens, false)
 }

-/// The `template` macro behaves like [`view`](view!), except that it wraps the entire tree in a
-/// [`ViewTemplate`](https://docs.rs/leptos/0.7.0-gamma3/leptos/prelude/struct.ViewTemplate.html). This optimizes creation speed by rendering
+/// The `template` macro behaves like [`view`], except that it wraps the entire tree in a
+/// [`ViewTemplate`](leptos::prelude::ViewTemplate). This optimizes creation speed by rendering
 /// most of the view into a `<template>` tag with HTML rendered at compile time, then hydrating it.
 /// In exchange, there is a small binary size overhead.
 #[proc_macro_error2::proc_macro_error]
@@ -366,7 +366,7 @@ fn normalized_call_site(site: proc_macro::Span) -> Option<String> {
    }
 }

-/// This behaves like the [`view`](view!) macro, but loads the view from an external file instead of
+/// This behaves like the [`view`] macro, but loads the view from an external file instead of
 /// parsing it inline.
 ///
 /// This is designed to allow editing views in a separate file, if this improves a user's workflow.
@@ -559,10 +559,10 @@ pub fn component(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
 }

 /// Defines a component as an interactive island when you are using the
-/// `islands` feature of Leptos. Apart from the macro name,
+/// `experimental-islands` feature of Leptos. Apart from the macro name,
 /// the API is the same as the [`component`](macro@component) macro.
 ///
-/// When you activate the `islands` feature, every `#[component]`
+/// When you activate the `experimental-islands` feature, every `#[component]`
 /// is server-only by default. This "default to server" behavior is important:
 /// you opt into shipping code to the client, rather than opting out. You can
 /// opt into client-side interactivity for any given component by changing from
--- a/leptos_macro/src/view/mod.rs
+++ b/leptos_macro/src/view/mod.rs
@@ -197,7 +197,7 @@ enum InertElementBuilder<'a> {
    },
 }

-impl ToTokens for InertElementBuilder<'_> {
+impl<'a> ToTokens for InertElementBuilder<'a> {
    fn to_tokens(&self, tokens: &mut TokenStream) {
        match self {
            InertElementBuilder::GlobalClass { strs, .. } => {
@@ -219,7 +219,7 @@ enum GlobalClassItem<'a> {
    String(String),
 }

-impl ToTokens for GlobalClassItem<'_> {
+impl<'a> ToTokens for GlobalClassItem<'a> {
    fn to_tokens(&self, tokens: &mut TokenStream) {
        let addl_tokens = match self {
            GlobalClassItem::Global(v) => v.to_token_stream(),
--- a/leptos_server/src/lib.rs
+++ b/leptos_server/src/lib.rs
@@ -1,4 +1,4 @@
-//! Utilities for communicating between the server and the client with Leptos.
+//! Utilities for communicating between the server and the client with [`leptos`].

 #![deny(missing_docs)]
 #![forbid(unsafe_code)]
--- a/leptos_server/src/once_resource.rs
+++ b/leptos_server/src/once_resource.rs
@@ -253,8 +253,7 @@ where
    }
 }

-/// A [`Future`] that is ready when an
-/// [`ArcAsyncDerived`](reactive_graph::computed::ArcAsyncDerived) is finished loading or reloading,
+/// A [`Future`] that is ready when an [`ArcAsyncDerived`] is finished loading or reloading,
 /// and contains its value. `.await`ing this clones the value `T`.
 pub struct OnceResourceFuture<T> {
    source: AnySource,
--- a/meta/src/lib.rs
+++ b/meta/src/lib.rs
@@ -7,7 +7,8 @@
 //! using the [`Leptos`](https://github.com/leptos-rs/leptos) web framework.
 //!
 //! Document metadata is updated automatically when running in the browser. For server-side
-//! rendering, after the component tree is rendered to HTML, [`ServerMetaContextOutput::inject_meta_context`] will inject meta tags into a stream of HTML inside the `<head>`.
+//! rendering, after the component tree is rendered to HTML, [`MetaContext::dehydrate`] can generate
+//! HTML that should be injected into the `<head>` of the HTML document being rendered.
 //!
 //! ```
 //! use leptos::prelude::*;
--- a/oco/src/lib.rs
+++ b/oco/src/lib.rs
@@ -70,7 +70,7 @@ pub enum Oco<'a, T: ?Sized + ToOwned + 'a> {
    Owned(<T as ToOwned>::Owned),
 }

-impl<T: ?Sized + ToOwned> Oco<'_, T> {
+impl<'a, T: ?Sized + ToOwned> Oco<'a, T> {
    /// Converts the value into an owned value.
    pub fn into_owned(self) -> <T as ToOwned>::Owned {
        match self {
@@ -339,7 +339,7 @@ where
    }
 }

-impl<'b, A: ?Sized, B: ?Sized> PartialEq<Oco<'b, B>> for Oco<'_, A>
+impl<'a, 'b, A: ?Sized, B: ?Sized> PartialEq<Oco<'b, B>> for Oco<'a, A>
 where
    A: PartialEq<B>,
    A: ToOwned,
@@ -352,7 +352,7 @@ where

 impl<T: ?Sized + ToOwned + Eq> Eq for Oco<'_, T> {}

-impl<'b, A: ?Sized, B: ?Sized> PartialOrd<Oco<'b, B>> for Oco<'_, A>
+impl<'a, 'b, A: ?Sized, B: ?Sized> PartialOrd<Oco<'b, B>> for Oco<'a, A>
 where
    A: PartialOrd<B>,
    A: ToOwned,
@@ -551,7 +551,7 @@ impl_slice_eq!(['a, 'b, T: PartialEq] (where [T]: ToOwned), Oco<'a, [T]>, &'b [T
 impl_slice_eq!([T: PartialEq] (where [T]: ToOwned), Oco<'_, [T]>, Vec<T>);
 impl_slice_eq!(['a, 'b, T: PartialEq] (where [T]: ToOwned), Oco<'a, [T]>, Cow<'b, [T]>);

-impl<'b> Add<&'b str> for Oco<'_, str> {
+impl<'a, 'b> Add<&'b str> for Oco<'a, str> {
    type Output = Oco<'static, str>;

    fn add(self, rhs: &'b str) -> Self::Output {
@@ -559,7 +559,7 @@ impl<'b> Add<&'b str> for Oco<'_, str> {
    }
 }

-impl<'b> Add<Cow<'b, str>> for Oco<'_, str> {
+impl<'a, 'b> Add<Cow<'b, str>> for Oco<'a, str> {
    type Output = Oco<'static, str>;

    fn add(self, rhs: Cow<'b, str>) -> Self::Output {
@@ -567,7 +567,7 @@ impl<'b> Add<Cow<'b, str>> for Oco<'_, str> {
    }
 }

-impl<'b> Add<Oco<'b, str>> for Oco<'_, str> {
+impl<'a, 'b> Add<Oco<'b, str>> for Oco<'a, str> {
    type Output = Oco<'static, str>;

    fn add(self, rhs: Oco<'b, str>) -> Self::Output {
--- a/projects/sso_auth_axum/migrations/20231217000000_create_tables.sql
+++ b/projects/sso_auth_axum/migrations/20231217000000_create_tables.sql
@@ -21,6 +21,6 @@ CREATE TABLE IF NOT EXISTS google_tokens (
  access_secret TEXT NOT NULL,
  refresh_secret TEXT NOT NULL,
  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (user_id) REFERENCES users(id)
+  FOREIGN KEY (user_id) REFERENCES users(id) CONFLICT REPLACE
 );

--- a/projects/sso_auth_axum/src/lib.rs
+++ b/projects/sso_auth_axum/src/lib.rs
@@ -64,7 +64,7 @@ pub async fn refresh_token(email: String) -> Result<u64, ServerFnError> {
        .execute(&pool)
        .await?;
    sqlx::query(
-        "INSERT OR REPLACE INTO google_tokens (user_id,access_secret,refresh_secret) \
+        "INSERT INTO google_tokens (user_id,access_secret,refresh_secret) \
         VALUES (?,?,?)",
    )
    .bind(user.id)
--- a/projects/sso_auth_axum/src/main.rs
+++ b/projects/sso_auth_axum/src/main.rs
@@ -96,7 +96,7 @@ async fn main() {
    let client = oauth2::basic::BasicClient::new(
        oauth2::ClientId::new(
            std::env::var("G_AUTH_CLIENT_ID")
-                .expect("G_AUTH_CLIENT_ID Env var to be set."),
+                .expect("G_AUTH_CLIENT Env var to be set."),
        ),
        Some(oauth2::ClientSecret::new(
            std::env::var("G_AUTH_SECRET")
--- a/reactive_graph/src/computed.rs
+++ b/reactive_graph/src/computed.rs
@@ -19,7 +19,7 @@ pub(crate) use inner::MemoInner;
 pub use memo::*;
 pub use selector::*;

-/// Derives a reactive slice of an [`RwSignal`].
+/// Derives a reactive slice of an [`RwSignal`](crate::signal::RwSignal).
 ///
 /// Slices have the same guarantees as [`Memo`s](crate::computed::Memo):
 /// they only emit their value when it has actually been changed.
--- a/reactive_graph/src/lib.rs
+++ b/reactive_graph/src/lib.rs
@@ -124,7 +124,7 @@ pub fn log_warning(text: Arguments) {
    }
 }

-/// Calls [`Executor::spawn`](any_spawner::Executor), but ensures that the task also runs in the current arena, if
+/// Calls [`Executor::spawn`], but ensures that the task also runs in the current arena, if
 /// multithreaded arena sandboxing is enabled.
 pub fn spawn(task: impl Future<Output = ()> + Send + 'static) {
    #[cfg(feature = "sandboxed-arenas")]
@@ -133,9 +133,8 @@ pub fn spawn(task: impl Future<Output = ()> + Send + 'static) {
    any_spawner::Executor::spawn(task);
 }

-/// Calls [`Executor::spawn_local`](any_spawner::Executor), but ensures that the task runs under the current reactive [`Owner`](crate::owner::Owner) and observer.
-///
-/// Does not cancel the task if the owner is cleaned up.
+/// Calls [`Executor::spawn_local`], but ensures that the task runs under the current reactive [`Owner`]
+/// and [`Observed`]. Does not cancel the task if the owner is cleaned up.
 pub fn spawn_local_scoped(task: impl Future<Output = ()> + 'static) {
    let task = ScopedFuture::new(task);

@@ -145,9 +144,8 @@ pub fn spawn_local_scoped(task: impl Future<Output = ()> + 'static) {
    any_spawner::Executor::spawn_local(task);
 }

-/// Calls [`Executor::spawn_local`](any_spawner::Executor), but ensures that the task runs under the current reactive [`Owner`](crate::owner::Owner) and observer.
-///
-/// Cancels the task if the owner is cleaned up.
+/// Calls [`Executor::spawn_local`], but ensures that the task runs under the current reactive [`Owner`]
+/// and [`Observed`]. Cancels the task if the owner is cleaned up.
 pub fn spawn_local_scoped_with_cancellation(
    task: impl Future<Output = ()> + 'static,
 ) {
--- a/reactive_graph/src/owner/storage.rs
+++ b/reactive_graph/src/owner/storage.rs
@@ -30,7 +30,7 @@ impl<T> StorageAccess<T> for SendWrapper<T> {
    }
 }

-/// A way of storing an [`ArenaItem`](super::arena_item::ArenaItem), either as itself or with a wrapper to make it threadsafe.
+/// A way of storing a [`ArenaItem`], either as itself or with a wrapper to make it threadsafe.
 ///
 /// This exists because all items stored in the arena must be `Send + Sync`, but in single-threaded
 /// environments you might want or need to use thread-unsafe types.
--- a/reactive_graph/src/trait_options.rs
+++ b/reactive_graph/src/trait_options.rs
@@ -220,7 +220,7 @@ where
    }
 }

-/// Helper trait to implement flatten() on `Option<&Option<T>>`.
+/// Helper trait to implement flatten() on Option<&Option<T>>.
 pub trait FlattenOptionRefOption {
    /// The type of the value contained in the double option.
    type Value;
--- a/reactive_graph/src/traits.rs
+++ b/reactive_graph/src/traits.rs
@@ -16,7 +16,7 @@
 //! | Trait             | Mode  | Description                                                                           |
 //! |-------------------|-------|---------------------------------------------------------------------------------------|
 //! | [`Track`]         | —     | Tracks changes to this value, adding it as a source of the current reactive observer. |
-//! | [`Notify`]       | —      | Notifies subscribers that this value has changed.                                     |
+//! | [`Trigger`]       | —     | Notifies subscribers that this value has changed.                                     |
 //! | [`ReadUntracked`] | Guard | Gives immutable access to the value of this signal.                                   |
 //! | [`Write`]     | Guard | Gives mutable access to the value of this signal.
 //!
@@ -34,7 +34,7 @@
 //! | Trait               | Mode          | Composition                       | Description
 //! |---------------------|---------------|-----------------------------------|------------
 //! | [`UpdateUntracked`] | `fn(&mut T)`  | [`Write`]                     | Applies closure to the current value to update it, but doesn't notify subscribers.
-//! | [`Update`]          | `fn(&mut T)`  | [`UpdateUntracked`] + [`Notify`] | Applies closure to the current value to update it, and notifies subscribers.
+//! | [`Update`]          | `fn(&mut T)`  | [`UpdateUntracked`] + [`Trigger`] | Applies closure to the current value to update it, and notifies subscribers.
 //! | [`Set`]             | `T`           | [`Update`]                        | Sets the value to a new value, and notifies subscribers.
 //!
 //! ## Using the Traits
--- a/router/src/components.rs
+++ b/router/src/components.rs
@@ -64,8 +64,8 @@ pub fn Router<Chil>(
    //#[prop(optional)]
    //trailing_slash: TrailingSlash,
    /// The `<Router/>` should usually wrap your whole page. It can contain
-    /// any elements, and should include a [`Routes`] component somewhere
-    /// to define and display [`Route`]s.
+    /// any elements, and should include a [`Routes`](crate::Routes) component somewhere
+    /// to define and display [`Route`](crate::Route)s.
    children: TypedChildren<Chil>,
 ) -> impl IntoView
 where
@@ -328,10 +328,9 @@ where
 /// and the element it should display.
 #[component(transparent)]
 pub fn Route<Segments, View>(
-    /// The path fragment that this route should match. This can be created using the
-    /// [`path`](crate::path) macro, or path segments ([`StaticSegment`](crate::StaticSegment),
-    /// [`ParamSegment`](crate::ParamSegment), [`WildcardSegment`](crate::WildcardSegment), and
-    /// [`OptionalParamSegment`](crate::OptionalParamSegment)).
+    /// The path fragment that this route should match. This can be created using the [`path`]
+    /// macro, or path segments ([`StaticSegment`], [`ParamSegment`], [`WildcardSegment`], and
+    /// [`OptionalParamSegment`]).
    path: Segments,
    /// The view for this route.
    view: View,
@@ -350,10 +349,9 @@ where
 /// and the element it should display.
 #[component(transparent)]
 pub fn ParentRoute<Segments, View, Children>(
-    /// The path fragment that this route should match. This can be created using the
-    /// [`path`](crate::path) macro, or path segments ([`StaticSegment`](crate::StaticSegment),
-    /// [`ParamSegment`](crate::ParamSegment), [`WildcardSegment`](crate::WildcardSegment), and
-    /// [`OptionalParamSegment`](crate::OptionalParamSegment)).
+    /// The path fragment that this route should match. This can be created using the [`path`]
+    /// macro, or path segments ([`StaticSegment`], [`ParamSegment`], [`WildcardSegment`], and
+    /// [`OptionalParamSegment`]).
    path: Segments,
    /// The view for this route.
    view: View,
@@ -376,10 +374,9 @@ where
 /// redirects to `redirect_path` instead of displaying its `view`.
 #[component(transparent)]
 pub fn ProtectedRoute<Segments, ViewFn, View, C, PathFn, P>(
-    /// The path fragment that this route should match. This can be created using the
-    /// [`path`](crate::path) macro, or path segments ([`StaticSegment`](crate::StaticSegment),
-    /// [`ParamSegment`](crate::ParamSegment), [`WildcardSegment`](crate::WildcardSegment), and
-    /// [`OptionalParamSegment`](crate::OptionalParamSegment)).
+    /// The path fragment that this route should match. This can be created using the [`path`]
+    /// macro, or path segments ([`StaticSegment`], [`ParamSegment`], [`WildcardSegment`], and
+    /// [`OptionalParamSegment`]).
    path: Segments,
    /// The view for this route.
    view: ViewFn,
@@ -430,10 +427,9 @@ where

 #[component(transparent)]
 pub fn ProtectedParentRoute<Segments, ViewFn, View, C, PathFn, P, Children>(
-    /// The path fragment that this route should match. This can be created using the
-    /// [`path`](crate::path) macro, or path segments ([`StaticSegment`](crate::StaticSegment),
-    /// [`ParamSegment`](crate::ParamSegment), [`WildcardSegment`](crate::WildcardSegment), and
-    /// [`OptionalParamSegment`](crate::OptionalParamSegment)).
+    /// The path fragment that this route should match. This can be created using the [`path`]
+    /// macro, or path segments ([`StaticSegment`], [`ParamSegment`], [`WildcardSegment`], and
+    /// [`OptionalParamSegment`]).
    path: Segments,
    /// The view for this route.
    view: ViewFn,
--- a/router/src/lib.rs
+++ b/router/src/lib.rs
@@ -17,8 +17,7 @@
 //!    and are rendered by different components. This means you can navigate between siblings
 //!    in this tree without re-rendering or triggering any change in the parent routes.
 //!
-//! 3. **Progressive enhancement.** The [`A`](crate::components::A) and
-//!    [`Form`](crate::components::Form) components resolve any relative
+//! 3. **Progressive enhancement.** The [`A`] and [`Form`] components resolve any relative
 //!    nested routes, render actual `<a>` and `<form>` elements, and (when possible)
 //!    upgrading them to handle those navigations with client-side routing. If you’re using
 //!    them with server-side rendering (with or without hydration), they just work,
--- a/router/src/matching/horizontal/mod.rs
+++ b/router/src/matching/horizontal/mod.rs
@@ -9,7 +9,8 @@ pub use static_segment::*;
 /// or URL segment.
 ///
 /// This is a "horizontal" matching: i.e., it treats a tuple of route segments
-/// as subsequent segments of the URL and tries to match them all.
+/// as subsequent segments of the URL and tries to match them all. For a "vertical"
+/// matching that sees a tuple as alternatives to one another, see [`RouteChild`](super::RouteChild).
 pub trait PossibleRouteMatch {
    const OPTIONAL: bool = false;

--- a/router/src/matching/mod.rs
+++ b/router/src/matching/mod.rs
@@ -64,7 +64,10 @@ where
                } else {
                    (base.as_ref(), path)
                };
-                path.strip_prefix(base)?
+                match path.strip_prefix(base) {
+                    Some(path) => path,
+                    None => return None,
+                }
            }
        };

--- a/router/src/navigate.rs
+++ b/router/src/navigate.rs
@@ -1,6 +1,6 @@
 use crate::location::State;

-/// Options that can be used to configure a navigation. Used with [use_navigate](crate::hooks::use_navigate).
+/// Options that can be used to configure a navigation. Used with [use_navigate](crate::use_navigate).
 #[derive(Clone, Debug)]
 pub struct NavigateOptions {
    /// Whether the URL being navigated to should be resolved relative to the current route.
--- a/router/src/params.rs
+++ b/router/src/params.rs
@@ -24,7 +24,7 @@ impl ParamsMap {
    /// Inserts a value into the map.
    ///
    /// If a value with that key already exists, the new value will be added to it.
-    /// To replace the value instead, see [`replace`](Self::replace).
+    /// To replace the value instead, see [`replace`].
    pub fn insert(&mut self, key: impl Into<Cow<'static, str>>, value: String) {
        let value = Url::unescape(&value);

--- a/router/src/ssr_mode.rs
+++ b/router/src/ssr_mode.rs
@@ -44,8 +44,8 @@ pub enum SsrMode {
    ///       of the page will not be interactive until the suspended chunks have loaded.
    InOrder,
    /// **`Async`**: Load all resources on the server. Wait until all data are loaded, and render HTML in one sweep.
-    ///    - *Pros*: Better handling for meta tags (because you know async data even before you render the `<head>`). Faster complete load than **synchronous** because async resources begin loading on server.
-    ///    - *Cons*: Slower load time/TTFB: you need to wait for all async resources to load before displaying anything on the client.
+     ///    - *Pros*: Better handling for meta tags (because you know async data even before you render the `<head>`). Faster complete load than **synchronous** because async resources begin loading on server.
+     ///    - *Cons*: Slower load time/TTFB: you need to wait for all async resources to load before displaying anything on the client.
    Async,
    /// **`Static`**: Renders the page when the server starts up, or incrementally, using the
    ///    configuration provided by a [`StaticRoute`].
--- a/server_fn/Cargo.lock
+++ b/server_fn/Cargo.lock
--- a/server_fn/Cargo.toml
+++ b/server_fn/Cargo.toml
@@ -30,7 +30,7 @@ once_cell = "1.20"
 actix-web = { version = "4.9", optional = true }

 # axum
-axum = { version = "0.7.8", optional = true, default-features = false, features = [
+axum = { version = "0.7.7", optional = true, default-features = false, features = [
  "multipart",
 ] }
 tower = { version = "0.5.1", optional = true }
--- a/tachys/src/html/class.rs
+++ b/tachys/src/html/class.rs
@@ -267,7 +267,7 @@ impl<T: IntoClass> IntoClass for Option<T> {
    }
 }

-impl IntoClass for &str {
+impl<'a> IntoClass for &'a str {
    type AsyncOutput = Self;
    type State = (crate::renderer::types::Element, Self);
    type Cloneable = Self;
--- a/tachys/src/html/element/element_ext.rs
+++ b/tachys/src/html/element/element_ext.rs
@@ -10,8 +10,8 @@ use crate::{
 use wasm_bindgen::JsValue;
 use web_sys::Element;

-/// Extends an HTML element, allowing you to add attributes and children to the
-/// element's built state at runtime, with a similar API to how they
+/// Extends the [`Element`](Renderer::Element) type of a [`Renderer`], allowing you to add
+/// attributes and children to the element's built state at runtime, with a similar API to how they
 /// can be added to the static view tree at compile time.
 ///
 /// ```rust,ignore
--- a/tachys/src/html/element/inner_html.rs
+++ b/tachys/src/html/element/inner_html.rs
@@ -308,7 +308,7 @@ impl InnerHtmlValue for Arc<str> {
    }
 }

-impl InnerHtmlValue for &str {
+impl<'a> InnerHtmlValue for &'a str {
    type AsyncOutput = Self;
    type State = (crate::renderer::types::Element, Self);
    type Cloneable = Self;
--- a/tachys/src/html/style.rs
+++ b/tachys/src/html/style.rs
@@ -128,9 +128,7 @@ where
 }

 /// Any type that can be added to the `style` attribute or set as a style in
-/// the [`CssStyleDeclaration`](web_sys::CssStyleDeclaration).
-///
-/// This could be a plain string, or a property name-value pair.
+/// the [`CssStyleDeclaration`]. This could be a plain string, or a property name-value pair.
 pub trait IntoStyle: Send {
    /// The type after all async data have resolved.
    type AsyncOutput: IntoStyle;
@@ -608,7 +606,7 @@ impl<'a> IntoStyle for (&'a str, String) {
 }

 #[cfg(feature = "nightly")]
-impl<const V: &'static str> IntoStyle for (&str, Static<V>) {
+impl<'a, const V: &'static str> IntoStyle for (&'a str, Static<V>) {
    type AsyncOutput = Self;
    type State = ();
    type Cloneable = (Arc<str>, Static<V>);
--- a/tachys/src/renderer/dom.rs
+++ b/tachys/src/renderer/dom.rs
@@ -1,6 +1,6 @@
 #![allow(missing_docs)]

-//! See [`Renderer`](crate::renderer::Renderer) and [`Rndr`](crate::renderer::Rndr) for additional information.
+//! See [`Renderer`](super::Renderer) and [`Rndr`](super::Rndr) for additional information.

 use super::{CastFrom, RemoveEventHandler};
 use crate::{
@@ -15,7 +15,7 @@ use std::{any::TypeId, borrow::Cow, cell::RefCell};
 use wasm_bindgen::{intern, prelude::Closure, JsCast, JsValue};
 use web_sys::{Comment, HtmlTemplateElement};

-/// A [`Renderer`](crate::renderer::Renderer) that uses `web-sys` to manipulate DOM elements in the browser.
+/// A [`Renderer`] that uses `web-sys` to manipulate DOM elements in the browser.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct Dom;

--- a/tachys/src/renderer/mod.rs
+++ b/tachys/src/renderer/mod.rs
@@ -14,8 +14,7 @@ pub mod dom;
 /// applications, so this "generic rendering" approach was removed before 0.7.0 release.
 ///
 /// It is possible that we will try a different approach to achieve the same functionality in the
-/// future, so to the extent possible the rest of the crate tries to stick to using
-/// [`Renderer`].
+/// future, so to the extent possible the rest of the crate tries to stick to using [`Renderer`]
 /// methods rather than directly manipulating the DOM inline.
 pub type Rndr = dom::Dom;

@@ -210,6 +209,7 @@ pub trait DomRenderer: Renderer {
 /// This works in a similar way to `TryFrom`. We implement it as a separate trait
 /// simply so we don't have to create wrappers for the `web_sys` types; it can't be
 /// implemented on them directly because of the orphan rules.
+
 pub trait CastFrom<T>
 where
    Self: Sized,
--- a/tachys/src/view/mod.rs
+++ b/tachys/src/view/mod.rs
@@ -29,6 +29,9 @@ pub mod template;
 pub mod tuples;

 /// The `Render` trait allows rendering something as part of the user interface.
+///
+/// It is generic over the renderer itself, as long as that implements the [`Renderer`]
+/// trait.
 pub trait Render: Sized {
    /// The “view state” for this type, which can be retained between updates.
    ///
@@ -194,6 +197,7 @@ where
    /// Renders a view to an out-of-order stream of HTML with branch markers. This can be used to support libraries that diff
    /// HTML pages against one another, by marking sections of the view that branch to different
    /// types with marker comments.
+
    fn to_html_stream_out_of_order_branching(self) -> StreamBuilder
    where
        Self: Sized,
@@ -368,7 +372,7 @@ pub trait ToTemplate {
    /// The `style` attribute content known at compile time.
    const STYLE: &'static str = "";
    /// The length of the template.
-    const LEN: usize = Self::TEMPLATE.len();
+    const LEN: usize = Self::TEMPLATE.as_bytes().len();

    /// Renders a view type to a template. This does not take actual view data,
    /// but can be used for constructing part of an HTML `<template>` that corresponds
--- a/tachys/src/view/strings.rs
+++ b/tachys/src/view/strings.rs
@@ -36,7 +36,7 @@ impl<'a> Render for &'a str {
    }
 }

-impl RenderHtml for &str {
+impl<'a> RenderHtml for &'a str {
    type AsyncOutput = Self;

    const MIN_LENGTH: usize = 0;
@@ -102,7 +102,7 @@ impl RenderHtml for &str {
    }
 }

-impl ToTemplate for &str {
+impl<'a> ToTemplate for &'a str {
    const TEMPLATE: &'static str = " <!>";

    fn to_template(
@@ -120,7 +120,7 @@ impl ToTemplate for &str {
    }
 }

-impl Mountable for StrState<'_> {
+impl<'a> Mountable for StrState<'a> {
    fn unmount(&mut self) {
        self.node.unmount()
    }
@@ -451,7 +451,7 @@ impl<'a> Render for Cow<'a, str> {
    }
 }

-impl RenderHtml for Cow<'_, str> {
+impl<'a> RenderHtml for Cow<'a, str> {
    type AsyncOutput = Self;

    const MIN_LENGTH: usize = 0;
@@ -494,7 +494,7 @@ impl RenderHtml for Cow<'_, str> {
    }
 }

-impl ToTemplate for Cow<'_, str> {
+impl<'a> ToTemplate for Cow<'a, str> {
    const TEMPLATE: &'static str = <&str as ToTemplate>::TEMPLATE;

    fn to_template(
@@ -510,7 +510,7 @@ impl ToTemplate for Cow<'_, str> {
    }
 }

-impl Mountable for CowStrState<'_> {
+impl<'a> Mountable for CowStrState<'a> {
    fn unmount(&mut self) {
        self.node.unmount()
    }
Author	SHA1	Message	Date
Greg Johnston	05055d5015	fmt	2024-11-11 19:58:17 -05:00
Greg Johnston	b9dd0ffbd2	Merge branch 'main' into 0.7.0-docs	2024-11-11 17:37:06 -05:00
Greg Johnston	3b2e541133	Update router/src/ssr_mode.rs Co-authored-by: Rakshith Ravi <rakshith.ravi@gmx.com>	2024-11-11 17:36:41 -05:00
Greg Johnston	22a1aecaa9	Update router/src/ssr_mode.rs Co-authored-by: Rakshith Ravi <rakshith.ravi@gmx.com>	2024-11-11 17:36:35 -05:00
Greg Johnston	5327fea1a7	Update router/src/ssr_mode.rs Co-authored-by: Rakshith Ravi <rakshith.ravi@gmx.com>	2024-11-11 17:36:31 -05:00
Greg Johnston	1b4a16bc86	Update router/src/ssr_mode.rs Co-authored-by: Rakshith Ravi <rakshith.ravi@gmx.com>	2024-11-11 17:36:27 -05:00
Greg Johnston	8ee7a2072e	Update router/src/ssr_mode.rs Co-authored-by: Rakshith Ravi <rakshith.ravi@gmx.com>	2024-11-11 17:36:23 -05:00
Greg Johnston	64debdc29a	fmt	2024-11-09 19:38:08 -05:00
Greg Johnston	bb271c0727	chore: add missing docs for 0.7	2024-11-08 16:20:12 -05:00