fmt

Co-authored-by: Rakshith Ravi <rakshith.ravi@gmx.com>

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directories:
+      - "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10

.github/workflows/autofix.yml

@@ -1,54 +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
-  DEBIAN_FRONTEND: noninteractive
-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 Glib
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libglib2.0-dev
-      - 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

.github/workflows/ci-semver.yml

@@ -8,21 +8,15 @@ on:
     branches:
       - main
       - leptos_0.6
-env:
-  DEBIAN_FRONTEND: noninteractive
 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' && github.event.pull_request.labels[0].name != 'breaking'
+    if: github.event.pull_request.labels[0].name == 'semver' # needs.get-leptos-changed.outputs.leptos_changed == 'true' && github.event.pull_request.labels[0].name != 'breaking'
     name: Run semver check (nightly-2024-08-01)
     runs-on: ubuntu-latest
     steps:
-      - name: Install Glib
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libglib2.0-dev
       - name: Checkout
         uses: actions/checkout@v4
       - name: Semver Checks

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

@@ -14,7 +14,6 @@ on:
 env:
   CARGO_TERM_COLOR: always
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
-  DEBIAN_FRONTEND: noninteractive
 jobs:
   test:
     name: Run ${{ inputs.cargo_make_task }} (${{ inputs.toolchain }})
@@ -34,10 +33,6 @@ jobs:
           echo "Disk space after cleanup:"
           df -h
       # Setup environment
-      - name: Install Glib
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libglib2.0-dev
       - uses: actions/checkout@v4
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master

.gitignore

@@ -14,4 +14,3 @@ blob.rs
 
 .vscode
 vendor
-hash.txt

Cargo.toml

@@ -40,36 +40,36 @@ members = [
 exclude = ["benchmarks", "examples", "projects"]
 
 [workspace.package]
-version = "0.7.3"
+version = "0.7.0-rc1"
 edition = "2021"
 rust-version = "1.76"
 
 [workspace.dependencies]
-throw_error = { path = "./any_error/", version = "0.2.0" }
-any_spawner = { path = "./any_spawner/", version = "0.2.0" }
+throw_error = { path = "./any_error/", version = "0.2.0-rc1" }
+any_spawner = { path = "./any_spawner/", version = "0.1.0" }
 const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1.0" }
 either_of = { path = "./either_of/", version = "0.1.0" }
-hydration_context = { path = "./hydration_context", version = "0.2.0" }
-leptos = { path = "./leptos", version = "0.7.3" }
-leptos_config = { path = "./leptos_config", version = "0.7.3" }
-leptos_dom = { path = "./leptos_dom", version = "0.7.3" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.3" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.7.3" }
-leptos_macro = { path = "./leptos_macro", version = "0.7.3" }
-leptos_router = { path = "./router", version = "0.7.3" }
-leptos_router_macro = { path = "./router_macro", version = "0.7.3" }
-leptos_server = { path = "./leptos_server", version = "0.7.3" }
-leptos_meta = { path = "./meta", version = "0.7.3" }
-next_tuple = { path = "./next_tuple", version = "0.1.0" }
+hydration_context = { path = "./hydration_context", version = "0.2.0-rc1" }
+leptos = { path = "./leptos", version = "0.7.0-rc1" }
+leptos_config = { path = "./leptos_config", version = "0.7.0-rc1" }
+leptos_dom = { path = "./leptos_dom", version = "0.7.0-rc1" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-rc1" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-rc1" }
+leptos_macro = { path = "./leptos_macro", version = "0.7.0-rc1" }
+leptos_router = { path = "./router", version = "0.7.0-rc1" }
+leptos_router_macro = { path = "./router_macro", version = "0.7.0-rc1" }
+leptos_server = { path = "./leptos_server", version = "0.7.0-rc1" }
+leptos_meta = { path = "./meta", version = "0.7.0-rc1" }
+next_tuple = { path = "./next_tuple", version = "0.1.0-rc1" }
 oco_ref = { path = "./oco", version = "0.2.0" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.1.0" }
-reactive_stores = { path = "./reactive_stores", version = "0.1.0" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0" }
-server_fn = { path = "./server_fn", version = "0.7.3" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.7.3" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.3" }
-tachys = { path = "./tachys", version = "0.1.0" }
+reactive_graph = { path = "./reactive_graph", version = "0.1.0-rc1" }
+reactive_stores = { path = "./reactive_stores", version = "0.1.0-rc1" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-rc1" }
+server_fn = { path = "./server_fn", version = "0.7.0-rc1" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-rc1" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-rc1" }
+tachys = { path = "./tachys", version = "0.1.0-rc1" }
 
 [profile.release]
 codegen-units = 1
@@ -78,9 +78,3 @@ opt-level = 'z'
 
 [workspace.metadata.cargo-all-features]
 skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
-
-[workspace.lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = [
-  'cfg(leptos_debuginfo)',
-  'cfg(erase_components)',
-] }

README.md

@@ -12,6 +12,8 @@
 
 You can find a list of useful libraries and example projects at [`awesome-leptos`](https://github.com/leptos-rs/awesome-leptos).
 
+# The `main` branch is currently undergoing major changes in preparation for the [0.7](https://github.com/leptos-rs/leptos/milestone/4) release. For a stable version, please use the [v0.6.13 tag](https://github.com/leptos-rs/leptos/tree/v0.6.13)
+
 # Leptos
 
 ```rust

any_error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "throw_error"
-version = "0.2.0"
+version = "0.2.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

any_spawner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "any_spawner"
-version = "0.2.1"
+version = "0.1.1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -11,13 +11,13 @@ 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",
 ] }
-tracing = { version = "0.1.41", optional = true }
-wasm-bindgen-futures = { version = "0.4.47", optional = true }
+tracing = { version = "0.1.40", optional = true }
+wasm-bindgen-futures = { version = "0.4.45", optional = true }
 
 [features]
 async-executor = ["dep:async-executor"]

either_of/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "either_of"
-version = "0.1.3"
+version = "0.1.0"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

either_of/src/lib.rs

@@ -134,7 +134,7 @@ tuples!(EitherOf14 + EitherOf14Future + EitherOf14FutureProj => A, B, C, D, E, F
 tuples!(EitherOf15 + EitherOf15Future + EitherOf15FutureProj => A, B, C, D, E, F, G, H, I, J, K, L, M, N, O);
 tuples!(EitherOf16 + EitherOf16Future + EitherOf16FutureProj => A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P);
 
-/// Matches over the first expression and returns an either ([`Either`], [`EitherOf3`], ... [`EitherOf8`])
+/// Matches over the first expression and returns an either ([`Either`], [`EitherOf3`], ... [`EitherOf6`])
 /// composed of the values returned by the match arms.
 ///
 /// The pattern syntax is exactly the same as found in a match arm.
@@ -197,29 +197,6 @@ macro_rules! either {
             $e_pattern => $crate::EitherOf6::E($e_expression),
             $f_pattern => $crate::EitherOf6::F($f_expression),
         }
-    };
-    ($match:expr, $a_pattern:pat => $a_expression:expr, $b_pattern:pat => $b_expression:expr, $c_pattern:pat => $c_expression:expr, $d_pattern:pat => $d_expression:expr, $e_pattern:pat => $e_expression:expr, $f_pattern:pat => $f_expression:expr, $g_pattern:pat => $g_expression:expr,) => {
-        match $match {
-            $a_pattern => $crate::EitherOf7::A($a_expression),
-            $b_pattern => $crate::EitherOf7::B($b_expression),
-            $c_pattern => $crate::EitherOf7::C($c_expression),
-            $d_pattern => $crate::EitherOf7::D($d_expression),
-            $e_pattern => $crate::EitherOf7::E($e_expression),
-            $f_pattern => $crate::EitherOf7::F($f_expression),
-            $g_pattern => $crate::EitherOf7::G($g_expression),
-        }
-    };
-    ($match:expr, $a_pattern:pat => $a_expression:expr, $b_pattern:pat => $b_expression:expr, $c_pattern:pat => $c_expression:expr, $d_pattern:pat => $d_expression:expr, $e_pattern:pat => $e_expression:expr, $f_pattern:pat => $f_expression:expr, $g_pattern:pat => $g_expression:expr, $h_pattern:pat => $h_expression:expr,) => {
-        match $match {
-            $a_pattern => $crate::EitherOf8::A($a_expression),
-            $b_pattern => $crate::EitherOf8::B($b_expression),
-            $c_pattern => $crate::EitherOf8::C($c_expression),
-            $d_pattern => $crate::EitherOf8::D($d_expression),
-            $e_pattern => $crate::EitherOf8::E($e_expression),
-            $f_pattern => $crate::EitherOf8::F($f_expression),
-            $g_pattern => $crate::EitherOf8::G($g_expression),
-            $h_pattern => $crate::EitherOf8::H($h_expression),
-        }
     }; // if you need more eithers feel free to open a PR ;-)
 }
 
@@ -256,23 +233,4 @@ fn either_macro() {
         16 => 24u8,
         _ => 12,
     );
-    let _: EitherOf7<&str, f64, char, f32, u8, i8, i32> = either!(12,
-        12 => "12",
-        13 => 0.0,
-        14 => ' ',
-        15 => 0.0f32,
-        16 => 24u8,
-        17 => 2i8,
-        _ => 12,
-    );
-    let _: EitherOf8<&str, f64, char, f32, u8, i8, u32, i32> = either!(12,
-        12 => "12",
-        13 => 0.0,
-        14 => ' ',
-        15 => 0.0f32,
-        16 => 24u8,
-        17 => 2i8,
-        18 => 42u32,
-        _ => 12,
-    );
 }

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" }

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 }

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"] }

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 = [

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   |

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(()))
-}

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)
-}

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(

examples/todo_app_sqlite_csr/src/todo.rs

@@ -4,6 +4,25 @@ use leptos::prelude::*;
 use serde::{Deserialize, Serialize};
 use server_fn::ServerFnError;
 
+pub fn shell(leptos_options: &LeptosOptions) -> impl IntoView {
+    view! {
+        <!DOCTYPE html>
+        <html lang="en">
+            <head>
+                <meta charset="utf-8"/>
+                <meta name="viewport" content="width=device-width, initial-scale=1"/>
+                <AutoReload options=leptos_options.clone() />
+                <HydrationScripts options=leptos_options.clone()/>
+                <link rel="stylesheet" id="leptos" href="/pkg/todo_app_sqlite_csr.css"/>
+                <link rel="shortcut icon" type="image/ico" href="/favicon.ico"/>
+            </head>
+            <body>
+                <TodoApp/>
+            </body>
+        </html>
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[cfg_attr(feature = "ssr", derive(sqlx::FromRow))]
 pub struct Todo {

hydration_context/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hydration_context"
-version = "0.2.1"
+version = "0.2.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -14,8 +14,8 @@ throw_error = { workspace = true }
 or_poisoned = { workspace = true }
 futures = "0.3.31"
 serde = { version = "1.0", features = ["derive"] }
-wasm-bindgen = { version = "0.2.97", optional = true }
-js-sys = { version = "0.3.74", optional = true }
+wasm-bindgen = { version = "0.2.95", optional = true }
+js-sys = { version = "0.3.72", optional = true }
 once_cell = "1.20"
 pin-project-lite = "0.2.15"
 
@@ -25,6 +25,3 @@ browser = ["dep:wasm-bindgen", "dep:js-sys"]
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

hydration_context/src/hydrate.rs

@@ -1,8 +1,3 @@
-// #[wasm_bindgen(thread_local)] is deprecated in wasm-bindgen 0.2.96
-// but the replacement is also only shipped in that version
-// as a result, we'll just allow deprecated for now
-#![allow(deprecated)]
-
 use super::{SerializedDataId, SharedContext};
 use crate::{PinnedFuture, PinnedStream};
 use core::fmt::Debug;

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<()>);

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>);
@@ -375,8 +375,8 @@ pub fn handle_server_fns_with_context(
                                     .take(),
                             );
 
-                            // if it accepts text/html (i.e., is a plain form post) and doesn't already have a
-                            // Location set, then redirect to the Referer
+                            // it it accepts text/html (i.e., is a plain form post) and doesn't already have a
+                            // Location set, then redirect to to Referer
                             if accepts_html {
                                 if let Some(referrer) = referrer {
                                     let has_location =
@@ -390,20 +390,7 @@ pub fn handle_server_fns_with_context(
                                 }
                             }
 
-                            // the Location header may have been set to Referer, so any redirection by the
-                            // user must overwrite it
-                            {
-                                let mut res_options = res_options.0.write();
-                                let headers = res.0.headers_mut();
-
-                                for location in
-                                    res_options.headers.remove(header::LOCATION)
-                                {
-                                    headers.insert(header::LOCATION, location);
-                                }
-                            }
-
-                            // apply status code and headers if user changed them
+                            // apply status code and headers if used changed them
                             res.extend_response(&res_options);
                             res.0
                         })
@@ -432,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};
@@ -472,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)
@@ -491,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};
@@ -533,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)
@@ -549,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:
 /// ```
@@ -682,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)
@@ -704,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.

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.9", default-features = false, features = [
+axum = { version = "0.7.7", default-features = false, features = [
   "matched-path",
 ] }
 dashmap = "6"
@@ -26,11 +26,11 @@ once_cell = "1"
 parking_lot = "0.12.3"
 tokio = { version = "1.41", default-features = false }
 tower = { version = "0.5.1", features = ["util"] }
-tower-http = "0.6.2"
-tracing = { version = "0.1.41", optional = true }
+tower-http = "0.6.1"
+tracing = { version = "0.1.40", optional = true }
 
 [dev-dependencies]
-axum = "0.7.9"
+axum = "0.7.7"
 tokio = { version = "1.41", features = ["net", "rt-multi-thread"] }
 
 [features]

integrations/axum/src/lib.rs

@@ -16,6 +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
+//! - `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
@@ -196,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
@@ -398,8 +399,8 @@ async fn handle_server_fns_inner(
                     // actually run the server fn
                     let mut res = AxumResponse(service.run(req).await);
 
-                    // if it accepts text/html (i.e., is a plain form post) and doesn't already have a
-                    // Location set, then redirect to the Referer
+                    // it it accepts text/html (i.e., is a plain form post) and doesn't already have a
+                    // Location set, then redirect to to Referer
                     if accepts_html {
                         if let Some(referrer) = referrer {
                             let has_location =
@@ -411,7 +412,7 @@ async fn handle_server_fns_inner(
                         }
                     }
 
-                    // apply status code and headers if user changed them
+                    // apply status code and headers if used changed them
                     res.extend_response(&res_options);
                     Ok(res.0)
                 })
@@ -441,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};
@@ -478,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)
@@ -529,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};
@@ -566,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)
@@ -619,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)
@@ -750,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)
@@ -817,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)
@@ -934,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:
 /// ```
@@ -974,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)
@@ -995,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
@@ -1028,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)
@@ -1062,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
@@ -1095,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)
@@ -1993,12 +2020,12 @@ pub fn file_and_error_handler<S, IV>(
        + 'static
 where
     IV: IntoView + 'static,
-    S: Send + Sync + Clone + 'static,
+    S: Send + 'static,
     LeptosOptions: FromRef<S>,
 {
-    move |uri: Uri, State(state): State<S>, req: Request<Body>| {
+    move |uri: Uri, State(options): State<S>, req: Request<Body>| {
         Box::pin(async move {
-            let options = LeptosOptions::from_ref(&state);
+            let options = LeptosOptions::from_ref(&options);
             let res = get_static_file(uri, &options.site_root, req.headers());
             let res = res.await.unwrap();
 
@@ -2006,9 +2033,7 @@ where
                 res.into_response()
             } else {
                 let mut res = handle_response_inner(
-                    move || {
-                        provide_context(state.clone());
-                    },
+                    || {},
                     move || shell(options),
                     req,
                     |app, chunks| {

integrations/utils/src/lib.rs

@@ -40,28 +40,15 @@ pub trait ExtendResponse: Sized {
             let (owner, stream) =
                 build_response(app_fn, additional_context, stream_builder);
 
-            let sc = owner.shared_context().unwrap();
-
             let stream = stream.await.ready_chunks(32).map(|n| n.join(""));
 
+            let sc = owner.shared_context().unwrap();
             while let Some(pending) = sc.await_deferred() {
                 pending.await;
             }
 
-            let mut stream = Box::pin(
-                meta_context.inject_meta_context(stream).await.then({
-                    let sc = Arc::clone(&sc);
-                    move |chunk| {
-                        let sc = Arc::clone(&sc);
-                        async move {
-                            while let Some(pending) = sc.await_deferred() {
-                                pending.await;
-                            }
-                            chunk
-                        }
-                    }
-                }),
-            );
+            let mut stream =
+                Box::pin(meta_context.inject_meta_context(stream).await);
 
             // wait for the first chunk of the stream, then set the status and headers
             let first_chunk = stream.next().await.unwrap_or_default();

leptos/Cargo.toml

@@ -11,10 +11,7 @@ edition.workspace = true
 
 [dependencies]
 throw_error = { workspace = true }
-any_spawner = { workspace = true, features = [
-  "wasm-bindgen",
-  "futures-executor",
-] }
+any_spawner = { workspace = true, features = ["wasm-bindgen", "futures-executor"] }
 base64 = { version = "0.22.1", optional = true }
 cfg-if = "1.0"
 hydration_context = { workspace = true }
@@ -31,13 +28,9 @@ paste = "1.0"
 rand = { version = "0.8.5", optional = true }
 reactive_graph = { workspace = true, features = ["serde"] }
 rustc-hash = "2.0"
-tachys = { workspace = true, features = [
-  "reactive_graph",
-  "reactive_stores",
-  "oco",
-] }
+tachys = { workspace = true, features = ["reactive_graph", "reactive_stores", "oco"] }
 thiserror = "2.0"
-tracing = { version = "0.1.41", optional = true }
+tracing = { version = "0.1.40", optional = true }
 typed-builder = "0.20.0"
 typed-builder-macro = "0.20.0"
 serde = "1.0"
@@ -52,27 +45,25 @@ web-sys = { version = "0.3.72", features = [
   "ShadowRootInit",
   "ShadowRootMode",
 ] }
-wasm-bindgen = "0.2.97"
+wasm-bindgen = "0.2.95"
 serde_qs = "0.13.0"
 slotmap = "1.0"
 futures = "0.3.31"
 send_wrapper = "0.6.0"
-getrandom = { version = "0.2", features = ["js"], optional = true }
 
 [features]
 hydration = [
   "reactive_graph/hydration",
   "leptos_server/hydration",
   "hydration_context/browser",
-  "leptos_dom/hydration",
+  "leptos_dom/hydration"
 ]
-csr = ["leptos_macro/csr", "reactive_graph/effects", "dep:getrandom"]
+csr = ["leptos_macro/csr", "reactive_graph/effects"]
 hydrate = [
   "leptos_macro/hydrate",
   "hydration",
   "tachys/hydrate",
   "reactive_graph/effects",
-  "dep:getrandom",
 ]
 default-tls = ["server_fn/default-tls"]
 rustls = ["server_fn/rustls"]
@@ -95,10 +86,10 @@ 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",
+  "leptos_dom/trace-component-props"
 ]
 delegation = ["tachys/delegation"]
 
@@ -110,56 +101,23 @@ denylist = [
   "rustls",
   "default-tls",
   "wasm-bindgen",
-  "rkyv",                  # was causing clippy issues on nightly
+  "rkyv", # was causing clippy issues on nightly
   "trace-component-props",
   "spin",
-  "islands",
+  "experimental-islands",
 ]
 skip_feature_sets = [
-  [
-    "csr",
-    "ssr",
-  ],
-  [
-    "csr",
-    "hydrate",
-  ],
-  [
-    "ssr",
-    "hydrate",
-  ],
-  [
-    "serde",
-    "serde-lite",
-  ],
-  [
-    "serde-lite",
-    "miniserde",
-  ],
-  [
-    "serde",
-    "miniserde",
-  ],
-  [
-    "serde",
-    "rkyv",
-  ],
-  [
-    "miniserde",
-    "rkyv",
-  ],
-  [
-    "serde-lite",
-    "rkyv",
-  ],
-  [
-    "default-tls",
-    "rustls",
-  ],
+  ["csr", "ssr"],
+  ["csr", "hydrate"],
+  ["ssr", "hydrate"],
+  ["serde", "serde-lite"],
+  ["serde-lite", "miniserde"],
+  ["serde", "miniserde"],
+  ["serde", "rkyv"],
+  ["miniserde", "rkyv"],
+  ["serde-lite", "rkyv"],
+  ["default-tls", "rustls"],
 ]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

leptos/src/attribute_interceptor.rs

@@ -1,150 +0,0 @@
-use crate::attr::{
-    any_attribute::{AnyAttribute, IntoAnyAttribute},
-    Attribute, NextAttribute,
-};
-use leptos::prelude::*;
-
-/// Function stored to build/rebuild the wrapped children when attributes are added.
-type ChildBuilder<T> = dyn Fn(AnyAttribute) -> T + Send + Sync + 'static;
-
-/// Intercepts attributes passed to your component, allowing passing them to any element.
-///
-/// By default, Leptos passes any attributes passed to your component (e.g. `<MyComponent
-/// attr:class="some-class"/>`) to the top-level element in the view returned by your component.
-/// [`AttributeInterceptor`] allows you to intercept this behavior and pass it onto any element in
-/// your component instead.
-///
-/// Must be the top level element in your component's view.
-///
-/// ## Example
-///
-/// Any attributes passed to MyComponent will be passed to the #inner element.
-///
-/// ```
-/// # use leptos::prelude::*;
-/// use leptos::attribute_interceptor::AttributeInterceptor;
-///
-/// #[component]
-/// pub fn MyComponent() -> impl IntoView {
-///     view! {
-///         <AttributeInterceptor let:attrs>
-///             <div id="wrapper">
-///                 <div id="inner" {..attrs} />
-///             </div>
-///         </AttributeInterceptor>
-///     }
-/// }
-/// ```
-#[component(transparent)]
-pub fn AttributeInterceptor<Chil, T>(
-    /// The elements that will be rendered, with the attributes this component received as a
-    /// parameter.
-    children: Chil,
-) -> impl IntoView
-where
-    Chil: Fn(AnyAttribute) -> T + Send + Sync + 'static,
-    T: IntoView,
-{
-    AttributeInterceptorInner::new(children)
-}
-
-/// Wrapper to intercept attributes passed to a component so you can apply them to a different
-/// element.
-struct AttributeInterceptorInner<T: IntoView, A> {
-    children_builder: Box<ChildBuilder<T>>,
-    children: T,
-    attributes: A,
-}
-
-impl<T: IntoView> AttributeInterceptorInner<T, ()> {
-    /// Use this as the returned view from your component to collect the attributes that are passed
-    /// to your component so you can manually handle them.
-    pub fn new<F>(children: F) -> Self
-    where
-        F: Fn(AnyAttribute) -> T + Send + Sync + 'static,
-    {
-        let children_builder = Box::new(children);
-        let children = children_builder(().into_any_attr());
-
-        Self {
-            children_builder,
-            children,
-            attributes: (),
-        }
-    }
-}
-
-impl<T: IntoView, A: Attribute> Render for AttributeInterceptorInner<T, A> {
-    type State = <T as Render>::State;
-
-    fn build(self) -> Self::State {
-        self.children.build()
-    }
-
-    fn rebuild(self, state: &mut Self::State) {
-        self.children.rebuild(state);
-    }
-}
-
-impl<T: IntoView, A> AddAnyAttr for AttributeInterceptorInner<T, A>
-where
-    A: Attribute,
-{
-    type Output<SomeNewAttr: leptos::attr::Attribute> =
-        AttributeInterceptorInner<T, <<A as NextAttribute>::Output<SomeNewAttr> as Attribute>::CloneableOwned>;
-
-    fn add_any_attr<NewAttr: leptos::attr::Attribute>(
-        self,
-        attr: NewAttr,
-    ) -> Self::Output<NewAttr>
-    where
-        Self::Output<NewAttr>: RenderHtml,
-    {
-        let attributes =
-            self.attributes.add_any_attr(attr).into_cloneable_owned();
-
-        let children =
-            (self.children_builder)(attributes.clone().into_any_attr());
-
-        AttributeInterceptorInner {
-            children_builder: self.children_builder,
-            children,
-            attributes,
-        }
-    }
-}
-
-impl<T: IntoView, A: Attribute> RenderHtml for AttributeInterceptorInner<T, A> {
-    type AsyncOutput = T::AsyncOutput;
-
-    const MIN_LENGTH: usize = T::MIN_LENGTH;
-
-    fn dry_resolve(&mut self) {
-        self.children.dry_resolve()
-    }
-
-    fn resolve(
-        self,
-    ) -> impl std::future::Future<Output = Self::AsyncOutput> + Send {
-        self.children.resolve()
-    }
-
-    fn to_html_with_buf(
-        self,
-        buf: &mut String,
-        position: &mut leptos::tachys::view::Position,
-        escape: bool,
-        mark_branches: bool,
-    ) {
-        self.children
-            .to_html_with_buf(buf, position, escape, mark_branches)
-    }
-
-    fn hydrate<const FROM_SERVER: bool>(
-        self,
-        cursor: &leptos::tachys::hydration::Cursor,
-        position: &leptos::tachys::view::PositionState,
-    ) -> Self::State {
-        self.children.hydrate::<FROM_SERVER>(cursor, position)
-    }
-}

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]

leptos/src/children.rs

@@ -85,7 +85,7 @@ type BoxedChildrenFn = Box<dyn Fn() -> AnyView + Send>;
 ///     )
 /// }
 pub trait ToChildren<F> {
-    /// Convert the provided type (generally a closure) to Self (generally a "children" type,
+    /// Convert the provided type to (generally a closure) to Self (generally a "children" type,
     /// e.g., [Children]). See the implementations to see exactly which input types are supported
     /// and which "children" type they are converted to.
     fn to_children(f: F) -> Self;
@@ -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>);
 
@@ -285,13 +285,6 @@ impl<T> Debug for TypedChildrenFn<T> {
     }
 }
 
-impl<T> Clone for TypedChildrenFn<T> {
-    // Manual implementation to avoid the `T: Clone` bound.
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
 impl<T> TypedChildrenFn<T> {
     /// Extracts the inner `children` function.
     pub fn into_inner(self) -> Arc<dyn Fn() -> View<T> + Send + Sync> {

leptos/src/for_loop.rs

@@ -44,67 +44,6 @@ use tachys::{reactive_graph::OwnedView, view::keyed::keyed};
 ///   }
 /// }
 /// ```
-///
-/// For convenience, you can also choose to write template code directly in the `<For>`
-/// component, using the `let` syntax:
-///
-/// ```
-/// # use leptos::prelude::*;
-///
-/// # #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-/// # struct Counter {
-/// #   id: usize,
-/// #   count: RwSignal<i32>
-/// # }
-/// #
-/// # #[component]
-/// # fn Counters() -> impl IntoView {
-/// #   let (counters, set_counters) = create_signal::<Vec<Counter>>(vec![]);
-/// #
-///   view! {
-///     <div>
-///         <For
-///           each=move || counters.get()
-///           key=|counter| counter.id
-///           let(counter)
-///         >
-///             <button>"Value: " {move || counter.count.get()}</button>
-///         </For>
-///     </div>
-///   }
-/// # }
-/// ```
-///
-/// The `let` syntax also supports destructuring the pattern of your data.
-/// `let((one, two))` in the case of tuples, and `let(Struct { field_one, field_two })`
-/// in the case of structs.
-///
-/// ```
-/// # use leptos::prelude::*;
-///
-/// # #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-/// # struct Counter {
-/// #   id: usize,
-/// #   count: RwSignal<i32>
-/// # }
-/// #
-/// # #[component]
-/// # fn Counters() -> impl IntoView {
-/// #   let (counters, set_counters) = create_signal::<Vec<Counter>>(vec![]);
-/// #
-///   view! {
-///     <div>
-///         <For
-///           each=move || counters.get()
-///           key=|counter| counter.id
-///           let(Counter { id, count })
-///         >
-///             <button>"Value: " {move || count.get()}</button>
-///         </For>
-///     </div>
-///   }
-/// # }
-/// ```
 #[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
 #[component]
 pub fn For<IF, I, T, EF, N, KF, K>(

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)]

leptos/src/hydration/island_script.js

@@ -1,6 +1,4 @@
 ((root, pkg_path, output_name, wasm_output_name) => {
-	let MOST_RECENT_CHILDREN_CB;
-
 	function idle(c) {
 		if ("requestIdleCallback" in window) {
 			window.requestIdleCallback(c);
@@ -8,49 +6,55 @@
 			c();
 		}
 	}
-	function hydrateIslands(rootNode, mod) {
-		function traverse(node) {
+	function islandTree(rootNode) {
+		const tree = [];
+
+		function traverse(node, parent) {
 			if (node.nodeType === Node.ELEMENT_NODE) {
-				const tag = node.tagName.toLowerCase();
-				if(tag === 'leptos-island') {
+				if(node.tagName.toLowerCase() === 'leptos-island') {
 					const children = [];
 					const id = node.dataset.component || null;
-
-					hydrateIsland(node, id, mod);
+					const data = { id, node, children };
 					
 					for(const child of node.children) {
 						traverse(child, children);
 					}
+
+					(parent || tree).push(data);
 				} else {
-					if(tag === 'leptos-children') {
-						MOST_RECENT_CHILDREN_CB = node.$$on_hydrate;
-					}
 					for(const child of node.children) {
-						traverse(child);
+						traverse(child, parent);
 					};
 				}
 			}
 		}
 
-		traverse(rootNode);
+		traverse(rootNode, null);
+
+		return { el: null, id: null, children: tree };
 	}
 	function hydrateIsland(el, id, mod) {
 		const islandFn = mod[id];
 		if (islandFn) {
-			if (MOST_RECENT_CHILDREN_CB) {
-				MOST_RECENT_CHILDREN_CB();
-			}
 			islandFn(el);
 		} else {
 			console.warn(`Could not find WASM function for the island ${id}.`);
 		}
 	}
+	function hydrateIslands(entry, mod) {
+		if(entry.node) {
+			hydrateIsland(entry.node, entry.id, mod);
+		}
+		for (const island of entry.children) {
+			hydrateIslands(island, mod);
+		}
+	}
 	idle(() => {
 		import(`${root}/${pkg_path}/${output_name}.js`)
 			.then(mod => {
 				mod.default(`${root}/${pkg_path}/${wasm_output_name}.wasm`).then(() => {
 					mod.hydrate();
-					hydrateIslands(document.body, mod);
+					hydrateIslands(islandTree(document.body, null), mod);
 				});
 			})
 	});

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

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).
 //!
@@ -192,9 +192,6 @@ pub mod callback;
 /// Types that can be passed as the `children` prop of a component.
 pub mod children;
 
-/// Wrapper for intercepting component attributes.
-pub mod attribute_interceptor;
-
 #[doc(hidden)]
 /// Traits used to implement component constructors.
 pub mod component;
@@ -293,7 +290,7 @@ pub mod logging {
 
 /// Utilities for working with asynchronous tasks.
 pub mod task {
-    pub use any_spawner::{self, CustomExecutor, Executor};
+    pub use any_spawner::Executor;
     use std::future::Future;
 
     /// Spawns a thread-safe [`Future`].
@@ -321,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")]

leptos_config/Cargo.toml

@@ -26,6 +26,3 @@ temp-env = { version = "0.3.6", features = ["async_closure"] }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

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);
     });
 }

leptos_dom/Cargo.toml

@@ -12,10 +12,10 @@ edition.workspace = true
 tachys = { workspace = true }
 reactive_graph = { workspace = true }
 or_poisoned = { workspace = true }
-js-sys = "0.3.74"
+js-sys = "0.3.72"
 send_wrapper = "0.6.0"
-tracing = { version = "0.1.41", optional = true }
-wasm-bindgen = "0.2.97"
+tracing = { version = "0.1.40", optional = true }
+wasm-bindgen = "0.2.95"
 serde_json = { version = "1.0", optional = true }
 serde = { version = "1.0", optional = true }
 
@@ -37,6 +37,3 @@ rustdoc-args = ["--generate-link-to-definition"]
 
 [package.metadata.cargo-all-features]
 denylist = ["tracing"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

leptos_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.7.3"
+version = "0.7.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -13,7 +13,7 @@ edition.workspace = true
 proc-macro = true
 
 [dependencies]
-attribute-derive = { version = "0.10.3", features = ["syn-full"] }
+attribute-derive = { version = "0.10.2", features = ["syn-full"] }
 cfg-if = "1.0"
 html-escape = "0.2.13"
 itertools = "0.13.0"
@@ -27,7 +27,7 @@ leptos_hot_reload = { workspace = true }
 server_fn_macro = { workspace = true }
 convert_case = "0.6.0"
 uuid = { version = "1.11", features = ["v4"] }
-tracing = { version = "0.1.41", optional = true }
+tracing = { version = "0.1.40", optional = true }
 
 [dev-dependencies]
 log = "0.4.22"
@@ -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"]
@@ -83,7 +83,4 @@ skip_feature_sets = [
 rustdoc-args = ["--generate-link-to-definition"]
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = [
-	'cfg(leptos_debuginfo)',
-	'cfg(erase_components)',
-] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(erase_components)'] }

leptos_macro/src/component.rs

@@ -260,12 +260,8 @@ impl ToTokens for Model {
         let body_name = unmodified_fn_name_from_fn_name(&body_name);
         let body_expr = if is_island {
             quote! {
-                ::leptos::reactive::owner::Owner::new().with(|| {
-                    ::leptos::reactive::owner::Owner::with_hydration(move || {
-                        ::leptos::tachys::reactive_graph::OwnedView::new({
-                            #body_name(#prop_names)
-                        })
-                    })
+                ::leptos::reactive::owner::Owner::with_hydration(move || {
+                    #body_name(#prop_names)
                 })
             }
         } else {
@@ -305,8 +301,8 @@ impl ToTokens for Model {
             let hydrate_fn_name = hydrate_fn_name.as_ref().unwrap();
             quote! {
                 {
-                    if ::leptos::context::use_context::<::leptos::reactive::owner::IsHydrating>()
-                        .map(|h| h.0)
+                    if ::leptos::reactive::owner::Owner::current_shared_context()
+                        .map(|sc| sc.get_is_hydrating())
                         .unwrap_or(false) {
                         ::leptos::either::Either::Left(
                             #component
@@ -343,23 +339,9 @@ impl ToTokens for Model {
                     let children = Box::new(|| {
                         let sc = ::leptos::reactive::owner::Owner::current_shared_context().unwrap();
                         let prev = sc.get_is_hydrating();
-                        let owner = ::leptos::reactive::owner::Owner::new();
-                        let value = owner.clone().with(|| {
-                            ::leptos::reactive::owner::Owner::with_no_hydration(move || {
-                                ::leptos::tachys::reactive_graph::OwnedView::new({
-                                    ::leptos::tachys::html::islands::IslandChildren::new_with_on_hydrate(
-                                        children(),
-                                        {
-                                            let owner = owner.clone();
-                                            move || {
-                                                owner.set()
-                                            }
-                                        }
-
-                                    )
-                                }).into_any()
-                            })
-                        });
+                        let value = ::leptos::reactive::owner::Owner::with_no_hydration(||
+                            ::leptos::tachys::html::islands::IslandChildren::new(children()).into_any()
+                        );
                         sc.set_is_hydrating(prev);
                         value
                     });
@@ -442,21 +424,20 @@ impl ToTokens for Model {
                     };
                 let children = if is_island_with_children {
                     quote! {
-                        .children({
-                            let owner = leptos::reactive::owner::Owner::current();
-                            Box::new(move || {
+                        .children({Box::new(|| {
                             use leptos::tachys::view::any_view::IntoAny;
-                            ::leptos::tachys::html::islands::IslandChildren::new_with_on_hydrate(
-                                (),
-                                {
-                                    let owner = owner.clone();
-                                    move || {
-                                        if let Some(owner) = &owner {
-                                            owner.set()
-                                        }
-                                    }
-                                }
+                            ::leptos::tachys::html::islands::IslandChildren::new(
+                                // TODO owner restoration for context
+                                ()
                             ).into_any()})})
+                        //.children(children)
+                        /*.children(Box::new(|| {
+                            use leptos::tachys::view::any_view::IntoAny;
+                            ::leptos::tachys::html::islands::IslandChildren::new(
+                                // TODO owner restoration for context
+                                ()
+                            ).into_any()
+                        }))*/
                     }
                 } else {
                     quote! {}
@@ -674,44 +655,14 @@ impl Prop {
                 abort!(e.span(), e.to_string());
             });
 
-        let name = match *typed.pat {
-            Pat::Ident(i) => {
-                if let Some(name) = &prop_opts.name {
-                    PatIdent {
-                        attrs: vec![],
-                        by_ref: None,
-                        mutability: None,
-                        ident: Ident::new(name, i.span()),
-                        subpat: None,
-                    }
-                } else {
-                    i
-                }
-            }
-            Pat::Struct(_) | Pat::Tuple(_) | Pat::TupleStruct(_) => {
-                if let Some(name) = &prop_opts.name {
-                    PatIdent {
-                        attrs: vec![],
-                        by_ref: None,
-                        mutability: None,
-                        ident: Ident::new(name, typed.pat.span()),
-                        subpat: None,
-                    }
-                } else {
-                    abort!(
-                        typed.pat,
-                        "destructured props must be given a name e.g. \
-                         #[prop(name = \"data\")]"
-                    );
-                }
-            }
-            _ => {
-                abort!(
-                    typed.pat,
-                    "only `prop: bool` style types are allowed within the \
-                     `#[component]` macro"
-                );
-            }
+        let name = if let Pat::Ident(i) = *typed.pat {
+            i
+        } else {
+            abort!(
+                typed.pat,
+                "only `prop: bool` style types are allowed within the \
+                 `#[component]` macro"
+            );
         };
 
         Self {
@@ -914,7 +865,6 @@ struct PropOpt {
     default: Option<syn::Expr>,
     into: bool,
     attrs: bool,
-    name: Option<String>,
 }
 
 struct TypedBuilderOpts {

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
@@ -639,7 +639,7 @@ pub fn island(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
             abort!(
                 transparent,
                 "only `transparent` is supported";
-                help = "try `#[island(transparent)]` or `#[island]`"
+                help = "try `#[component(transparent)]` or `#[component]`"
             );
         }
 

leptos_macro/src/view/component_builder.rs

@@ -108,12 +108,9 @@ pub(crate) fn component_to_tokens(
             let KeyedAttributeValue::Binding(binding) = &attr.possible_value
             else {
                 if let Some(ident) = attr.key.to_string().strip_prefix("let:") {
-                    let span = match &attr.key {
-                        NodeName::Punctuated(path) => path[1].span(),
-                        _ => unreachable!(),
-                    };
-                    let ident1 = format_ident!("{ident}", span = span);
-                    return Some(quote_spanned! { span => #ident1 });
+                    let ident1 =
+                        format_ident!("{ident}", span = attr.key.span());
+                    return Some(quote! { #ident1 });
                 } else {
                     return None;
                 }

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(),
@@ -652,18 +652,6 @@ pub(crate) fn element_to_tokens(
             },
             _ => None,
         };
-
-        if let NodeAttribute::Attribute(a) = a {
-            if let Some(Tuple(_)) = a.value() {
-                return Ordering::Greater;
-            }
-        }
-        if let NodeAttribute::Attribute(b) = b {
-            if let Some(Tuple(_)) = b.value() {
-                return Ordering::Less;
-            }
-        }
-
         match (key_a.as_deref(), key_b.as_deref()) {
             (Some("class"), Some("class")) | (Some("style"), Some("style")) => {
                 Ordering::Equal
@@ -767,7 +755,7 @@ pub(crate) fn element_to_tokens(
             let name = node.name().to_string();
             // link custom ident to name span for IDE docs
             let custom = Ident::new("custom", name.span());
-            quote_spanned! { node.name().span() => ::leptos::tachys::html::element::#custom(#name) }
+            quote! { ::leptos::tachys::html::element::#custom(#name) }
         } else if is_svg_element(&tag) {
             parent_type = TagType::Svg;
             let name = if tag == "use" || tag == "use_" {
@@ -775,33 +763,33 @@ pub(crate) fn element_to_tokens(
             } else {
                 name.to_token_stream()
             };
-            quote_spanned! { node.name().span() => ::leptos::tachys::svg::#name() }
+            quote! { ::leptos::tachys::svg::#name() }
         } else if is_math_ml_element(&tag) {
             parent_type = TagType::Math;
-            quote_spanned! { node.name().span() => ::leptos::tachys::mathml::#name() }
+            quote! { ::leptos::tachys::mathml::#name() }
         } else if is_ambiguous_element(&tag) {
             match parent_type {
                 TagType::Unknown => {
                     // We decided this warning was too aggressive, but I'll leave it here in case we want it later
                     /* proc_macro_error2::emit_warning!(name.span(), "The view macro is assuming this is an HTML element, \
                     but it is ambiguous; if it is an SVG or MathML element, prefix with svg:: or math::"); */
-                    quote_spanned! { node.name().span() =>
+                    quote! {
                         ::leptos::tachys::html::element::#name()
                     }
                 }
                 TagType::Html => {
-                    quote_spanned! { node.name().span() => ::leptos::tachys::html::element::#name() }
+                    quote! { ::leptos::tachys::html::element::#name() }
                 }
                 TagType::Svg => {
-                    quote_spanned! { node.name().span() => ::leptos::tachys::svg::#name() }
+                    quote! { ::leptos::tachys::svg::#name() }
                 }
                 TagType::Math => {
-                    quote_spanned! { node.name().span() => ::leptos::tachys::math::#name() }
+                    quote! { ::leptos::tachys::math::#name() }
                 }
             }
         } else {
             parent_type = TagType::Html;
-            quote_spanned! { name.span() => ::leptos::tachys::html::element::#name() }
+            quote! { ::leptos::tachys::html::element::#name() }
         };
 
         /* TODO restore this
@@ -1722,7 +1710,7 @@ fn tuple_name(name: &str, node: &KeyedAttribute) -> TupleName {
     TupleName::None
 }
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug)]
 enum TupleName {
     None,
     Str(String),

leptos_macro/tests/component.rs

@@ -1,15 +1,6 @@
 use core::num::NonZeroUsize;
 use leptos::prelude::*;
 
-#[derive(PartialEq, Debug)]
-struct UserInfo {
-    user_id: String,
-    email: String,
-}
-
-#[derive(PartialEq, Debug)]
-struct Admin(bool);
-
 #[component]
 fn Component(
     #[prop(optional)] optional: bool,
@@ -19,10 +10,6 @@ fn Component(
     #[prop(default = NonZeroUsize::new(10).unwrap())] default: NonZeroUsize,
     #[prop(into)] into: String,
     impl_trait: impl Fn() -> i32 + 'static,
-    #[prop(name = "data")] UserInfo { email, user_id }: UserInfo,
-    #[prop(name = "tuple")] (name, id): (String, i32),
-    #[prop(name = "tuple_struct")] Admin(is_admin): Admin,
-    #[prop(name = "outside_name")] inside_name: i32,
 ) -> impl IntoView {
     _ = optional;
     _ = optional_into;
@@ -31,12 +18,6 @@ fn Component(
     _ = default;
     _ = into;
     _ = impl_trait;
-    _ = email;
-    _ = user_id;
-    _ = id;
-    _ = name;
-    _ = is_admin;
-    _ = inside_name;
 }
 
 #[test]
@@ -45,13 +26,6 @@ fn component() {
         .into("")
         .strip_option(9)
         .impl_trait(|| 42)
-        .data(UserInfo {
-            email: "em@il".into(),
-            user_id: "1".into(),
-        })
-        .tuple(("Joe".into(), 12))
-        .tuple_struct(Admin(true))
-        .outside_name(1)
         .build();
     assert!(!cp.optional);
     assert_eq!(cp.optional_into, None);
@@ -60,16 +34,6 @@ fn component() {
     assert_eq!(cp.default, NonZeroUsize::new(10).unwrap());
     assert_eq!(cp.into, "");
     assert_eq!((cp.impl_trait)(), 42);
-    assert_eq!(
-        cp.data,
-        UserInfo {
-            email: "em@il".into(),
-            user_id: "1".into(),
-        }
-    );
-    assert_eq!(cp.tuple, ("Joe".into(), 12));
-    assert_eq!(cp.tuple_struct, Admin(true));
-    assert_eq!(cp.outside_name, 1);
 }
 
 #[test]
@@ -81,26 +45,12 @@ fn component_nostrip() {
             strip_option=9
             into=""
             impl_trait=|| 42
-            data=UserInfo {
-                email: "em@il".into(),
-                user_id: "1".into(),
-            }
-            tuple=("Joe".into(), 12)
-            tuple_struct=Admin(true)
-            outside_name=1
         />
         <Component
             nostrip:optional_into=Some("foo")
             strip_option=9
             into=""
             impl_trait=|| 42
-            data=UserInfo {
-                email: "em@il".into(),
-                user_id: "1".into(),
-            }
-            tuple=("Joe".into(), 12)
-            tuple_struct=Admin(true)
-            outside_name=1
         />
     };
 }

leptos_macro/tests/ui/component.rs

@@ -44,10 +44,4 @@ fn default_with_invalid_value(
     _ = default;
 }
 
-#[component]
-fn destructure_without_name((default, value): (bool, i32)) -> impl IntoView {
-    _ = default;
-    _ = value;
-}
-
 fn main() {}

leptos_macro/tests/ui/component.stderr

@@ -1,4 +1,4 @@
-error: supported fields are `optional`, `optional_no_strip`, `strip_option`, `default`, `into`, `attrs` and `name`
+error: supported fields are `optional`, `optional_no_strip`, `strip_option`, `default`, `into` and `attrs`
   --> tests/ui/component.rs:10:31
    |
 10 | fn unknown_prop_option(#[prop(hello)] test: bool) -> impl IntoView {
@@ -41,9 +41,3 @@ error: unexpected end of input, expected one of: identifier, `::`, `<`, `_`, lit
    | ^^^^^^^^^^^^
    |
    = note: this error originates in the attribute macro `component` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: destructured props must be given a name e.g. #[prop(name = "data")]
-  --> tests/ui/component.rs:48:29
-   |
-48 | fn destructure_without_name((default, value): (bool, i32)) -> impl IntoView {
-   |                             ^^^^^^^^^^^^^^^^

leptos_macro/tests/ui/component_absolute.stderr

@@ -1,4 +1,4 @@
-error: supported fields are `optional`, `optional_no_strip`, `strip_option`, `default`, `into`, `attrs` and `name`
+error: supported fields are `optional`, `optional_no_strip`, `strip_option`, `default`, `into` and `attrs`
  --> tests/ui/component_absolute.rs:5:31
   |
 5 | fn unknown_prop_option(#[prop(hello)] test: bool) -> impl ::leptos::IntoView {

leptos_server/Cargo.toml

@@ -15,7 +15,7 @@ codee = { version = "0.2.0", features = ["json_serde"] }
 hydration_context = { workspace = true }
 reactive_graph = { workspace = true, features = ["hydration"] }
 server_fn = { workspace = true }
-tracing = { version = "0.1.41", optional = true }
+tracing = { version = "0.1.40", optional = true }
 futures = "0.3.31"
 
 any_spawner = { workspace = true }
@@ -25,8 +25,8 @@ send_wrapper = "0.6"
 
 # serialization formats
 serde = { version = "1.0" }
-js-sys = { version = "0.3.74", optional = true }
-wasm-bindgen = { version = "0.2.97", optional = true }
+js-sys = { version = "0.3.72", optional = true }
+wasm-bindgen = { version = "0.2.95", optional = true }
 serde_json = { version = "1.0" }
 
 [features]
@@ -44,6 +44,3 @@ denylist = ["tracing"]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

leptos_server/src/action.rs

@@ -43,7 +43,7 @@ where
     S::Output: 'static,
 {
     inner: ArcAction<S, Result<S::Output, ServerFnError<S::Error>>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -65,7 +65,7 @@ where
             inner: ArcAction::new_with_value(err, |input: &S| {
                 S::run_on_client(input.clone())
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -91,7 +91,7 @@ where
     fn clone(&self) -> Self {
         Self {
             inner: self.inner.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -114,11 +114,11 @@ where
     S::Output: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -132,7 +132,7 @@ where
     S::Output: 'static,
 {
     inner: Action<S, Result<S::Output, ServerFnError<S::Error>>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -153,7 +153,7 @@ where
             inner: Action::new_with_value(err, |input: &S| {
                 S::run_on_client(input.clone())
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -217,11 +217,11 @@ where
     S::Output: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

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)]

leptos_server/src/local_resource.rs

@@ -20,7 +20,7 @@ use std::{
 /// A reference-counted resource that only loads its data locally on the client.
 pub struct ArcLocalResource<T> {
     data: ArcAsyncDerived<SendWrapper<T>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -28,7 +28,7 @@ impl<T> Clone for ArcLocalResource<T> {
     fn clone(&self) -> Self {
         Self {
             data: self.data.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -70,7 +70,7 @@ impl<T> ArcLocalResource<T> {
                 let fut = fetcher();
                 SendWrapper::new(async move { SendWrapper::new(fut.await) })
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -104,11 +104,11 @@ where
 
 impl<T> DefinedAt for ArcLocalResource<T> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -200,7 +200,7 @@ impl<T> Subscriber for ArcLocalResource<T> {
 /// A resource that only loads its data locally on the client.
 pub struct LocalResource<T> {
     data: AsyncDerived<SendWrapper<T>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -253,7 +253,7 @@ impl<T> LocalResource<T> {
                     SendWrapper::new(async move { SendWrapper::new(fut.await) })
                 })
             },
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -287,11 +287,11 @@ where
 
 impl<T> DefinedAt for LocalResource<T> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -398,7 +398,7 @@ impl<T: 'static> From<ArcLocalResource<T>> for LocalResource<T> {
     fn from(arc: ArcLocalResource<T>) -> Self {
         Self {
             data: arc.data.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: arc.defined_at,
         }
     }
@@ -408,7 +408,7 @@ impl<T: 'static> From<LocalResource<T>> for ArcLocalResource<T> {
     fn from(local: LocalResource<T>) -> Self {
         Self {
             data: local.data.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: local.defined_at,
         }
     }

leptos_server/src/multi_action.rs

@@ -12,7 +12,7 @@ where
     S::Output: 'static,
 {
     inner: ArcMultiAction<S, Result<S::Output, ServerFnError<S::Error>>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -29,7 +29,7 @@ where
             inner: ArcMultiAction::new(|input: &S| {
                 S::run_on_client(input.clone())
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -55,7 +55,7 @@ where
     fn clone(&self) -> Self {
         Self {
             inner: self.inner.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -78,11 +78,11 @@ where
     S::Output: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -96,7 +96,7 @@ where
     S::Output: 'static,
 {
     inner: MultiAction<S, Result<S::Output, ServerFnError<S::Error>>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -123,7 +123,7 @@ where
             inner: MultiAction::new(|input: &S| {
                 S::run_on_client(input.clone())
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -176,11 +176,11 @@ where
     S::Output: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

leptos_server/src/once_resource.rs

@@ -60,7 +60,7 @@ pub struct ArcOnceResource<T, Ser = JsonSerdeCodec> {
     suspenses: Arc<RwLock<Vec<SuspenseContext>>>,
     loading: Arc<AtomicBool>,
     ser: PhantomData<fn() -> Ser>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -73,7 +73,7 @@ impl<T, Ser> Clone for ArcOnceResource<T, Ser> {
             suspenses: self.suspenses.clone(),
             loading: self.loading.clone(),
             ser: self.ser,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -140,7 +140,7 @@ where
             wakers,
             suspenses,
             ser: PhantomData,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         };
 
@@ -183,11 +183,11 @@ impl<T, Ser> ArcOnceResource<T, Ser> {
 
 impl<T, Ser> DefinedAt for ArcOnceResource<T, Ser> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
@@ -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,
@@ -272,7 +271,7 @@ where
 
     #[track_caller]
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         let _guard = SpecialNonReactiveZone::enter();
         let waker = cx.waker();
         self.source.track();
@@ -491,7 +490,7 @@ where
 #[derive(Debug)]
 pub struct OnceResource<T, Ser = JsonSerdeCodec> {
     inner: ArenaItem<ArcOnceResource<T, Ser>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -524,13 +523,13 @@ where
         fut: impl Future<Output = T> + Send + 'static,
         blocking: bool,
     ) -> Self {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         let defined_at = Location::caller();
         Self {
             inner: ArenaItem::new(ArcOnceResource::new_with_options(
                 fut, blocking,
             )),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at,
         }
     }
@@ -551,11 +550,11 @@ where
 
 impl<T, Ser> DefinedAt for OnceResource<T, Ser> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }

leptos_server/src/resource.rs

@@ -74,7 +74,7 @@ pub struct ArcResource<T, Ser = JsonSerdeCodec> {
     ser: PhantomData<Ser>,
     refetch: ArcRwSignal<usize>,
     data: ArcAsyncDerived<T>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -82,7 +82,7 @@ impl<T, Ser> Debug for ArcResource<T, Ser> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let mut d = f.debug_struct("ArcResource");
         d.field("ser", &self.ser).field("data", &self.data);
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         d.field("defined_at", self.defined_at);
         d.finish_non_exhaustive()
     }
@@ -98,7 +98,7 @@ where
             ser: PhantomData,
             data: arc_resource.data.into(),
             refetch: arc_resource.refetch.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -114,7 +114,7 @@ where
             ser: PhantomData,
             data: resource.data.into(),
             refetch: resource.refetch.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -122,11 +122,11 @@ where
 
 impl<T, Ser> DefinedAt for ArcResource<T, Ser> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -139,7 +139,7 @@ impl<T, Ser> Clone for ArcResource<T, Ser> {
             ser: self.ser,
             refetch: self.refetch.clone(),
             data: self.data.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -300,7 +300,7 @@ where
             ser: PhantomData,
             data,
             refetch,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -781,7 +781,7 @@ where
     ser: PhantomData<Ser>,
     data: AsyncDerived<T>,
     refetch: RwSignal<usize>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -792,7 +792,7 @@ where
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let mut d = f.debug_struct("ArcResource");
         d.field("ser", &self.ser).field("data", &self.data);
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         d.field("defined_at", self.defined_at);
         d.finish_non_exhaustive()
     }
@@ -803,11 +803,11 @@ where
     T: Send + Sync + 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -1270,7 +1270,7 @@ where
             ser: PhantomData,
             data: data.into(),
             refetch: refetch.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }

meta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_meta"
-version = "0.7.3"
+version = "0.7.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -14,8 +14,8 @@ once_cell = "1.20"
 or_poisoned = { workspace = true }
 indexmap = "2.6"
 send_wrapper = "0.6.0"
-tracing = { version = "0.1.41", optional = true }
-wasm-bindgen = "0.2.97"
+tracing = { version = "0.1.40", optional = true }
+wasm-bindgen = "0.2.95"
 futures = "0.3.31"
 
 [dependencies.web-sys]
@@ -32,6 +32,3 @@ rustdoc-args = ["--generate-link-to-definition"]
 
 [package.metadata.cargo-all-features]
 denylist = ["tracing"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

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::*;
@@ -37,10 +38,14 @@
 //! }
 //! ```
 //! # Feature Flags
+//! - `csr` Client-side rendering: Generate DOM nodes in the browser
 //! - `ssr` Server-side rendering: Generate an HTML string (typically on the server)
-//! - `tracing` Adds integration with the `tracing` crate.
+//! - `hydrate` Hydration: use this to add interactivity to an SSRed Leptos app
+//! - `stable` By default, Leptos requires `nightly` Rust, which is what allows the ergonomics
+//!   of calling signals as functions. Enable this feature to support `stable` Rust.
 //!
-//! **Important Note:** If you’re using server-side rendering, you should enable `ssr`.
+//! **Important Note:** You must enable one of `csr`, `hydrate`, or `ssr` to tell Leptos
+//! which mode your app is operating in.
 
 use futures::{Stream, StreamExt};
 use leptos::{

next_tuple/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "next_tuple"
-version = "0.1.0"
+version = "0.1.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

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 {

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
 );
 

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)

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")

reactive_graph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.1.3"
+version = "0.1.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -19,13 +19,13 @@ rustc-hash = "2.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
 slotmap = "1.0"
 thiserror = "2.0"
-tracing = { version = "0.1.41", optional = true }
+tracing = { version = "0.1.40", optional = true }
 guardian = "1.2"
 async-lock = "3.4.0"
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
-web-sys = { version = "0.3.72", features = ["console"] }
+web-sys = "0.3.72"
 
 [dev-dependencies]
 tokio = { version = "1.41", features = ["rt-multi-thread", "macros"] }
@@ -47,6 +47,3 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [package.metadata.cargo-all-features]
 denylist = ["tracing"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

reactive_graph/src/actions/action.rs

@@ -101,7 +101,7 @@ pub struct ArcAction<I, O> {
     action_fn: Arc<
         dyn Fn(&I) -> Pin<Box<dyn Future<Output = O> + Send>> + Send + Sync,
     >,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -114,7 +114,7 @@ impl<I, O> Clone for ArcAction<I, O> {
             version: self.version.clone(),
             dispatched: self.dispatched.clone(),
             action_fn: self.action_fn.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -198,7 +198,7 @@ where
             version: Default::default(),
             dispatched: Default::default(),
             action_fn: Arc::new(move |input| Box::pin(action_fn(input))),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -370,7 +370,7 @@ where
             action_fn: Arc::new(move |input| {
                 Box::pin(SendWrapper::new(action_fn(input)))
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -502,11 +502,11 @@ where
     O: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -592,7 +592,7 @@ where
 /// ```
 pub struct Action<I, O, S = SyncStorage> {
     inner: ArenaItem<ArcAction<I, O>, S>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -656,7 +656,7 @@ where
     {
         Self {
             inner: ArenaItem::new(ArcAction::new(action_fn)),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -681,7 +681,7 @@ where
     {
         Self {
             inner: ArenaItem::new(ArcAction::new_with_value(value, action_fn)),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -715,11 +715,11 @@ where
     pub fn new_local<F, Fu>(action_fn: F) -> Self
     where
         F: Fn(&I) -> Fu + 'static,
-        Fu: Future<Output = O> + 'static,
+        Fu: Future<Output = O> + Send + 'static,
     {
         Self {
             inner: ArenaItem::new_local(ArcAction::new_unsync(action_fn)),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -737,7 +737,7 @@ where
             inner: ArenaItem::new_local(ArcAction::new_unsync_with_value(
                 value, action_fn,
             )),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -979,7 +979,7 @@ where
             inner: ArenaItem::new_with_storage(ArcAction::new_unsync(
                 action_fn,
             )),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -998,7 +998,7 @@ where
             inner: ArenaItem::new_with_storage(
                 ArcAction::new_unsync_with_value(value, action_fn),
             ),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -1006,11 +1006,11 @@ where
 
 impl<I, O, S> DefinedAt for Action<I, O, S> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

reactive_graph/src/actions/multi_action.rs

@@ -46,7 +46,7 @@ use std::{fmt::Debug, future::Future, panic::Location, pin::Pin, sync::Arc};
 /// ```
 pub struct MultiAction<I, O, S = SyncStorage> {
     inner: ArenaItem<ArcMultiAction<I, O>, S>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -62,11 +62,11 @@ where
     O: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -130,7 +130,7 @@ where
     {
         Self {
             inner: ArenaItem::new_with_storage(ArcMultiAction::new(action_fn)),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }

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.

reactive_graph/src/computed/arc_memo.rs

@@ -93,7 +93,7 @@ pub struct ArcMemo<T, S = SyncStorage>
 where
     S: Storage<T>,
 {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
     inner: Arc<RwLock<MemoInner<T, S>>>,
 }
@@ -164,7 +164,7 @@ where
             RwLock::new(MemoInner::new(Arc::new(fun), subscriber))
         });
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner,
         }
@@ -177,7 +177,7 @@ where
 {
     fn clone(&self) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
             inner: Arc::clone(&self.inner),
         }
@@ -190,11 +190,11 @@ where
 {
     #[inline(always)]
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -272,7 +272,7 @@ where
         AnySource(
             Arc::as_ptr(&self.inner) as usize,
             Arc::downgrade(&self.inner) as Weak<dyn Source + Send + Sync>,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             self.defined_at,
         )
     }

reactive_graph/src/computed/async_derived/arc_async_derived.rs

@@ -107,7 +107,7 @@ use std::{
 /// - [`IntoFuture`](std::future::Future) allows you to create a [`Future`] that resolves
 ///   when this resource is done loading.
 pub struct ArcAsyncDerived<T> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     pub(crate) defined_at: &'static Location<'static>,
     // the current state of this signal
     pub(crate) value: Arc<AsyncRwLock<Option<T>>>,
@@ -117,7 +117,6 @@ pub struct ArcAsyncDerived<T> {
     pub(crate) loading: Arc<AtomicBool>,
 }
 
-#[allow(dead_code)]
 pub(crate) trait BlockingLock<T> {
     fn blocking_read_arc(self: &Arc<Self>)
         -> async_lock::RwLockReadGuardArc<T>;
@@ -184,7 +183,7 @@ impl<T> BlockingLock<T> for AsyncRwLock<T> {
 impl<T> Clone for ArcAsyncDerived<T> {
     fn clone(&self) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
             value: Arc::clone(&self.value),
             wakers: Arc::clone(&self.wakers),
@@ -197,7 +196,7 @@ impl<T> Clone for ArcAsyncDerived<T> {
 impl<T> Debug for ArcAsyncDerived<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let mut f = f.debug_struct("ArcAsyncDerived");
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         f.field("defined_at", &self.defined_at);
         f.finish_non_exhaustive()
     }
@@ -206,11 +205,11 @@ impl<T> Debug for ArcAsyncDerived<T> {
 impl<T> DefinedAt for ArcAsyncDerived<T> {
     #[inline(always)]
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -241,7 +240,7 @@ macro_rules! spawn_derived {
         let wakers = Arc::new(RwLock::new(Vec::new()));
 
         let this = ArcAsyncDerived {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             value: Arc::clone(&value),
             wakers,
@@ -584,17 +583,19 @@ impl<T: 'static> ReadUntracked for ArcAsyncDerived<T> {
 
     fn try_read_untracked(&self) -> Option<Self::Value> {
         if let Some(suspense_context) = use_context::<SuspenseContext>() {
-            let handle = suspense_context.task_id();
-            let ready = SpecialNonReactiveFuture::new(self.ready());
-            crate::spawn(async move {
-                ready.await;
-                drop(handle);
-            });
-            self.inner
-                .write()
-                .or_poisoned()
-                .suspenses
-                .push(suspense_context);
+            if self.value.blocking_read().is_none() {
+                let handle = suspense_context.task_id();
+                let ready = SpecialNonReactiveFuture::new(self.ready());
+                crate::spawn(async move {
+                    ready.await;
+                    drop(handle);
+                });
+                self.inner
+                    .write()
+                    .or_poisoned()
+                    .suspenses
+                    .push(suspense_context);
+            }
         }
         AsyncPlain::try_new(&self.value).map(ReadGuard::new)
     }
@@ -632,7 +633,7 @@ impl<T: 'static> ToAnySource for ArcAsyncDerived<T> {
         AnySource(
             Arc::as_ptr(&self.inner) as usize,
             Arc::downgrade(&self.inner) as Weak<dyn Source + Send + Sync>,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             self.defined_at,
         )
     }

reactive_graph/src/computed/async_derived/async_derived.rs

@@ -83,7 +83,7 @@ use std::{future::Future, ops::DerefMut, panic::Location};
 /// - [`IntoFuture`](std::future::Future) allows you to create a [`Future`] that resolves
 ///   when this resource is done loading.
 pub struct AsyncDerived<T, S = SyncStorage> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
     pub(crate) inner: ArenaItem<ArcAsyncDerived<T>, S>,
 }
@@ -99,10 +99,10 @@ where
     T: Send + Sync + 'static,
 {
     fn from(value: ArcAsyncDerived<T>) -> Self {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         let defined_at = value.defined_at;
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at,
             inner: ArenaItem::new_with_storage(value),
         }
@@ -127,10 +127,10 @@ where
     T: 'static,
 {
     fn from_local(value: ArcAsyncDerived<T>) -> Self {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         let defined_at = value.defined_at;
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at,
             inner: ArenaItem::new_with_storage(value),
         }
@@ -152,7 +152,7 @@ where
         Fut: Future<Output = T> + Send + 'static,
     {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(ArcAsyncDerived::new(fun)),
         }
@@ -170,7 +170,7 @@ where
         Fut: Future<Output = T> + Send + 'static,
     {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(
                 ArcAsyncDerived::new_with_initial(initial_value, fun),
@@ -187,7 +187,7 @@ impl<T> AsyncDerived<SendWrapper<T>> {
         Fut: Future<Output = T> + 'static,
     {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(ArcAsyncDerived::new_mock(fun)),
         }
@@ -209,7 +209,7 @@ where
         Fut: Future<Output = T> + 'static,
     {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(ArcAsyncDerived::new_unsync(
                 fun,
@@ -230,7 +230,7 @@ where
         Fut: Future<Output = T> + 'static,
     {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(
                 ArcAsyncDerived::new_unsync_with_initial(initial_value, fun),
@@ -278,11 +278,11 @@ where
 impl<T, S> DefinedAt for AsyncDerived<T, S> {
     #[inline(always)]
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

reactive_graph/src/computed/inner.rs

@@ -67,9 +67,7 @@ where
     fn mark_check(&self) {
         {
             let mut lock = self.write().or_poisoned();
-            if lock.state != ReactiveNodeState::Dirty {
-                lock.state = ReactiveNodeState::Check;
-            }
+            lock.state = ReactiveNodeState::Check;
         }
         for sub in (&self.read().or_poisoned().subscribers).into_iter() {
             sub.mark_check();

reactive_graph/src/computed/memo.rs

@@ -100,7 +100,7 @@ pub struct Memo<T, S = SyncStorage>
 where
     S: Storage<T>,
 {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
     inner: ArenaItem<ArcMemo<T, S>, S>,
 }
@@ -121,7 +121,7 @@ where
     #[track_caller]
     fn from(value: ArcMemo<T, SyncStorage>) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(value),
         }
@@ -135,7 +135,7 @@ where
     #[track_caller]
     fn from_local(value: ArcMemo<T, LocalStorage>) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(value),
         }
@@ -175,7 +175,7 @@ where
         T: PartialEq,
     {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(ArcMemo::new(fun)),
         }
@@ -197,7 +197,7 @@ where
         changed: fn(Option<&T>, Option<&T>) -> bool,
     ) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(ArcMemo::new_with_compare(
                 fun, changed,
@@ -207,7 +207,7 @@ where
 
     /// Creates a new memo by passing a function that computes the value.
     ///
-    /// Unlike [`Memo::new`](), this receives ownership of the previous value. As a result, it
+    /// Unlike [`ArcMemo::new`](), this receives ownership of the previous value. As a result, it
     /// must return both the new value and a `bool` that is `true` if the value has changed.
     ///
     /// This is lazy: the function will not be called until the memo's value is read for the first
@@ -221,7 +221,7 @@ where
         fun: impl Fn(Option<T>) -> (T, bool) + Send + Sync + 'static,
     ) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(ArcMemo::new_owning(fun)),
         }
@@ -276,11 +276,11 @@ where
     S: Storage<T>,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

reactive_graph/src/graph/sets.rs

@@ -59,7 +59,7 @@ impl<'a> IntoIterator for &'a SourceSet {
         self.0.iter()
     }
 }
-#[derive(Debug, Default, Clone)]
+#[derive(Default, Clone)]
 pub struct SubscriberSet(Vec<AnySubscriber>);
 
 impl SubscriberSet {

reactive_graph/src/graph/source.rs

@@ -26,17 +26,16 @@ pub trait Source: ReactiveNode {
 pub struct AnySource(
     pub(crate) usize,
     pub(crate) Weak<dyn Source + Send + Sync>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
-    pub(crate)  &'static Location<'static>,
+    #[cfg(debug_assertions)] pub(crate) &'static Location<'static>,
 );
 
 impl DefinedAt for AnySource {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.2)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

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,
 ) {

reactive_graph/src/owner.rs

@@ -292,8 +292,6 @@ impl Owner {
     #[cfg(feature = "hydration")]
     pub fn with_hydration<T>(fun: impl FnOnce() -> T + 'static) -> T {
         fn inner<T>(fun: Box<dyn FnOnce() -> T>) -> T {
-            provide_context(IsHydrating(true));
-
             let sc = OWNER.with_borrow(|o| {
                 o.as_ref()
                     .and_then(|current| current.shared_context.clone())
@@ -317,8 +315,6 @@ impl Owner {
     #[cfg(feature = "hydration")]
     pub fn with_no_hydration<T>(fun: impl FnOnce() -> T + 'static) -> T {
         fn inner<T>(fun: Box<dyn FnOnce() -> T>) -> T {
-            provide_context(IsHydrating(false));
-
             let sc = OWNER.with_borrow(|o| {
                 o.as_ref()
                     .and_then(|current| current.shared_context.clone())
@@ -339,10 +335,6 @@ impl Owner {
     }
 }
 
-#[doc(hidden)]
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub struct IsHydrating(pub bool);
-
 /// Registers a function to be run the next time the current owner is cleaned up.
 ///
 /// Because the ownership model is associated with reactive nodes, each "decision point" in an

reactive_graph/src/owner/arc_stored_value.rs

@@ -1,6 +1,6 @@
 use crate::{
     signal::guards::{Plain, ReadGuard, UntrackedWriteGuard},
-    traits::{DefinedAt, IntoInner, IsDisposed, ReadValue, WriteValue},
+    traits::{DefinedAt, IsDisposed, ReadValue, WriteValue},
 };
 use std::{
     fmt::{Debug, Formatter},
@@ -19,7 +19,7 @@ use std::{
 /// accessing it does not cause effects to subscribe, and
 /// updating it does not notify anything else.
 pub struct ArcStoredValue<T> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
     value: Arc<RwLock<T>>,
 }
@@ -27,7 +27,7 @@ pub struct ArcStoredValue<T> {
 impl<T> Clone for ArcStoredValue<T> {
     fn clone(&self) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
             value: Arc::clone(&self.value),
         }
@@ -47,7 +47,7 @@ impl<T: Default> Default for ArcStoredValue<T> {
     #[track_caller]
     fn default() -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             value: Arc::new(RwLock::new(T::default())),
         }
@@ -70,11 +70,11 @@ impl<T> Hash for ArcStoredValue<T> {
 
 impl<T> DefinedAt for ArcStoredValue<T> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -90,7 +90,7 @@ impl<T> ArcStoredValue<T> {
     #[track_caller]
     pub fn new(value: T) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             value: Arc::new(RwLock::new(value)),
         }
@@ -124,12 +124,3 @@ impl<T> IsDisposed for ArcStoredValue<T> {
         false
     }
 }
-
-impl<T> IntoInner for ArcStoredValue<T> {
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        Some(Arc::into_inner(self.value)?.into_inner().unwrap())
-    }
-}

reactive_graph/src/owner/arena.rs

@@ -121,11 +121,8 @@ pub mod sandboxed {
     }
 
     impl<T> Sandboxed<T> {
-        /// Wraps the given [`Future`], ensuring that any [`ArenaItem`][item] created while it is
-        /// being polled will be associated with the same arena that was active when this was
-        /// called.
-        ///
-        /// [item]:[crate::owner::ArenaItem]
+        /// Wraps the given [`Future`], ensuring that any [`ArenaItem`] created while it is being
+        /// polled will be associated with the same arena that was active when this was called.
         pub fn new(inner: T) -> Self {
             let arena = MAP.with_borrow(|n| n.as_ref().and_then(Weak::upgrade));
             Self { arena, inner }

reactive_graph/src/owner/arena_item.rs

@@ -2,7 +2,7 @@ use super::{
     arena::{Arena, NodeId},
     LocalStorage, Storage, SyncStorage, OWNER,
 };
-use crate::traits::{Dispose, IntoInner, IsDisposed};
+use crate::traits::{Dispose, IsDisposed};
 use send_wrapper::SendWrapper;
 use std::{any::Any, hash::Hash, marker::PhantomData};
 
@@ -134,12 +134,3 @@ impl<T, S> Dispose for ArenaItem<T, S> {
         Arena::with_mut(|arena| arena.remove(self.node));
     }
 }
-
-impl<T, S: Storage<T>> IntoInner for ArenaItem<T, S> {
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        S::take(self.node)
-    }
-}

reactive_graph/src/owner/context.rs

@@ -15,14 +15,35 @@ impl Owner {
     }
 
     fn use_context<T: Clone + 'static>(&self) -> Option<T> {
-        self.with_context(Clone::clone)
+        let ty = TypeId::of::<T>();
+        let inner = self.inner.read().or_poisoned();
+        let mut parent = inner.parent.as_ref().and_then(|p| p.upgrade());
+        let contexts = &self.inner.read().or_poisoned().contexts;
+        if let Some(context) = contexts.get(&ty) {
+            context.downcast_ref::<T>().cloned()
+        } else {
+            while let Some(ref this_parent) = parent.clone() {
+                let this_parent = this_parent.read().or_poisoned();
+                let contexts = &this_parent.contexts;
+                let value = contexts.get(&ty);
+                let downcast = value
+                    .and_then(|context| context.downcast_ref::<T>().cloned());
+                if let Some(value) = downcast {
+                    return Some(value);
+                } else {
+                    parent =
+                        this_parent.parent.as_ref().and_then(|p| p.upgrade());
+                }
+            }
+            None
+        }
     }
 
     fn take_context<T: 'static>(&self) -> Option<T> {
         let ty = TypeId::of::<T>();
-        let mut inner = self.inner.write().or_poisoned();
+        let inner = self.inner.read().or_poisoned();
         let mut parent = inner.parent.as_ref().and_then(|p| p.upgrade());
-        let contexts = &mut inner.contexts;
+        let contexts = &mut self.inner.write().or_poisoned().contexts;
         if let Some(context) = contexts.remove(&ty) {
             context.downcast::<T>().ok().map(|n| *n)
         } else {
@@ -43,64 +64,6 @@ impl Owner {
         }
     }
 
-    fn with_context<T: 'static, R>(
-        &self,
-        cb: impl FnOnce(&T) -> R,
-    ) -> Option<R> {
-        let ty = TypeId::of::<T>();
-        let inner = self.inner.read().or_poisoned();
-        let mut parent = inner.parent.as_ref().and_then(|p| p.upgrade());
-        let contexts = &inner.contexts;
-        let reference = if let Some(context) = contexts.get(&ty) {
-            context.downcast_ref::<T>()
-        } else {
-            while let Some(ref this_parent) = parent.clone() {
-                let this_parent = this_parent.read().or_poisoned();
-                let contexts = &this_parent.contexts;
-                let value = contexts.get(&ty);
-                let downcast =
-                    value.and_then(|context| context.downcast_ref::<T>());
-                if let Some(value) = downcast {
-                    return Some(cb(value));
-                } else {
-                    parent =
-                        this_parent.parent.as_ref().and_then(|p| p.upgrade());
-                }
-            }
-            None
-        };
-        reference.map(cb)
-    }
-
-    fn update_context<T: 'static, R>(
-        &self,
-        cb: impl FnOnce(&mut T) -> R,
-    ) -> Option<R> {
-        let ty = TypeId::of::<T>();
-        let mut inner = self.inner.write().or_poisoned();
-        let mut parent = inner.parent.as_ref().and_then(|p| p.upgrade());
-        let contexts = &mut inner.contexts;
-        let reference = if let Some(context) = contexts.get_mut(&ty) {
-            context.downcast_mut::<T>()
-        } else {
-            while let Some(ref this_parent) = parent.clone() {
-                let mut this_parent = this_parent.write().or_poisoned();
-                let contexts = &mut this_parent.contexts;
-                let value = contexts.get_mut(&ty);
-                let downcast =
-                    value.and_then(|context| context.downcast_mut::<T>());
-                if let Some(value) = downcast {
-                    return Some(cb(value));
-                } else {
-                    parent =
-                        this_parent.parent.as_ref().and_then(|p| p.upgrade());
-                }
-            }
-            None
-        };
-        reference.map(cb)
-    }
-
     /// Searches for items stored in context in either direction, either among parents or among
     /// descendants.
     pub fn use_context_bidirectional<T: Clone + 'static>(&self) -> Option<T> {
@@ -356,86 +319,3 @@ pub fn expect_context<T: Clone + 'static>() -> T {
 pub fn take_context<T: 'static>() -> Option<T> {
     Owner::current().and_then(|owner| owner.take_context())
 }
-
-/// Access a reference to a context value of type `T` in the reactive system.
-///
-/// This traverses the reactive ownership graph, beginning from the current reactive
-/// [`Owner`] and iterating through its parents, if any. When the value is found,
-/// the function that you pass is applied to an immutable reference to it.
-///
-/// The context value should have been provided elsewhere using
-/// [`provide_context`](provide_context).
-///
-/// This is useful for passing values down to components or functions lower in a
-/// hierarchy without needs to “prop drill” by passing them through each layer as
-/// arguments to a function or properties of a component.
-///
-/// Context works similarly to variable scope: a context that is provided higher in
-/// the reactive graph can be used lower down, but a context that is provided lower
-/// in the tree cannot be used higher up.
-///
-/// ```rust
-/// # use reactive_graph::prelude::*;
-/// # use reactive_graph::owner::*;
-/// # let owner = Owner::new(); owner.set();
-/// # use reactive_graph::effect::Effect;
-/// # futures::executor::block_on(async move {
-/// # any_spawner::Executor::init_futures_executor();
-/// Effect::new(move |_| {
-///     provide_context(String::from("foo"));
-///
-///     Effect::new(move |_| {
-///         let value = with_context::<String, _>(|val| val.to_string())
-///             .expect("could not find String in context");
-///         assert_eq!(value, "foo");
-///     });
-/// });
-/// # });
-/// ```
-pub fn with_context<T: 'static, R>(cb: impl FnOnce(&T) -> R) -> Option<R> {
-    Owner::current().and_then(|owner| owner.with_context(cb))
-}
-
-/// Update a context value of type `T` in the reactive system.
-///
-/// This traverses the reactive ownership graph, beginning from the current reactive
-/// [`Owner`] and iterating through its parents, if any. When the value is found,
-/// the function that you pass is applied to a mutable reference to it.
-///
-/// The context value should have been provided elsewhere using
-/// [`provide_context`](provide_context).
-///
-/// This is useful for passing values down to components or functions lower in a
-/// hierarchy without needs to “prop drill” by passing them through each layer as
-/// arguments to a function or properties of a component.
-///
-/// Context works similarly to variable scope: a context that is provided higher in
-/// the reactive graph can be used lower down, but a context that is provided lower
-/// in the tree cannot be used higher up.
-///
-/// ```rust
-/// # use reactive_graph::prelude::*;
-/// # use reactive_graph::owner::*;
-/// # let owner = Owner::new(); owner.set();
-/// # use reactive_graph::effect::Effect;
-/// # futures::executor::block_on(async move {
-/// # any_spawner::Executor::init_futures_executor();
-/// Effect::new(move |_| {
-///     provide_context(String::from("foo"));
-///
-///     Effect::new(move |_| {
-///         let value = update_context::<String, _>(|val| {
-///             std::mem::replace(val, "bar".to_string())
-///         })
-///         .expect("could not find String in context");
-///         assert_eq!(value, "foo");
-///         assert_eq!(expect_context::<String>(), "bar");
-///     });
-/// });
-/// # });
-/// ```
-pub fn update_context<T: 'static, R>(
-    cb: impl FnOnce(&mut T) -> R,
-) -> Option<R> {
-    Owner::current().and_then(|owner| owner.update_context(cb))
-}

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.
@@ -54,10 +54,6 @@ pub trait Storage<T>: Send + Sync + 'static {
 
     /// Sets a new value for the stored value. If it has been disposed, returns `Some(T)`.
     fn try_set(node: NodeId, value: T) -> Option<T>;
-
-    /// Takes an item from the arena if it exists and can be accessed from this thread.
-    /// If it cannot be casted, it will still be removed from the arena.
-    fn take(node: NodeId) -> Option<T>;
 }
 
 /// A form of [`Storage`] that stores the type as itself, with no wrapper.
@@ -104,16 +100,6 @@ where
             }
         })
     }
-
-    fn take(node: NodeId) -> Option<T> {
-        Arena::with_mut(|arena| {
-            let m = arena.remove(node)?;
-            match m.downcast::<T>() {
-                Ok(inner) => Some(*inner),
-                Err(_) => None,
-            }
-        })
-    }
 }
 
 /// A form of [`Storage`] that stores the type with a wrapper that makes it `Send + Sync`, but only
@@ -162,14 +148,4 @@ where
             }
         })
     }
-
-    fn take(node: NodeId) -> Option<T> {
-        Arena::with_mut(|arena| {
-            let m = arena.remove(node)?;
-            match m.downcast::<SendWrapper<T>>() {
-                Ok(inner) => Some(inner.take()),
-                Err(_) => None,
-            }
-        })
-    }
 }

reactive_graph/src/owner/stored_value.rs

@@ -4,9 +4,7 @@ use super::{
 };
 use crate::{
     signal::guards::{Plain, ReadGuard, UntrackedWriteGuard},
-    traits::{
-        DefinedAt, Dispose, IntoInner, IsDisposed, ReadValue, WriteValue,
-    },
+    traits::{DefinedAt, Dispose, IsDisposed, ReadValue, WriteValue},
     unwrap_signal,
 };
 use std::{
@@ -24,7 +22,7 @@ use std::{
 /// updating it does not notify anything else.
 pub struct StoredValue<T, S = SyncStorage> {
     value: ArenaItem<ArcStoredValue<T>, S>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -64,11 +62,11 @@ impl<T, S> Hash for StoredValue<T, S> {
 
 impl<T, S> DefinedAt for StoredValue<T, S> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -85,7 +83,7 @@ where
     pub fn new_with_storage(value: T) -> Self {
         Self {
             value: ArenaItem::new_with_storage(ArcStoredValue::new(value)),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -164,19 +162,6 @@ impl<T, S> Dispose for StoredValue<T, S> {
     }
 }
 
-impl<T, S> IntoInner for StoredValue<T, S>
-where
-    T: 'static,
-    S: Storage<ArcStoredValue<T>>,
-{
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        self.value.into_inner()?.into_inner()
-    }
-}
-
 impl<T> From<ArcStoredValue<T>> for StoredValue<T>
 where
     T: Send + Sync + 'static,
@@ -184,7 +169,7 @@ where
     #[track_caller]
     fn from(value: ArcStoredValue<T>) -> Self {
         StoredValue {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             value: ArenaItem::new(value),
         }

reactive_graph/src/signal.rs

@@ -113,8 +113,7 @@ pub fn arc_signal<T>(value: T) -> (ArcReadSignal<T>, ArcWriteSignal<T>) {
 pub fn signal<T: Send + Sync + 'static>(
     value: T,
 ) -> (ReadSignal<T>, WriteSignal<T>) {
-    let (r, w) = arc_signal(value);
-    (r.into(), w.into())
+    RwSignal::new(value).split()
 }
 
 /// Creates an arena-allocated signal.

reactive_graph/src/signal/arc_read.rs

@@ -4,7 +4,7 @@ use super::{
 };
 use crate::{
     graph::SubscriberSet,
-    traits::{DefinedAt, IntoInner, IsDisposed, ReadUntracked},
+    traits::{DefinedAt, IsDisposed, ReadUntracked},
 };
 use core::fmt::{Debug, Formatter, Result};
 use std::{
@@ -54,7 +54,7 @@ use std::{
 /// assert_eq!(count.read(), 0);
 /// ```
 pub struct ArcReadSignal<T> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     pub(crate) defined_at: &'static Location<'static>,
     pub(crate) value: Arc<RwLock<T>>,
     pub(crate) inner: Arc<RwLock<SubscriberSet>>,
@@ -64,7 +64,7 @@ impl<T> Clone for ArcReadSignal<T> {
     #[track_caller]
     fn clone(&self) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
             value: Arc::clone(&self.value),
             inner: Arc::clone(&self.inner),
@@ -85,7 +85,7 @@ impl<T: Default> Default for ArcReadSignal<T> {
     #[track_caller]
     fn default() -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             value: Arc::new(RwLock::new(T::default())),
             inner: Arc::new(RwLock::new(SubscriberSet::new())),
@@ -110,11 +110,11 @@ impl<T> Hash for ArcReadSignal<T> {
 impl<T> DefinedAt for ArcReadSignal<T> {
     #[inline(always)]
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -128,15 +128,6 @@ impl<T> IsDisposed for ArcReadSignal<T> {
     }
 }
 
-impl<T> IntoInner for ArcReadSignal<T> {
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        Some(Arc::into_inner(self.value)?.into_inner().unwrap())
-    }
-}
-
 impl<T> AsSubscriberSet for ArcReadSignal<T> {
     type Output = Arc<RwLock<SubscriberSet>>;
 

reactive_graph/src/signal/arc_rw.rs

@@ -6,7 +6,7 @@ use super::{
 use crate::{
     graph::{ReactiveNode, SubscriberSet},
     prelude::{IsDisposed, Notify},
-    traits::{DefinedAt, IntoInner, ReadUntracked, UntrackableGuard, Write},
+    traits::{DefinedAt, ReadUntracked, UntrackableGuard, Write},
 };
 use core::fmt::{Debug, Formatter, Result};
 use std::{
@@ -94,7 +94,7 @@ use std::{
 /// assert_eq!(double_count(), 2);
 /// ```
 pub struct ArcRwSignal<T> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     pub(crate) defined_at: &'static Location<'static>,
     pub(crate) value: Arc<RwLock<T>>,
     pub(crate) inner: Arc<RwLock<SubscriberSet>>,
@@ -104,7 +104,7 @@ impl<T> Clone for ArcRwSignal<T> {
     #[track_caller]
     fn clone(&self) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
             value: Arc::clone(&self.value),
             inner: Arc::clone(&self.inner),
@@ -154,7 +154,7 @@ impl<T> ArcRwSignal<T> {
     #[track_caller]
     pub fn new(value: T) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             value: Arc::new(RwLock::new(value)),
             inner: Arc::new(RwLock::new(SubscriberSet::new())),
@@ -165,7 +165,7 @@ impl<T> ArcRwSignal<T> {
     #[track_caller]
     pub fn read_only(&self) -> ArcReadSignal<T> {
         ArcReadSignal {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             value: Arc::clone(&self.value),
             inner: Arc::clone(&self.inner),
@@ -176,7 +176,7 @@ impl<T> ArcRwSignal<T> {
     #[track_caller]
     pub fn write_only(&self) -> ArcWriteSignal<T> {
         ArcWriteSignal {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             value: Arc::clone(&self.value),
             inner: Arc::clone(&self.inner),
@@ -198,7 +198,7 @@ impl<T> ArcRwSignal<T> {
     ) -> Option<Self> {
         if Arc::ptr_eq(&read.inner, &write.inner) {
             Some(Self {
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: Location::caller(),
                 value: read.value,
                 inner: read.inner,
@@ -212,11 +212,11 @@ impl<T> ArcRwSignal<T> {
 impl<T> DefinedAt for ArcRwSignal<T> {
     #[inline(always)]
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -230,15 +230,6 @@ impl<T> IsDisposed for ArcRwSignal<T> {
     }
 }
 
-impl<T> IntoInner for ArcRwSignal<T> {
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        Some(Arc::into_inner(self.value)?.into_inner().unwrap())
-    }
-}
-
 impl<T> AsSubscriberSet for ArcRwSignal<T> {
     type Output = Arc<RwLock<SubscriberSet>>;
 

reactive_graph/src/signal/arc_trigger.rs

@@ -13,7 +13,7 @@ use std::{
 ///
 /// This can be useful for when using external data not stored in signals, for example.
 pub struct ArcTrigger {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     pub(crate) defined_at: &'static Location<'static>,
     pub(crate) inner: Arc<RwLock<SubscriberSet>>,
 }
@@ -23,7 +23,7 @@ impl ArcTrigger {
     #[track_caller]
     pub fn new() -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: Default::default(),
         }
@@ -40,7 +40,7 @@ impl Clone for ArcTrigger {
     #[track_caller]
     fn clone(&self) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
             inner: Arc::clone(&self.inner),
         }
@@ -72,11 +72,11 @@ impl AsSubscriberSet for ArcTrigger {
 impl DefinedAt for ArcTrigger {
     #[inline(always)]
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

reactive_graph/src/signal/arc_write.rs

@@ -2,7 +2,7 @@ use super::guards::{UntrackedWriteGuard, WriteGuard};
 use crate::{
     graph::{ReactiveNode, SubscriberSet},
     prelude::{IsDisposed, Notify},
-    traits::{DefinedAt, IntoInner, UntrackableGuard, Write},
+    traits::{DefinedAt, UntrackableGuard, Write},
 };
 use core::fmt::{Debug, Formatter, Result};
 use std::{
@@ -54,7 +54,7 @@ use std::{
 /// assert_eq!(count.get(), 3);
 /// ```
 pub struct ArcWriteSignal<T> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     pub(crate) defined_at: &'static Location<'static>,
     pub(crate) value: Arc<RwLock<T>>,
     pub(crate) inner: Arc<RwLock<SubscriberSet>>,
@@ -64,7 +64,7 @@ impl<T> Clone for ArcWriteSignal<T> {
     #[track_caller]
     fn clone(&self) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
             value: Arc::clone(&self.value),
             inner: Arc::clone(&self.inner),
@@ -98,11 +98,11 @@ impl<T> Hash for ArcWriteSignal<T> {
 impl<T> DefinedAt for ArcWriteSignal<T> {
     #[inline(always)]
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -116,15 +116,6 @@ impl<T> IsDisposed for ArcWriteSignal<T> {
     }
 }
 
-impl<T> IntoInner for ArcWriteSignal<T> {
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        Some(Arc::into_inner(self.value)?.into_inner().unwrap())
-    }
-}
-
 impl<T> Notify for ArcWriteSignal<T> {
     fn notify(&self) {
         self.inner.mark_dirty();

reactive_graph/src/signal/guards.rs

@@ -104,7 +104,7 @@ impl<T: 'static> Debug for Plain<T> {
 impl<T: 'static> Plain<T> {
     /// Takes a reference-counted read guard on the given lock.
     pub fn try_new(inner: Arc<RwLock<T>>) -> Option<Self> {
-        ArcRwLockReadGuardian::try_take(inner)?
+        ArcRwLockReadGuardian::take(inner)
             .ok()
             .map(|guard| Plain { guard })
     }
@@ -331,7 +331,7 @@ pub struct UntrackedWriteGuard<T: 'static>(ArcRwLockWriteGuardian<T>);
 impl<T: 'static> UntrackedWriteGuard<T> {
     /// Creates a write guard from the given lock.
     pub fn try_new(inner: Arc<RwLock<T>>) -> Option<Self> {
-        ArcRwLockWriteGuardian::try_take(inner)?
+        ArcRwLockWriteGuardian::take(inner)
             .ok()
             .map(UntrackedWriteGuard)
     }

reactive_graph/src/signal/read.rs

@@ -6,7 +6,7 @@ use super::{
 use crate::{
     graph::SubscriberSet,
     owner::{ArenaItem, FromLocal, LocalStorage, Storage, SyncStorage},
-    traits::{DefinedAt, Dispose, IntoInner, IsDisposed, ReadUntracked},
+    traits::{DefinedAt, Dispose, IsDisposed, ReadUntracked},
     unwrap_signal,
 };
 use core::fmt::Debug;
@@ -58,7 +58,7 @@ use std::{
 /// assert_eq!(count.read(), 0);
 /// ```
 pub struct ReadSignal<T, S = SyncStorage> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     pub(crate) defined_at: &'static Location<'static>,
     pub(crate) inner: ArenaItem<ArcReadSignal<T>, S>,
 }
@@ -105,11 +105,11 @@ impl<T, S> Hash for ReadSignal<T, S> {
 
 impl<T, S> DefinedAt for ReadSignal<T, S> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -122,18 +122,6 @@ impl<T, S> IsDisposed for ReadSignal<T, S> {
     }
 }
 
-impl<T, S> IntoInner for ReadSignal<T, S>
-where
-    S: Storage<ArcReadSignal<T>>,
-{
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        self.inner.into_inner()?.into_inner()
-    }
-}
-
 impl<T, S> AsSubscriberSet for ReadSignal<T, S>
 where
     S: Storage<ArcReadSignal<T>>,
@@ -168,7 +156,7 @@ where
     #[track_caller]
     fn from(value: ArcReadSignal<T>) -> Self {
         ReadSignal {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(value),
         }
@@ -182,7 +170,7 @@ where
     #[track_caller]
     fn from_local(value: ArcReadSignal<T>) -> Self {
         ReadSignal {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(value),
         }

reactive_graph/src/signal/rw.rs

@@ -8,7 +8,7 @@ use crate::{
     owner::{ArenaItem, FromLocal, LocalStorage, Storage, SyncStorage},
     signal::guards::{UntrackedWriteGuard, WriteGuard},
     traits::{
-        DefinedAt, Dispose, IntoInner, IsDisposed, Notify, ReadUntracked,
+        DefinedAt, Dispose, IsDisposed, Notify, ReadUntracked,
         UntrackableGuard, Write,
     },
     unwrap_signal,
@@ -100,7 +100,7 @@ use std::{
 /// assert_eq!(double_count(), 2);
 /// ```
 pub struct RwSignal<T, S = SyncStorage> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
     inner: ArenaItem<ArcRwSignal<T>, S>,
 }
@@ -139,7 +139,7 @@ where
     #[track_caller]
     pub fn new_with_storage(value: T) -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(ArcRwSignal::new(value)),
         }
@@ -172,7 +172,7 @@ where
     #[track_caller]
     pub fn read_only(&self) -> ReadSignal<T, S> {
         ReadSignal {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(
                 self.inner
@@ -194,7 +194,7 @@ where
     #[track_caller]
     pub fn write_only(&self) -> WriteSignal<T, S> {
         WriteSignal {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(
                 self.inner
@@ -231,10 +231,10 @@ where
             (Some(read), Some(write)) => {
                 if Arc::ptr_eq(&read.inner, &write.inner) {
                     Some(Self {
-                        #[cfg(any(debug_assertions, leptos_debuginfo))]
+                        #[cfg(debug_assertions)]
                         defined_at: Location::caller(),
                         inner: ArenaItem::new_with_storage(ArcRwSignal {
-                            #[cfg(any(debug_assertions, leptos_debuginfo))]
+                            #[cfg(debug_assertions)]
                             defined_at: Location::caller(),
                             value: Arc::clone(&read.value),
                             inner: Arc::clone(&read.inner),
@@ -296,11 +296,11 @@ impl<T, S> Hash for RwSignal<T, S> {
 
 impl<T, S> DefinedAt for RwSignal<T, S> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -313,18 +313,6 @@ impl<T: 'static, S> IsDisposed for RwSignal<T, S> {
     }
 }
 
-impl<T, S> IntoInner for RwSignal<T, S>
-where
-    S: Storage<ArcRwSignal<T>>,
-{
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        self.inner.into_inner()?.into_inner()
-    }
-}
-
 impl<T, S> AsSubscriberSet for RwSignal<T, S>
 where
     S: Storage<ArcRwSignal<T>>,
@@ -390,7 +378,7 @@ where
     #[track_caller]
     fn from(value: ArcRwSignal<T>) -> Self {
         RwSignal {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(value),
         }
@@ -414,7 +402,7 @@ where
     #[track_caller]
     fn from_local(value: ArcRwSignal<T>) -> Self {
         RwSignal {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new_with_storage(value),
         }

reactive_graph/src/signal/subscriber_traits.rs

@@ -105,7 +105,7 @@ where
                 AnySource(
                     Arc::as_ptr(subs) as usize,
                     Arc::downgrade(subs) as Weak<dyn Source + Send + Sync>,
-                    #[cfg(any(debug_assertions, leptos_debuginfo))]
+                    #[cfg(debug_assertions)]
                     self.defined_at().expect("no DefinedAt in debug mode"),
                 )
             })

reactive_graph/src/signal/trigger.rs

@@ -18,7 +18,7 @@ use std::{
 /// [`Owner`](crate::owner::Owner) cleans up. For a reference-counted trigger that lives
 /// as long as a reference to it is alive, see [`ArcTrigger`].
 pub struct Trigger {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     pub(crate) defined_at: &'static Location<'static>,
     pub(crate) inner: ArenaItem<ArcTrigger>,
 }
@@ -28,7 +28,7 @@ impl Trigger {
     #[track_caller]
     pub fn new() -> Self {
         Self {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
             inner: ArenaItem::new(ArcTrigger::new()),
         }
@@ -83,11 +83,11 @@ impl AsSubscriberSet for Trigger {
 impl DefinedAt for Trigger {
     #[inline(always)]
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

reactive_graph/src/signal/write.rs

@@ -1,10 +1,7 @@
 use super::{guards::WriteGuard, ArcWriteSignal};
 use crate::{
-    owner::{ArenaItem, FromLocal, LocalStorage, Storage, SyncStorage},
-    traits::{
-        DefinedAt, Dispose, IntoInner, IsDisposed, Notify, UntrackableGuard,
-        Write,
-    },
+    owner::{ArenaItem, Storage, SyncStorage},
+    traits::{DefinedAt, Dispose, IsDisposed, Notify, UntrackableGuard, Write},
 };
 use core::fmt::Debug;
 use guardian::ArcRwLockWriteGuardian;
@@ -53,7 +50,7 @@ use std::{hash::Hash, ops::DerefMut, panic::Location, sync::Arc};
 /// assert_eq!(count.get(), 3);
 /// ```
 pub struct WriteSignal<T, S = SyncStorage> {
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     pub(crate) defined_at: &'static Location<'static>,
     pub(crate) inner: ArenaItem<ArcWriteSignal<T>, S>,
 }
@@ -100,63 +97,23 @@ impl<T, S> Hash for WriteSignal<T, S> {
 
 impl<T, S> DefinedAt for WriteSignal<T, S> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
     }
 }
 
-impl<T> From<ArcWriteSignal<T>> for WriteSignal<T>
-where
-    T: Send + Sync + 'static,
-{
-    #[track_caller]
-    fn from(value: ArcWriteSignal<T>) -> Self {
-        WriteSignal {
-            #[cfg(debug_assertions)]
-            defined_at: Location::caller(),
-            inner: ArenaItem::new_with_storage(value),
-        }
-    }
-}
-
-impl<T> FromLocal<ArcWriteSignal<T>> for WriteSignal<T, LocalStorage>
-where
-    T: 'static,
-{
-    #[track_caller]
-    fn from_local(value: ArcWriteSignal<T>) -> Self {
-        WriteSignal {
-            #[cfg(debug_assertions)]
-            defined_at: Location::caller(),
-            inner: ArenaItem::new_with_storage(value),
-        }
-    }
-}
-
 impl<T, S> IsDisposed for WriteSignal<T, S> {
     fn is_disposed(&self) -> bool {
         self.inner.is_disposed()
     }
 }
 
-impl<T, S> IntoInner for WriteSignal<T, S>
-where
-    S: Storage<ArcWriteSignal<T>>,
-{
-    type Value = T;
-
-    #[inline(always)]
-    fn into_inner(self) -> Option<Self::Value> {
-        self.inner.into_inner()?.into_inner()
-    }
-}
-
 impl<T, S> Notify for WriteSignal<T, S>
 where
     T: 'static,

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;

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
@@ -67,10 +67,10 @@ use std::{
 #[macro_export]
 macro_rules! unwrap_signal {
     ($signal:ident) => {{
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         let location = std::panic::Location::caller();
         || {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             {
                 panic!(
                     "{}",
@@ -80,7 +80,7 @@ macro_rules! unwrap_signal {
                     )
                 );
             }
-            #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+            #[cfg(not(debug_assertions))]
             {
                 panic!(
                     "Tried to access a reactive value that has already been \
@@ -103,7 +103,6 @@ pub trait Dispose {
 /// Allows tracking the value of some reactive data.
 pub trait Track {
     /// Subscribes to this signal in the current reactive scope without doing anything with its value.
-    #[track_caller]
     fn track(&self);
 }
 
@@ -405,7 +404,6 @@ where
 /// Notifies subscribers of a change in this signal.
 pub trait Notify {
     /// Notifies subscribers of a change in this signal.
-    #[track_caller]
     fn notify(&self);
 }
 
@@ -632,18 +630,6 @@ pub trait IsDisposed {
     fn is_disposed(&self) -> bool;
 }
 
-/// Turns a signal back into a raw value.
-pub trait IntoInner {
-    /// The type of the value contained in the signal.
-    type Value;
-
-    /// Returns the inner value if this is the only reference to to the signal.
-    /// Otherwise, returns `None` and drops this reference.
-    /// # Panics
-    /// Panics if the inner lock is poisoned.
-    fn into_inner(self) -> Option<Self::Value>;
-}
-
 /// Describes where the signal was defined. This is used for diagnostic warnings and is purely a
 /// debug-mode tool.
 pub trait DefinedAt {

reactive_graph/src/wrappers.rs

@@ -93,35 +93,17 @@ pub mod read {
     }
 
     /// A wrapper for any kind of reference-counted reactive signal:
-    /// an [`ArcReadSignal`], [`ArcMemo`], [`ArcRwSignal`], or derived signal closure,
-    /// or a plain value of the same type
+    /// an [`ArcReadSignal`], [`ArcMemo`], [`ArcRwSignal`],
+    /// or derived signal closure.
     ///
-    /// This allows you to create APIs that take `T` or any reactive value that returns `T`
-    /// as an argument, rather than adding a generic `F: Fn() -> T`.
-    ///
-    /// Values can be accessed with the same function call, `read()`, `with()`, and `get()`
-    /// APIs as other signals.
-    ///
-    /// ## Important Notes about Derived Signals
-    ///
-    /// `Signal::derive()` is simply a way to box and type-erase a “derived signal,” which
-    /// is a plain closure that accesses one or more signals. It does *not* cache the value
-    /// of that computation. Accessing the value of a `Signal<_>` that is created using `Signal::derive()`
-    /// will run the closure again every time you call `.read()`, `.with()`, or `.get()`.
-    ///
-    /// If you want the closure to run the minimal number of times necessary to update its state,
-    /// and then to cache its value, you should use a [`Memo`] (and convert it into a `Signal<_>`)
-    /// rather than using `Signal::derive()`.
-    ///
-    /// Note that for many computations, it is nevertheless less expensive to use a derived signal
-    /// than to create a separate memo and to cache the value: creating a new reactive node and
-    /// taking the lock on that cached value whenever you access the signal is *more* expensive than
-    /// simply re-running the calculation in many cases.
+    /// This allows you to create APIs that take any kind of `ArcSignal<T>` as an argument,
+    /// rather than adding a generic `F: Fn() -> T`. Values can be access with the same
+    /// function call, `with()`, and `get()` APIs as other signals.
     pub struct ArcSignal<T: 'static, S = SyncStorage>
     where
         S: Storage<T>,
     {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         defined_at: &'static Location<'static>,
         inner: SignalTypes<T, S>,
     }
@@ -132,7 +114,7 @@ pub mod read {
     {
         fn clone(&self) -> Self {
             Self {
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: self.defined_at,
                 inner: self.inner.clone(),
             }
@@ -146,7 +128,7 @@ pub mod read {
         fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
             let mut s = f.debug_struct("ArcSignal");
             s.field("inner", &self.inner);
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             s.field("defined_at", &self.defined_at);
             s.finish()
         }
@@ -202,7 +184,7 @@ pub mod read {
 
             Self {
                 inner: SignalTypes::DerivedSignal(Arc::new(derived_signal)),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -212,7 +194,7 @@ pub mod read {
         pub fn stored(value: T) -> Self {
             Self {
                 inner: SignalTypes::Stored(ArcStoredValue::new(value)),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -232,7 +214,7 @@ pub mod read {
         fn from(value: ArcReadSignal<T>) -> Self {
             Self {
                 inner: SignalTypes::ReadSignal(value),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -243,7 +225,7 @@ pub mod read {
         fn from(value: ArcRwSignal<T>) -> Self {
             Self {
                 inner: SignalTypes::ReadSignal(value.read_only()),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -257,7 +239,7 @@ pub mod read {
         fn from(value: ArcMemo<T, S>) -> Self {
             Self {
                 inner: SignalTypes::Memo(value),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -268,11 +250,11 @@ pub mod read {
         S: Storage<T>,
     {
         fn defined_at(&self) -> Option<&'static Location<'static>> {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             {
                 Some(self.defined_at)
             }
-            #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+            #[cfg(not(debug_assertions))]
             {
                 None
             }
@@ -348,35 +330,16 @@ pub mod read {
     }
 
     /// A wrapper for any kind of arena-allocated reactive signal:
-    /// a [`ReadSignal`], [`Memo`], [`RwSignal`], or derived signal closure,
-    /// or a plain value of the same type
+    /// an [`ReadSignal`], [`Memo`], [`RwSignal`], or derived signal closure.
     ///
-    /// This allows you to create APIs that take `T` or any reactive value that returns `T`
-    /// as an argument, rather than adding a generic `F: Fn() -> T`.
-    ///
-    /// Values can be accessed with the same function call, `read()`, `with()`, and `get()`
-    /// APIs as other signals.
-    ///
-    /// ## Important Notes about Derived Signals
-    ///
-    /// `Signal::derive()` is simply a way to box and type-erase a “derived signal,” which
-    /// is a plain closure that accesses one or more signals. It does *not* cache the value
-    /// of that computation. Accessing the value of a `Signal<_>` that is created using `Signal::derive()`
-    /// will run the closure again every time you call `.read()`, `.with()`, or `.get()`.
-    ///
-    /// If you want the closure to run the minimal number of times necessary to update its state,
-    /// and then to cache its value, you should use a [`Memo`] (and convert it into a `Signal<_>`)
-    /// rather than using `Signal::derive()`.
-    ///
-    /// Note that for many computations, it is nevertheless less expensive to use a derived signal
-    /// than to create a separate memo and to cache the value: creating a new reactive node and
-    /// taking the lock on that cached value whenever you access the signal is *more* expensive than
-    /// simply re-running the calculation in many cases.
+    /// This allows you to create APIs that take any kind of `Signal<T>` as an argument,
+    /// rather than adding a generic `F: Fn() -> T`. Values can be access with the same
+    /// function call, `with()`, and `get()` APIs as other signals.
     pub struct Signal<T, S = SyncStorage>
     where
         S: Storage<T>,
     {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         defined_at: &'static Location<'static>,
         inner: ArenaItem<SignalTypes<T, S>, S>,
     }
@@ -408,7 +371,7 @@ pub mod read {
         fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
             let mut s = f.debug_struct("Signal");
             s.field("inner", &self.inner);
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             s.field("defined_at", &self.defined_at);
             s.finish()
         }
@@ -430,11 +393,11 @@ pub mod read {
         S: Storage<T>,
     {
         fn defined_at(&self) -> Option<&'static Location<'static>> {
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             {
                 Some(self.defined_at)
             }
-            #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+            #[cfg(not(debug_assertions))]
             {
                 None
             }
@@ -567,7 +530,7 @@ pub mod read {
                 inner: ArenaItem::new_with_storage(SignalTypes::DerivedSignal(
                     Arc::new(derived_signal),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -579,7 +542,7 @@ pub mod read {
                 inner: ArenaItem::new_with_storage(SignalTypes::Stored(
                     ArcStoredValue::new(value),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -606,7 +569,7 @@ pub mod read {
                 inner: ArenaItem::new_local(SignalTypes::DerivedSignal(
                     Arc::new(derived_signal),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -619,7 +582,7 @@ pub mod read {
                 inner: ArenaItem::new_local(SignalTypes::Stored(
                     ArcStoredValue::new(value),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -677,7 +640,7 @@ pub mod read {
         #[track_caller]
         fn from(value: ArcSignal<T, SyncStorage>) -> Self {
             Signal {
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: Location::caller(),
                 inner: ArenaItem::new(value.inner),
             }
@@ -691,7 +654,7 @@ pub mod read {
         #[track_caller]
         fn from_local(value: ArcSignal<T, LocalStorage>) -> Self {
             Signal {
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: Location::caller(),
                 inner: ArenaItem::new_local(value.inner),
             }
@@ -705,7 +668,7 @@ pub mod read {
         #[track_caller]
         fn from(value: Signal<T, S>) -> Self {
             ArcSignal {
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: Location::caller(),
                 inner: value
                     .inner
@@ -723,7 +686,7 @@ pub mod read {
         fn from(value: ReadSignal<T>) -> Self {
             Self {
                 inner: ArenaItem::new(SignalTypes::ReadSignal(value.into())),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -739,7 +702,7 @@ pub mod read {
                 inner: ArenaItem::new_local(SignalTypes::ReadSignal(
                     value.into(),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -753,7 +716,7 @@ pub mod read {
         fn from(value: ArcReadSignal<T>) -> Self {
             Self {
                 inner: ArenaItem::new(SignalTypes::ReadSignal(value)),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -767,7 +730,7 @@ pub mod read {
         fn from(value: ArcReadSignal<T>) -> Self {
             Self {
                 inner: ArenaItem::new_local(SignalTypes::ReadSignal(value)),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -783,7 +746,7 @@ pub mod read {
                 inner: ArenaItem::new(SignalTypes::ReadSignal(
                     value.read_only().into(),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -799,7 +762,7 @@ pub mod read {
                 inner: ArenaItem::new_local(SignalTypes::ReadSignal(
                     value.read_only().into(),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -815,7 +778,7 @@ pub mod read {
                 inner: ArenaItem::new(SignalTypes::ReadSignal(
                     value.read_only(),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -831,7 +794,7 @@ pub mod read {
                 inner: ArenaItem::new_local(SignalTypes::ReadSignal(
                     value.read_only(),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -845,7 +808,7 @@ pub mod read {
         fn from(value: Memo<T>) -> Self {
             Self {
                 inner: ArenaItem::new(SignalTypes::Memo(value.into())),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -859,7 +822,7 @@ pub mod read {
         fn from(value: Memo<T, LocalStorage>) -> Self {
             Self {
                 inner: ArenaItem::new_local(SignalTypes::Memo(value.into())),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -873,7 +836,7 @@ pub mod read {
         fn from(value: ArcMemo<T>) -> Self {
             Self {
                 inner: ArenaItem::new(SignalTypes::Memo(value)),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -887,7 +850,7 @@ pub mod read {
         fn from(value: ArcMemo<T, LocalStorage>) -> Self {
             Self {
                 inner: ArenaItem::new_local(SignalTypes::Memo(value)),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -1868,7 +1831,7 @@ pub mod write {
         T: 'static,
     {
         inner: SignalSetterTypes<T, S>,
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         defined_at: &'static std::panic::Location<'static>,
     }
 
@@ -1883,7 +1846,7 @@ pub mod write {
         fn default() -> Self {
             Self {
                 inner: SignalSetterTypes::Default,
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -1936,7 +1899,7 @@ pub mod write {
                 inner: SignalSetterTypes::Mapped(ArenaItem::new_with_storage(
                     Box::new(mapped_setter),
                 )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -1947,7 +1910,7 @@ pub mod write {
         fn from(value: WriteSignal<T, S>) -> Self {
             Self {
                 inner: SignalSetterTypes::Write(value),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }
@@ -1962,7 +1925,7 @@ pub mod write {
         fn from(value: RwSignal<T, S>) -> Self {
             Self {
                 inner: SignalSetterTypes::Write(value.write_only()),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                #[cfg(debug_assertions)]
                 defined_at: std::panic::Location::caller(),
             }
         }

reactive_graph/tests/memo.rs

@@ -443,43 +443,3 @@ fn unsync_derived_signal_and_memo() {
     assert_eq!(f.with(|n| *n), 6);
     assert_eq!(f.get_untracked(), 6);
 }
-
-#[test]
-fn memo_updates_even_if_not_read_until_later() {
-    #![allow(clippy::bool_assert_comparison)]
-
-    let owner = Owner::new();
-    owner.set();
-
-    // regression test for https://github.com/leptos-rs/leptos/issues/3339
-
-    let input = RwSignal::new(0);
-    let first_memo = Memo::new(move |_| input.get() == 1);
-    let second_memo = Memo::new(move |_| first_memo.get());
-
-    assert_eq!(input.get(), 0);
-    assert_eq!(first_memo.get(), false);
-
-    println!("update to 1");
-    input.set(1);
-    assert_eq!(input.get(), 1);
-    println!("read memo 1");
-    assert_eq!(first_memo.get(), true);
-    println!("read memo 2");
-    assert_eq!(second_memo.get(), true);
-
-    // this time, we don't read the memo
-    println!("\nupdate to 2");
-    input.set(2);
-    assert_eq!(input.get(), 2);
-    println!("read memo 1");
-    assert_eq!(first_memo.get(), false);
-
-    println!("\nupdate to 3");
-    input.set(3);
-    assert_eq!(input.get(), 3);
-    println!("read memo 1");
-    assert_eq!(first_memo.get(), false);
-    println!("read memo 2");
-    assert_eq!(second_memo.get(), false);
-}

reactive_graph/tests/signal.rs

@@ -2,8 +2,8 @@ use reactive_graph::{
     owner::Owner,
     signal::{arc_signal, signal, ArcRwSignal, RwSignal},
     traits::{
-        Dispose, Get, GetUntracked, IntoInner, Read, Set, Update,
-        UpdateUntracked, With, WithUntracked, Write,
+        Get, GetUntracked, Read, Set, Update, UpdateUntracked, With,
+        WithUntracked, Write,
     },
 };
 
@@ -108,35 +108,3 @@ fn update_signal() {
     set_a.set(4);
     assert_eq!(a.get(), 4);
 }
-
-#[test]
-fn into_inner_signal() {
-    let owner = Owner::new();
-    owner.set();
-
-    let rw_signal = RwSignal::new(1);
-    assert_eq!(rw_signal.get(), 1);
-    assert_eq!(rw_signal.into_inner(), Some(1));
-}
-
-#[test]
-fn into_inner_arc_signal() {
-    let owner = Owner::new();
-    owner.set();
-
-    let (a, b) = arc_signal(2);
-    assert_eq!(a.get(), 2);
-    std::mem::drop(b);
-    assert_eq!(a.into_inner(), Some(2));
-}
-
-#[test]
-fn into_inner_non_arc_signal() {
-    let owner = Owner::new();
-    owner.set();
-
-    let (a, b) = signal(2);
-    assert_eq!(a.get(), 2);
-    b.dispose();
-    assert_eq!(a.into_inner(), Some(2));
-}

reactive_stores/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores"
-version = "0.1.3"
+version = "0.1.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -23,6 +23,3 @@ tokio = { version = "1.41", features = ["rt-multi-thread", "macros"] }
 tokio-test = { version = "0.4.4" }
 any_spawner = { workspace = true, features = ["futures-executor", "tokio"] }
 reactive_graph = { workspace = true, features = ["effects"] }
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }