fix: maintain send/syncness of the handle

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

@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
       - name: Get example files that changed
         id: changed-files
-        uses: tj-actions/changed-files@v47
+        uses: tj-actions/changed-files@v46
         with:
           files: |
             examples/**

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

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
       - name: Get source files that changed
         id: changed-source
-        uses: tj-actions/changed-files@v47
+        uses: tj-actions/changed-files@v46
         with:
           files_ignore: |
             .*/**/*

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

@@ -88,7 +88,7 @@ jobs:
         run: trunk --version
       - name: Install Node.js
         if: contains(inputs.directory, 'examples')
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 20
       - uses: pnpm/action-setup@v4

Cargo.toml

@@ -50,26 +50,26 @@ any_spawner = { path = "./any_spawner/", version = "0.3.0" }
 const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1" }
 either_of = { path = "./either_of/", version = "0.1.6" }
 hydration_context = { path = "./hydration_context", version = "0.3.0" }
-leptos = { path = "./leptos", version = "0.8.10" }
+leptos = { path = "./leptos", version = "0.8.9" }
 leptos_config = { path = "./leptos_config", version = "0.8.7" }
-leptos_dom = { path = "./leptos_dom", version = "0.8.7" }
+leptos_dom = { path = "./leptos_dom", version = "0.8.6" }
 leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.5" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.8.6" }
-leptos_macro = { path = "./leptos_macro", version = "0.8.9" }
-leptos_router = { path = "./router", version = "0.8.8" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.8.5" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.8" }
+leptos_router = { path = "./router", version = "0.8.7" }
 leptos_router_macro = { path = "./router_macro", version = "0.8.5" }
 leptos_server = { path = "./leptos_server", version = "0.8.5" }
 leptos_meta = { path = "./meta", version = "0.8.5" }
 next_tuple = { path = "./next_tuple", version = "0.1.0" }
 oco_ref = { path = "./oco", version = "0.2.1" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.2.8" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.7" }
 reactive_stores = { path = "./reactive_stores", version = "0.2.5" }
 reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.6" }
 server_fn = { path = "./server_fn", version = "0.8.7" }
 server_fn_macro = { path = "./server_fn_macro", version = "0.8.7" }
 server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.5" }
-tachys = { path = "./tachys", version = "0.2.9" }
+tachys = { path = "./tachys", version = "0.2.8" }
 wasm_split_helpers = { path = "./wasm_split", version = "0.1.2" }
 wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.3" }
 
@@ -125,7 +125,7 @@ glib = { default-features = false, version = "0.20.12" }
 async-trait = { default-features = false, version = "0.1.89" }
 typed-builder-macro = { default-features = false, version = "0.21.0" }
 linear-map = { default-features = false, version = "1.2.0" }
-anyhow = { default-features = false, version = "1.0.100" }
+anyhow = { default-features = false, version = "1.0.99" }
 walkdir = { default-features = false, version = "2.5.0" }
 actix-ws = { default-features = false, version = "0.3.0" }
 tower-http = { default-features = false, version = "0.6.4" }
@@ -170,9 +170,6 @@ async-lock = { default-features = false, version = "3.4.1" }
 base16 = { default-features = false, version = "0.2.1" }
 digest = { default-features = false, version = "0.10.7" }
 sha2 = { default-features = false, version = "0.10.8" }
-subsecond = { default-features = false, version = "0.7.0-rc.0" }
-dioxus-cli-config = { default-features = false, version = "0.7.0-rc.0" }
-dioxus-devtools = { default-features = false, version = "0.7.0-rc.0" }
 
 [profile.release]
 codegen-units = 1

README.md

@@ -95,7 +95,7 @@ Here are some resources for learning more about Leptos:
 [`cargo-leptos`](https://github.com/leptos-rs/cargo-leptos) is a build tool that's designed to make it easy to build apps that run on both the client and the server, with seamless integration. The best way to get started with a real Leptos project right now is to use `cargo-leptos` and our starter templates for [Actix](https://github.com/leptos-rs/start) or [Axum](https://github.com/leptos-rs/start-axum).
 
 ```bash
-cargo install cargo-leptos --locked
+cargo install cargo-leptos
 cargo leptos new --git https://github.com/leptos-rs/start-axum
 cd [your project name]
 cargo leptos watch

examples/regression/e2e/features/issue_4251.feature

@@ -1,13 +0,0 @@
-@check_issue_4251
-Feature: Check that issue 4251 does not reappear
-
-	Scenario: Clicking a link to the same page you’re currently on should not add the page to the history stack.
-		Given I see the app
-		And I can access regression test 4324
-		When I select the link This page
-		And I select the link This page
-		And I select the link This page
-		Then I see the result is the string Issue4324
-		When I press the back button
-		And I select the link 4324
-		Then I see the result is the string Issue4324

examples/regression/e2e/features/issue_4324.feature

@@ -1,11 +0,0 @@
-@check_issue_4324
-Feature: Check that issue 4324 does not reappear
-
-	Scenario: Navigating to the same page after clicking "Back" should set the URL correctly
-		Given I see the app
-		And I can access regression test 4324
-		Then I see the path is /4324/
-		When I press the back button
-		Then I see the path is /
-		When I select the link 4324
-		Then I see the path is /4324/

examples/regression/e2e/tests/fixtures/check.rs

@@ -43,13 +43,3 @@ pub async fn element_value_is(
     assert_eq!(value.as_deref(), Some(expected));
     Ok(())
 }
-
-pub async fn path_is(client: &Client, expected_path: &str) -> Result<()> {
-    let url = client
-        .current_url()
-        .await
-        .expect("could not access current URL");
-    let path = url.path();
-    assert_eq!(expected_path, path);
-    Ok(())
-}

examples/regression/e2e/tests/fixtures/world/action_steps.rs

@@ -45,12 +45,3 @@ async fn i_refresh_the_browser(world: &mut AppWorld) -> Result<()> {
 
     Ok(())
 }
-
-#[given(regex = "^I press the back button$")]
-#[when(regex = "^I press the back button$")]
-async fn i_go_back(world: &mut AppWorld) -> Result<()> {
-    let client = &world.client;
-    client.back().await?;
-
-    Ok(())
-}

examples/regression/e2e/tests/fixtures/world/check_steps.rs

@@ -43,10 +43,3 @@ async fn i_see_the_value(
     check::element_value_is(client, &id, &value).await?;
     Ok(())
 }
-
-#[then(regex = r"^I see the path is (.*)$")]
-async fn i_see_the_path(world: &mut AppWorld, path: String) -> Result<()> {
-    let client = &world.client;
-    check::path_is(client, &path).await?;
-    Ok(())
-}

examples/regression/src/app.rs

@@ -1,7 +1,7 @@
 use crate::{
     issue_4005::Routes4005, issue_4088::Routes4088, issue_4217::Routes4217,
-    issue_4285::Routes4285, issue_4296::Routes4296, issue_4324::Routes4324,
-    pr_4015::Routes4015, pr_4091::Routes4091,
+    issue_4285::Routes4285, issue_4296::Routes4296, pr_4015::Routes4015,
+    pr_4091::Routes4091,
 };
 use leptos::prelude::*;
 use leptos_meta::{MetaTags, *};
@@ -47,7 +47,6 @@ pub fn App() -> impl IntoView {
                     <Routes4005/>
                     <Routes4285/>
                     <Routes4296/>
-                    <Routes4324/>
                 </Routes>
             </main>
         </Router>
@@ -74,7 +73,6 @@ fn HomePage() -> impl IntoView {
                 <li><a href="/4005/">"4005"</a></li>
                 <li><a href="/4285/">"4285"</a></li>
                 <li><a href="/4296/">"4296"</a></li>
-                <li><a href="/4324/">"4324"</a></li>
             </ul>
         </nav>
     }

examples/regression/src/issue_4324.rs

@@ -1,21 +0,0 @@
-use leptos::prelude::*;
-#[allow(unused_imports)]
-use leptos_router::{
-    components::Route, path, Lazy, MatchNestedRoutes, NavigateOptions,
-};
-
-#[component]
-pub fn Routes4324() -> impl MatchNestedRoutes + Clone {
-    view! {
-        <Route path=path!("4324") view=Issue4324/>
-    }
-    .into_inner()
-}
-
-#[component]
-pub fn Issue4324() -> impl IntoView {
-    view! {
-        <a href="/4324/">"This page"</a>
-        <p id="result">"Issue4324"</p>
-    }
-}

examples/regression/src/lib.rs

@@ -4,7 +4,6 @@ mod issue_4088;
 mod issue_4217;
 mod issue_4285;
 mod issue_4296;
-mod issue_4324;
 mod pr_4015;
 mod pr_4091;
 

examples/subsecond_hot_patch/.gitignore

@@ -1,7 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target
-.DS_Store
-
-# These are backup files generated by rustfmt
-**/*.rs.bk

examples/subsecond_hot_patch/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "subsecond_hot_patch"
-version = "0.1.0"
-authors = ["Greg Johnston <greg.johnston@gmail.com>"]
-edition = "2021"
-
-[dependencies]
-leptos = { path = "../../leptos", features = ["csr", "subsecond"] }
-leptos_router = { path = "../../router" }
-
-[features]
-default = ["web"]
-web = []

examples/subsecond_hot_patch/Dioxus.toml

@@ -1,21 +0,0 @@
-[application]
-
-[web.app]
-
-# HTML title tag content
-title = "ltest"
-
-# include `assets` in web platform
-[web.resource]
-
-# Additional CSS style files
-style = []
-
-# Additional JavaScript files
-script = []
-
-[web.resource.dev]
-
-# Javascript code file
-# serve: [dev-server] only
-script = []

examples/subsecond_hot_patch/Makefile.toml

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

examples/subsecond_hot_patch/README.md

@@ -1,31 +0,0 @@
-# Hot Patching with `dx`
-
-This is an experimental example exploring how to combine Leptos with the binary hot-patching provided by Dioxus's `subsecond` library and `dx` cli.
-
-### Serving Your App
-
-This requires installing the Dioxus CLI version 0.7.0. At the time I'm writing this README, that does not yet have a stable release. Once `dioxus-cli` 0.7.0 has been released, you should use the latest stable release. Until then, I'd suggest installing from git:
-
-```sh
-cargo install dioxus-cli --git https://github.com/DioxusLabs/dioxus
-```
-
-Then you can run the example with `dx serve --hot-patch --platform web`.
-
-### Hot Patching
-
-Changes to the your application should be reflected in your app without a full rebuild and reload.
-
-### Limitatations
-
-Currently we only support hot-patching for reactive view functions. You probably want to use `AnyView` (via `.into_any()`) on any views that will be hot-patched, so they can be rebuilt correctly despite their types changing when the structure of the view tree changes.
-
-If you are using `leptos_router` this actually works quite well, as every route’s view is erased to `AnyView` and the router itself is a reactive view function: in other words, changes inside any route should be hot-patched in any case.
-
-Note that any hot-patch will cause all render effects to run again. This means that some client-side state (like the values of signals) will be wiped out.
-
-### Build Tooling
-
-The preference of the Dioxus team is that all hot-patching work that uses their `subsecond` also use `dioxus-cli`. As this demo shows, it's completely possible to use `dioxus-cli` to build and run a Leptos project. We do not plan to build `subsecond` into our own build tooling at this time.
-
-**This is an experiment/POC. It is being published because members of the community have found it useful and have asked for the support to be merged in its current state. Further development and bugfixes are a relatively low priority at this time.**

examples/subsecond_hot_patch/assets/main.css

@@ -1,46 +0,0 @@
-/* App-wide styling */
-body {
-    background-color: #0f1116;
-    color: #ffffff;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    margin: 20px;
-}
-
-#hero {
-    margin: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-#links {
-    width: 400px;
-    text-align: left;
-    font-size: x-large;
-    color: white;
-    display: flex;
-    flex-direction: column;
-}
-
-#links a {
-    color: white;
-    text-decoration: none;
-    margin-top: 20px;
-    margin: 10px 0px;
-    border: white 1px solid;
-    border-radius: 5px;
-    padding: 10px;
-}
-
-#links a:hover {
-    background-color: #1f1f1f;
-    cursor: pointer;
-}
-
-#header {
-    max-width: 1200px;
-}
-
-
-

examples/subsecond_hot_patch/src/main.rs

@@ -1,44 +0,0 @@
-use leptos::{prelude::*, subsecond::connect_to_hot_patch_messages};
-use leptos_router::{
-    components::{Route, Router, Routes},
-    path,
-};
-
-fn main() {
-    // connect to DX CLI and patch the WASM binary whenever we receive a message
-    connect_to_hot_patch_messages();
-
-    // wrapping App here in a closure so we can hot-reload it, because we only do that
-    // for reactive views right now. changing anything will re-run App and update the view
-    mount_to_body(|| App);
-}
-
-#[component]
-fn App() -> impl IntoView {
-    view! {
-        <nav>
-            <a href="/">"Home"</a>
-            <a href="/about">"About"</a>
-        </nav>
-        <Router>
-            <Routes fallback=|| "Not found">
-                <Route path=path!("/") view=HomePage/>
-                <Route path=path!("/about") view=About/>
-            </Routes>
-        </Router>
-    }
-}
-
-#[component]
-fn HomePage() -> impl IntoView {
-    view! {
-        <h1>"Home Page"</h1>
-    }
-}
-
-#[component]
-fn About() -> impl IntoView {
-    view! {
-        <h1>"About"</h1>
-    }
-}

examples/tailwind_csr/Trunk.toml

@@ -1,3 +0,0 @@
-[tools]
-tailwindcss = "4.1.13"
-

integrations/utils/Cargo.toml

@@ -4,7 +4,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities to help build server integrations for the Leptos web framework."
-version = "0.8.6"
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true
 

integrations/utils/src/lib.rs

@@ -68,8 +68,7 @@ pub trait ExtendResponse: Sized {
                 let nonce =
                     use_nonce().map(|n| n.to_string()).unwrap_or_default();
                 if let Some(manifest) = use_context::<WasmSplitManifest>() {
-                    let (pkg_path, manifest, wasm_split_file) =
-                        &*manifest.0.read_value();
+                    let (pkg_path, manifest) = &*manifest.0.read_value();
                     let prefetches = prefetches.0.read_value();
 
                     let all_prefetches = prefetches.iter().flat_map(|key| {
@@ -91,7 +90,7 @@ pub trait ExtendResponse: Sized {
                         .to_html();
                     }
                     _ = view! {
-                        <Link rel="modulepreload" href=format!("{pkg_path}/{wasm_split_file}") crossorigin=nonce/>
+                        <Link rel="modulepreload" href=format!("{pkg_path}/__wasm_split.js") crossorigin=nonce/>
                     }
                     .to_html();
                 }

leptos/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos"
-version = "0.8.10"
+version = "0.8.9"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -58,9 +58,6 @@ slotmap = { workspace = true, default-features = true }
 futures = { workspace = true, default-features = true }
 send_wrapper = { workspace = true, default-features = true }
 wasm_split_helpers.workspace = true
-subsecond = { workspace = true, default-features = true, optional = true }
-dioxus-cli-config = { workspace = true, default-features = true, optional = true }
-dioxus-devtools = { workspace = true, default-features = true, optional = true }
 
 [features]
 hydration = [
@@ -105,16 +102,6 @@ trace-component-props = [
 ]
 delegation = ["tachys/delegation"]
 islands-router = ["tachys/mark_branches"]
-subsecond = [
-  "reactive_graph/subsecond",
-  "dep:subsecond",
-  "dep:dioxus-cli-config",
-  "dep:dioxus-devtools",
-  "web-sys/Location",
-  "web-sys/MessageEvent",
-  "web-sys/WebSocket",
-  "web-sys/Window",
-]
 
 [dev-dependencies]
 tokio = { features = [

leptos/src/hydration/mod.rs

@@ -65,56 +65,16 @@ pub fn HydrationScripts(
     if let Some(splits) = SPLIT_MANIFEST.get_or_init(|| {
         let root = root.clone().unwrap_or_default();
 
-        let (wasm_split_js, wasm_split_manifest) = if options.hash_files {
-            let hash_path = std::env::current_exe()
-                .map(|path| {
-                    path.parent().map(|p| p.to_path_buf()).unwrap_or_default()
-                })
-                .unwrap_or_default()
-                .join(options.hash_file.as_ref());
-            let hashes = std::fs::read_to_string(&hash_path)
-                .expect("failed to read hash file");
-
-            let mut split =
-                "__wasm_split.______________________.js".to_string();
-            let mut manifest = "__wasm_split_manifest.json".to_string();
-            for line in hashes.lines() {
-                let line = line.trim();
-                if !line.is_empty() {
-                    if let Some((file, hash)) = line.split_once(':') {
-                        if file == "manifest" {
-                            manifest.clear();
-                            manifest.push_str("__wasm_split_manifest.");
-                            manifest.push_str(hash.trim());
-                            manifest.push_str(".json");
-                        }
-                        if file == "split" {
-                            split.clear();
-                            split.push_str("__wasm_split.");
-                            split.push_str(hash.trim());
-                            split.push_str(".js");
-                        }
-                    }
-                }
-            }
-            (split, manifest)
-        } else {
-            (
-                "__wasm_split.______________________.js".to_string(),
-                "__wasm_split_manifest.json".to_string(),
-            )
-        };
-
         let site_dir = &options.site_root;
         let pkg_dir = &options.site_pkg_dir;
         let path = PathBuf::from(site_dir.to_string());
-        let path = path.join(pkg_dir.to_string()).join(wasm_split_manifest);
+        let path = path
+            .join(pkg_dir.to_string())
+            .join("__wasm_split_manifest.json");
         let file = std::fs::read_to_string(path).ok()?;
-
         let manifest = WasmSplitManifest(ArcStoredValue::new((
             format!("{root}/{pkg_dir}"),
             serde_json::from_str(&file).expect("could not read manifest file"),
-            wasm_split_js,
         )));
 
         Some(manifest)

leptos/src/lib.rs

@@ -1,4 +1,5 @@
 #![deny(missing_docs)]
+#![forbid(unsafe_code)]
 
 //! # About Leptos
 //!
@@ -305,10 +306,6 @@ pub use tachys::mathml as math;
 #[doc(inline)]
 pub use tachys::svg;
 
-#[cfg(feature = "subsecond")]
-/// Utilities for using binary hot-patching with [`subsecond`].
-pub mod subsecond;
-
 /// Utilities for simple isomorphic logging to the console or terminal.
 pub mod logging {
     pub use leptos_dom::{debug_warn, error, log, warn};
@@ -395,8 +392,7 @@ pub fn prefetch_lazy_fn_on_server(id: &'static str) {
 #[derive(Clone, Debug, Default)]
 pub struct WasmSplitManifest(
     pub  reactive_graph::owner::ArcStoredValue<(
-        String,                                         // the pkg root
-        std::collections::HashMap<String, Vec<String>>, // preloads
-        String, // the name of the __wasm_split.js file
+        String,
+        std::collections::HashMap<String, Vec<String>>,
     )>,
 );

leptos/src/subsecond.rs

@@ -1,62 +0,0 @@
-use dioxus_devtools::DevserverMsg;
-use wasm_bindgen::{prelude::Closure, JsCast};
-use web_sys::{js_sys::JsString, MessageEvent, WebSocket};
-
-/// Sets up a websocket connect to the `dx` CLI, waiting for incoming hot-patching messages
-/// and patching the WASM binary appropriately.
-//
-//  Note: This is a stripped-down version of Dioxus's `make_ws` from `dioxus_web`
-//  It's essentially copy-pasted here because it's not pub there.
-//  Would love to just take a dependency on that to be able to use it and deduplicate.
-//
-//  https://github.com/DioxusLabs/dioxus/blob/main/packages/web/src/devtools.rs#L36
-pub fn connect_to_hot_patch_messages() {
-    // Get the location of the devserver, using the current location plus the /_dioxus path
-    // The idea here being that the devserver is always located on the /_dioxus behind a proxy
-    let location = web_sys::window().unwrap().location();
-    let url = format!(
-        "{protocol}//{host}/_dioxus?build_id={build_id}",
-        protocol = match location.protocol().unwrap() {
-            prot if prot == "https:" => "wss:",
-            _ => "ws:",
-        },
-        host = location.host().unwrap(),
-        build_id = dioxus_cli_config::build_id(),
-    );
-
-    let ws = WebSocket::new(&url).unwrap();
-
-    ws.set_onmessage(Some(
-        Closure::<dyn FnMut(MessageEvent)>::new(move |e: MessageEvent| {
-            let Ok(text) = e.data().dyn_into::<JsString>() else {
-                return;
-            };
-
-            // The devserver messages have some &'static strs in them, so we need to leak the source string
-            let string: String = text.into();
-            let string = Box::leak(string.into_boxed_str());
-
-            if let Ok(DevserverMsg::HotReload(msg)) =
-                serde_json::from_str::<DevserverMsg>(string)
-            {
-                if let Some(jump_table) = msg.jump_table.as_ref().cloned() {
-                    if msg.for_build_id == Some(dioxus_cli_config::build_id()) {
-                        let our_pid = if cfg!(target_family = "wasm") {
-                            None
-                        } else {
-                            Some(std::process::id())
-                        };
-
-                        if msg.for_pid == our_pid {
-                            unsafe { subsecond::apply_patch(jump_table) }
-                                .unwrap();
-                        }
-                    }
-                }
-            }
-        })
-        .into_js_value()
-        .as_ref()
-        .unchecked_ref(),
-    ));
-}

leptos_dom/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_dom"
-version = "0.8.7"
+version = "0.8.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos_dom/src/helpers.rs

@@ -463,7 +463,7 @@ pub fn set_interval_with_handle(
 
     #[inline(never)]
     fn si(
-        cb: Box<dyn FnMut()>,
+        cb: Box<dyn Fn()>,
         duration: Duration,
     ) -> Result<IntervalHandle, JsValue> {
         let cb = Closure::wrap(cb).into_js_value();

leptos_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.8.9"
+version = "0.8.8"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos_macro/src/view/mod.rs

@@ -25,8 +25,9 @@ use std::{
 use syn::{
     punctuated::Pair::{End, Punctuated},
     spanned::Spanned,
-    Expr::{self, Tuple},
-    ExprArray, ExprLit, ExprPath, ExprRange, Lit, LitStr, RangeLimits, Stmt,
+    Expr,
+    Expr::Tuple,
+    ExprArray, ExprLit, ExprRange, Lit, LitStr, RangeLimits, Stmt,
 };
 
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -1870,28 +1871,6 @@ pub(crate) fn ident_from_tag_name(tag_name: &NodeName) -> Ident {
     }
 }
 
-pub(crate) fn full_path_from_tag_name(tag_name: &NodeName) -> Option<ExprPath> {
-    match tag_name {
-        NodeName::Path(path) => Some(path.clone()),
-        NodeName::Block(_) => {
-            let span = tag_name.span();
-            proc_macro_error2::emit_error!(
-                span,
-                "blocks not allowed in tag-name position"
-            );
-            None
-        }
-        _ => {
-            let span = tag_name.span();
-            proc_macro_error2::emit_error!(
-                span,
-                "punctuated names not allowed in slots"
-            );
-            None
-        }
-    }
-}
-
 pub(crate) fn directive_call_from_attribute_node(
     attr: &KeyedAttribute,
     directive_name: &str,

leptos_macro/src/view/slot_helper.rs

@@ -1,6 +1,6 @@
 use super::{
     component_builder::maybe_optimised_component_children,
-    convert_to_snake_case, full_path_from_tag_name,
+    convert_to_snake_case, ident_from_tag_name,
 };
 use crate::view::{fragment_to_tokens, utils::filter_prefixed_attrs, TagType};
 use proc_macro2::{Ident, TokenStream, TokenTree};
@@ -24,7 +24,7 @@ pub(crate) fn slot_to_tokens(
         node.name().to_string()
     });
 
-    let component_path = full_path_from_tag_name(node.name());
+    let component_name = ident_from_tag_name(node.name());
 
     let Some(parent_slots) = parent_slots else {
         proc_macro_error2::emit_error!(
@@ -190,7 +190,7 @@ pub(crate) fn slot_to_tokens(
 
     let slot = quote_spanned! {node.span()=>
         {
-            let slot = #component_path::builder()
+            let slot = #component_name::builder()
                 #(#props)*
                 #(#slots)*
                 #children

reactive_graph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.2.8"
+version = "0.2.7"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -27,7 +27,6 @@ async-lock = { workspace = true, default-features = true }
 send_wrapper = { features = [
   "futures",
 ], workspace = true, default-features = true }
-subsecond = { workspace = true, default-features = true, optional = true }
 indexmap = { workspace = true, default-features = true }
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
@@ -52,7 +51,6 @@ hydration = ["dep:hydration_context"]
 effects = [
 ] # whether to run effects: should be disabled for something like server rendering
 sandboxed-arenas = []
-subsecond = ["dep:subsecond"]
 
 [package.metadata.docs.rs]
 all-features = true

reactive_graph/src/effect/render_effect.rs

@@ -9,8 +9,6 @@ use crate::{
 };
 use futures::StreamExt;
 use or_poisoned::OrPoisoned;
-#[cfg(feature = "subsecond")]
-use std::sync::Mutex;
 use std::{
     fmt::Debug,
     future::{Future, IntoFuture},
@@ -51,39 +49,13 @@ impl<T> Debug for RenderEffect<T> {
     }
 }
 
-#[cfg(feature = "subsecond")]
-type CurrentHotPtr = Box<dyn Fn() -> Option<subsecond::HotFnPtr> + Send + Sync>;
-
 impl<T> RenderEffect<T>
 where
     T: 'static,
 {
     /// Creates a new render effect, which immediately runs `fun`.
     pub fn new(fun: impl FnMut(Option<T>) -> T + 'static) -> Self {
-        #[cfg(feature = "subsecond")]
-        let (hot_fn_ptr, fun) = {
-            let fun = Arc::new(Mutex::new(subsecond::HotFn::current(fun)));
-            (
-                {
-                    let fun = Arc::downgrade(&fun);
-                    let wrapped = send_wrapper::SendWrapper::new(move || {
-                        fun.upgrade()
-                            .map(|n| n.lock().or_poisoned().ptr_address())
-                    });
-                    // it's not redundant, it's due to the SendWrapper deref
-                    #[allow(clippy::redundant_closure)]
-                    Box::new(move || wrapped())
-                },
-                move |prev| fun.lock().or_poisoned().call((prev,)),
-            )
-        };
-
-        Self::new_with_value_erased(
-            Box::new(fun),
-            None,
-            #[cfg(feature = "subsecond")]
-            hot_fn_ptr,
-        )
+        Self::new_with_value_erased(Box::new(fun), None)
     }
 
     /// Creates a new render effect with an initial value.
@@ -91,30 +63,7 @@ where
         fun: impl FnMut(Option<T>) -> T + 'static,
         initial_value: Option<T>,
     ) -> Self {
-        #[cfg(feature = "subsecond")]
-        let (hot_fn_ptr, fun) = {
-            let fun = Arc::new(Mutex::new(subsecond::HotFn::current(fun)));
-            (
-                {
-                    let fun = Arc::downgrade(&fun);
-                    let wrapped = send_wrapper::SendWrapper::new(move || {
-                        fun.upgrade()
-                            .map(|n| n.lock().or_poisoned().ptr_address())
-                    });
-                    // it's not redundant, it's due to the SendWrapper deref
-                    #[allow(clippy::redundant_closure)]
-                    Box::new(move || wrapped())
-                },
-                move |prev| fun.lock().or_poisoned().call((prev,)),
-            )
-        };
-
-        Self::new_with_value_erased(
-            Box::new(fun),
-            initial_value,
-            #[cfg(feature = "subsecond")]
-            hot_fn_ptr,
-        )
+        Self::new_with_value_erased(Box::new(fun), initial_value)
     }
 
     /// Creates a new render effect, which immediately runs `fun`.
@@ -122,11 +71,6 @@ where
         fun: impl FnMut(Option<T>) -> T + 'static,
         value: impl IntoFuture<Output = T> + 'static,
     ) -> Self {
-        #[cfg(feature = "subsecond")]
-        let mut fun = subsecond::HotFn::current(fun);
-        #[cfg(feature = "subsecond")]
-        let fun = move |prev| fun.call((prev,));
-
         Self::new_with_async_value_erased(
             Box::new(fun),
             Box::pin(value.into_future()),
@@ -135,13 +79,8 @@ where
     }
 
     fn new_with_value_erased(
-        #[allow(unused_mut)] mut fun: Box<dyn FnMut(Option<T>) -> T + 'static>,
+        mut fun: Box<dyn FnMut(Option<T>) -> T + 'static>,
         initial_value: Option<T>,
-        // this argument can be used to invalidate individual effects in the future
-        // in present experiments, I have found that it is not actually granular enough to make a difference
-        #[allow(unused)]
-        #[cfg(feature = "subsecond")]
-        hot_fn_ptr: CurrentHotPtr,
     ) -> Self {
         // codegen optimisation:
         fn prep() -> (Owner, Arc<RwLock<EffectInner>>, crate::channel::Receiver)
@@ -165,56 +104,12 @@ where
             let _ = initial_value;
             let _ = owner;
             let _ = &mut rx;
-            let _ = fun;
+            let _ = &mut fun;
         }
 
         #[cfg(feature = "effects")]
         {
             let subscriber = inner.to_any_subscriber();
-
-            #[cfg(all(feature = "subsecond", debug_assertions))]
-            let mut fun = {
-                use crate::graph::ReactiveNode;
-                use rustc_hash::FxHashMap;
-                use std::sync::{Arc, LazyLock, Mutex};
-                use subsecond::HotFnPtr;
-
-                static HOT_RELOAD_SUBSCRIBERS: LazyLock<
-                    Mutex<FxHashMap<AnySubscriber, (HotFnPtr, CurrentHotPtr)>>,
-                > = LazyLock::new(|| {
-                    subsecond::register_handler(Arc::new(|| {
-                        HOT_RELOAD_SUBSCRIBERS.lock().or_poisoned().retain(
-                            |subscriber, (prev_ptr, hot_fn_ptr)| {
-                                match hot_fn_ptr() {
-                                    None => false,
-                                    Some(curr_hot_ptr) => {
-                                        if curr_hot_ptr != *prev_ptr {
-                                            crate::log_warning(format_args!(
-                                                "{prev_ptr:?} <> \
-                                                 {curr_hot_ptr:?}",
-                                            ));
-                                            *prev_ptr = curr_hot_ptr;
-
-                                            subscriber.mark_dirty();
-                                        }
-                                        true
-                                    }
-                                }
-                            },
-                        );
-                    }));
-                    Default::default()
-                });
-
-                let mut fun = subsecond::HotFn::current(fun);
-                let initial_ptr = hot_fn_ptr().unwrap();
-                HOT_RELOAD_SUBSCRIBERS
-                    .lock()
-                    .or_poisoned()
-                    .insert(subscriber.clone(), (initial_ptr, hot_fn_ptr));
-                move |prev| fun.call((prev,))
-            };
-
             *value.write().or_poisoned() = Some(
                 owner.with(|| subscriber.with_observer(|| fun(initial_value))),
             );
@@ -335,11 +230,6 @@ where
     pub fn new_isomorphic(
         fun: impl FnMut(Option<T>) -> T + Send + Sync + 'static,
     ) -> Self {
-        #[cfg(feature = "subsecond")]
-        let mut fun = subsecond::HotFn::current(fun);
-        #[cfg(feature = "subsecond")]
-        let fun = move |prev| fun.call((prev,));
-
         fn erased<T: Send + Sync + 'static>(
             mut fun: Box<dyn FnMut(Option<T>) -> T + Send + Sync + 'static>,
         ) -> RenderEffect<T> {

reactive_graph/src/owner.rs

@@ -209,25 +209,6 @@ impl Owner {
         this
     }
 
-    /// Returns the parent of this `Owner`, if any.
-    ///
-    /// None when:
-    /// - This is a root owner
-    /// - The parent has been dropped
-    pub fn parent(&self) -> Option<Owner> {
-        self.inner
-            .read()
-            .or_poisoned()
-            .parent
-            .as_ref()
-            .and_then(|p| p.upgrade())
-            .map(|inner| Owner {
-                inner,
-                #[cfg(feature = "hydration")]
-                shared_context: self.shared_context.clone(),
-            })
-    }
-
     /// Creates a new `Owner` that is the child of the current `Owner`, if any.
     pub fn child(&self) -> Self {
         let parent = Some(Arc::downgrade(&self.inner));

router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.8.8"
+version = "0.8.7"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"

router/src/location/history.rs

@@ -185,15 +185,11 @@ impl LocationProvider for BrowserUrl {
             let is_back = self.is_back.clone();
             move || match Self::current() {
                 Ok(new_url) => {
-                    let mut stack = path_stack.write_value();
+                    let stack = path_stack.read_value();
                     let is_navigating_back = stack.len() == 1
                         || (stack.len() >= 2
                             && stack.get(stack.len() - 2) == Some(&new_url));
 
-                    if is_navigating_back {
-                        stack.pop();
-                    }
-
                     is_back.set(is_navigating_back);
 
                     url.set(new_url);

tachys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tachys"
-version = "0.2.9"
+version = "0.2.8"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

tachys/src/html/attribute/global.rs

@@ -205,14 +205,6 @@ where
         self.add_any_attr(enterkeyhint(value))
     }
 
-    /// The `exportparts` attribute enables the sharing of parts of an element's shadow DOM with a containing document.
-    fn exportparts(
-        self,
-        value: V,
-    ) -> <Self as AddAnyAttr>::Output<Attr<Exportparts, V>> {
-        self.add_any_attr(exportparts(value))
-    }
-
     /// The `hidden` global attribute is a Boolean attribute indicating that the element is not yet, or is no longer, relevant.
     fn hidden(self, value: V) -> <Self as AddAnyAttr>::Output<Attr<Hidden, V>> {
         self.add_any_attr(hidden(value))

tachys/src/html/element/elements.rs

@@ -212,7 +212,7 @@ html_self_closing_elements! {
     /// The `<img>` HTML element embeds an image into the document.
     img HtmlImageElement [alt, attributionsrc, crossorigin, decoding, elementtiming, fetchpriority, height, ismap, loading, referrerpolicy, sizes, src, srcset, usemap, width] true,
     /// The `<input>` HTML element is used to create interactive controls for web-based forms in order to accept data from the user; a wide variety of types of input data and control widgets are available, depending on the device and user agent. The `<input>` element is one of the most powerful and complex in all of HTML due to the sheer number of combinations of input types and attributes.
-    input HtmlInputElement [accept, alt, autocomplete, capture, checked, dirname, disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, height, list, max, maxlength, min, minlength, multiple, name, pattern, placeholder, popovertarget, popovertargetaction, readonly, required, size, src, step, r#type, value, width] true,
+    input HtmlInputElement [accept, alt, autocomplete, capture, checked, disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, height, list, max, maxlength, min, minlength, multiple, name, pattern, placeholder, popovertarget, popovertargetaction, readonly, required, size, src, step, r#type, value, width] true,
     ///	The `<link>` HTML element specifies relationships between the current document and an external resource. This element is most commonly used to link to CSS, but is also used to establish site icons (both "favicon" style icons and icons for the home screen and apps on mobile devices) among other things.
     link HtmlLinkElement [r#as, blocking, crossorigin, fetchpriority, href, hreflang, imagesizes, imagesrcset, integrity, media, rel, referrerpolicy, sizes, r#type] true,
     ///	The `<meta>` HTML element represents Metadata that cannot be represented by other HTML meta-related elements, like base, link, script, style or title.

tachys/src/ssr/mod.rs

@@ -378,91 +378,83 @@ impl Stream for StreamBuilder {
             let next_chunk = this.chunks.pop_front();
             match next_chunk {
                 None => {
-                    if this.pending_ooo.is_empty() {
-                        if this.sync_buf.is_empty() {
-                            Poll::Ready(None)
-                        } else {
-                            Poll::Ready(Some(mem::take(&mut this.sync_buf)))
-                        }
-                    } else {
-                        // check if *any* pending out-of-order chunk is ready
-                        for mut chunk in mem::take(&mut this.pending_ooo) {
-                            match chunk.as_mut().poll(cx) {
-                                Poll::Ready(OooChunk {
-                                    id,
-                                    chunks,
-                                    replace,
-                                    nonce,
-                                }) => {
-                                    let opening = format!("<!--s-{id}o-->");
-                                    let placeholder_at =
-                                        this.sync_buf.find(&opening);
-                                    if let Some(start) = placeholder_at {
-                                        let closing = format!("<!--s-{id}c-->");
-                                        let end = this
-                                            .sync_buf
-                                            .find(&closing)
-                                            .unwrap();
-                                        let chunks_iter =
-                                            chunks.into_iter().rev();
+                    // now, handle out-of-order chunks
+                    if let Some(mut pending) = this.pending_ooo.pop_front() {
+                        match pending.as_mut().poll(cx) {
+                            Poll::Ready(OooChunk {
+                                id,
+                                chunks,
+                                replace,
+                                nonce,
+                            }) => {
+                                let opening = format!("<!--s-{id}o-->");
+                                let placeholder_at =
+                                    this.sync_buf.find(&opening);
+                                if let Some(start) = placeholder_at {
+                                    let closing = format!("<!--s-{id}c-->");
+                                    let end =
+                                        this.sync_buf.find(&closing).unwrap();
+                                    let chunks_iter = chunks.into_iter().rev();
 
-                                        // TODO can probably make this more efficient
-                                        let (before, replaced) =
-                                            this.sync_buf.split_at(start);
-                                        let (_, after) = replaced.split_at(
-                                            end - start + closing.len(),
-                                        );
-                                        let mut buf = String::new();
-                                        buf.push_str(before);
+                                    // TODO can probably make this more efficient
+                                    let (before, replaced) =
+                                        this.sync_buf.split_at(start);
+                                    let (_, after) = replaced
+                                        .split_at(end - start + closing.len());
+                                    let mut buf = String::new();
+                                    buf.push_str(before);
 
-                                        let mut held_chunks = VecDeque::new();
-                                        for chunk in chunks_iter {
-                                            if let StreamChunk::Sync(ready) =
-                                                chunk
-                                            {
-                                                buf.push_str(&ready);
-                                            } else {
-                                                held_chunks.push_front(chunk);
-                                            }
+                                    let mut held_chunks = VecDeque::new();
+                                    for chunk in chunks_iter {
+                                        if let StreamChunk::Sync(ready) = chunk
+                                        {
+                                            buf.push_str(&ready);
+                                        } else {
+                                            held_chunks.push_front(chunk);
                                         }
-                                        buf.push_str(after);
-                                        this.sync_buf = buf;
-                                        for chunk in held_chunks {
+                                    }
+                                    buf.push_str(after);
+                                    this.sync_buf = buf;
+                                    for chunk in held_chunks {
+                                        this.chunks.push_front(chunk);
+                                    }
+                                } else {
+                                    OooChunk::push_start(
+                                        &id,
+                                        &mut this.sync_buf,
+                                    );
+                                    for chunk in chunks.into_iter().rev() {
+                                        if let StreamChunk::Sync(ready) = chunk
+                                        {
+                                            this.sync_buf.push_str(&ready);
+                                        } else {
                                             this.chunks.push_front(chunk);
                                         }
-                                    } else {
-                                        OooChunk::push_start(
-                                            &id,
-                                            &mut this.sync_buf,
-                                        );
-                                        for chunk in chunks.into_iter().rev() {
-                                            if let StreamChunk::Sync(ready) =
-                                                chunk
-                                            {
-                                                this.sync_buf.push_str(&ready);
-                                            } else {
-                                                this.chunks.push_front(chunk);
-                                            }
-                                        }
-                                        OooChunk::push_end_with_nonce(
-                                            replace,
-                                            &id,
-                                            &mut this.sync_buf,
-                                            nonce.as_deref(),
-                                        );
                                     }
+                                    OooChunk::push_end_with_nonce(
+                                        replace,
+                                        &id,
+                                        &mut this.sync_buf,
+                                        nonce.as_deref(),
+                                    );
                                 }
-                                Poll::Pending => {
-                                    this.pending_ooo.push_back(chunk);
+                                self.poll_next(cx)
+                            }
+                            Poll::Pending => {
+                                this.pending_ooo.push_back(pending);
+                                if this.sync_buf.is_empty() {
+                                    Poll::Pending
+                                } else {
+                                    Poll::Ready(Some(mem::take(
+                                        &mut this.sync_buf,
+                                    )))
                                 }
                             }
                         }
-
-                        if this.sync_buf.is_empty() {
-                            Poll::Pending
-                        } else {
-                            Poll::Ready(Some(mem::take(&mut this.sync_buf)))
-                        }
+                    } else if this.sync_buf.is_empty() {
+                        Poll::Ready(None)
+                    } else {
+                        Poll::Ready(Some(mem::take(&mut this.sync_buf)))
                     }
                 }
                 Some(StreamChunk::Sync(value)) => {