removed some HydrationCtx things and improved tracing for DynChild

leptos_dom/src/components/dyn_child.rs

@@ -151,8 +151,6 @@ where
       move |prev_run: Option<(Option<web_sys::Node>, ScopeDisposer)>| {
         #[cfg(debug_assertions)]
         let _guard = span.enter();
-        #[cfg(debug_assertions)]
-        let _guard = trace_span!("DynChild reactive").entered();
 
         let (new_child, disposer) =
           cx.run_child_scope(|cx| child_fn().into_view(cx));

leptos_dom/src/hydration.rs

@@ -56,18 +56,6 @@ impl HydrationCtx {
     unsafe { ID = id }
   }
 
-  #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
-  pub(crate) fn set_id(cx: Scope) {
-    /* let new_id = if let Some(id) = cx.get_hydration_key() {
-      id + 1
-    } else {
-      0
-    }; */
-    let new_id = 0;
-    println!("setting ID to {new_id}");
-    unsafe { ID = new_id };
-  }
-
   #[cfg(all(target_arch = "wasm32", feature = "web"))]
   pub(crate) fn stop_hydrating() {
     unsafe {

leptos_dom/src/lib.rs

@@ -6,7 +6,7 @@
 //! The DOM implementation for `leptos`.
 
 #[cfg_attr(debug_assertions, macro_use)]
-extern crate tracing;
+pub extern crate tracing;
 
 mod components;
 mod events;
@@ -19,7 +19,6 @@ mod node_ref;
 mod ssr;
 mod transparent;
 
-
 use cfg_if::cfg_if;
 pub use components::*;
 pub use events::typed as ev;
@@ -29,7 +28,7 @@ pub use hydration::HydrationCtx;
 pub use js_sys;
 use leptos_reactive::Scope;
 pub use logging::*;
-pub use macro_helpers::{IntoClass, IntoAttribute, IntoProperty};
+pub use macro_helpers::{IntoAttribute, IntoClass, IntoProperty};
 pub use node_ref::*;
 #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
 use smallvec::SmallVec;
@@ -109,7 +108,7 @@ where
 {
   #[cfg_attr(
     debug_assertions,
-    instrument(level = "trace", name = "Fn() -> N", skip_all)
+    instrument(level = "trace", name = "Fn() -> impl IntoView", skip_all)
   )]
   fn into_view(self, cx: Scope) -> View {
     DynChild::new(self).into_view(cx)
@@ -206,7 +205,7 @@ impl Element {
         attrs,
         children,
         id,
-        prerendered
+        prerendered,
       } = self;
 
       let element = AnyElement { name, is_void, id };
@@ -216,7 +215,7 @@ impl Element {
         element,
         attrs,
         children: children.into_iter().collect(),
-        prerendered
+        prerendered,
       }
     }
   }
@@ -255,14 +254,17 @@ impl Element {
 
   #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
   #[track_caller]
-  fn from_html<El: IntoElement>(el: El, html: impl Into<Cow<'static, str>>) -> Self {
+  fn from_html<El: IntoElement>(
+    el: El,
+    html: impl Into<Cow<'static, str>>,
+  ) -> Self {
     Self {
       name: el.name(),
       is_void: el.is_void(),
       attrs: Default::default(),
       children: Default::default(),
       id: el.hydration_id(),
-      prerendered: Some(html.into())
+      prerendered: Some(html.into()),
     }
   }
 }

leptos_dom/src/ssr.rs

@@ -2,12 +2,11 @@
 
 use crate::{CoreComponent, HydrationCtx, IntoView, View};
 use cfg_if::cfg_if;
-use futures::{Stream, StreamExt, stream::FuturesUnordered};
+use futures::{stream::FuturesUnordered, Stream, StreamExt};
 use itertools::Itertools;
-use std::borrow::Cow;
 use leptos_reactive::*;
+use std::borrow::Cow;
 
-#[cfg(not(all(target_arch = "wasm32", feature = "web")))]
 /// Renders the given function to a static HTML string.
 ///
 /// ```
@@ -26,8 +25,13 @@ where
 {
   let runtime = leptos_reactive::create_runtime();
   HydrationCtx::reset_id();
-    let html = leptos_reactive::run_scope(runtime, |cx| f(cx).into_view(cx).render_to_string(cx));
+
+  let html = leptos_reactive::run_scope(runtime, |cx| {
+    f(cx).into_view(cx).render_to_string(cx)
+  });
+
   runtime.dispose();
+
   html.into_owned()
 }
 
@@ -43,7 +47,9 @@ where
 ///    it is waiting for a resource to resolve from the server, it doesn't run it initially.
 /// 3) HTML fragments to replace each `<Suspense/>` fallback with its actual data as the resources
 ///    read under that `<Suspense/>` resolve.
-pub fn render_to_stream(view: impl FnOnce(Scope) -> View + 'static) -> impl Stream<Item = String> {
+pub fn render_to_stream(
+  view: impl FnOnce(Scope) -> View + 'static,
+) -> impl Stream<Item = String> {
   render_to_stream_with_prefix(view, |_| "".into())
 }
 
@@ -63,15 +69,18 @@ pub fn render_to_stream(view: impl FnOnce(Scope) -> View + 'static) -> impl Stre
 ///    read under that `<Suspense/>` resolve.
 pub fn render_to_stream_with_prefix(
   view: impl FnOnce(Scope) -> View + 'static,
-  prefix: impl FnOnce(Scope) -> Cow<'static, str> + 'static
+  prefix: impl FnOnce(Scope) -> Cow<'static, str> + 'static,
 ) -> impl Stream<Item = String> {
   HydrationCtx::reset_id();
 
   // create the runtime
   let runtime = create_runtime();
 
-  let ((shell, prefix, pending_resources, pending_fragments, serializers), _, disposer) =
+  let (
-      run_scope_undisposed(runtime, {
+    (shell, prefix, pending_resources, pending_fragments, serializers),
+    _,
+    disposer,
+  ) = run_scope_undisposed(runtime, {
     move |cx| {
       // the actual app body/template code
       // this does NOT contain any of the data being loaded asynchronously in resources
@@ -111,8 +120,7 @@ pub fn render_to_stream_with_prefix(
     )
   });
   // stream data for each Resource as it resolves
-  let resources = 
+  let resources = serializers.map(|(id, json)| {
-  serializers.map(|(id, json)| {
     let id = serde_json::to_string(&id).unwrap();
     format!(
       r#"<script>
@@ -154,14 +162,7 @@ pub fn render_to_stream_with_prefix(
 impl View {
   /// Consumes the node and renders it into an HTML string.
   pub fn render_to_string(self, cx: Scope) -> Cow<'static, str> {
-    //cx.set_hydration_key(HydrationCtx::current_id());
+    self.render_to_string_helper()
-    HydrationCtx::set_id(cx);
-
-    let s = self.render_to_string_helper();
-
-    //cx.set_hydration_key(HydrationCtx::current_id());
-
-    s
   }
 
   pub(crate) fn render_to_string_helper(self) -> Cow<'static, str> {