Don't stream down resources not read under a <Suspense/>, fixing rendering issue

examples/hackernews-axum/Cargo.toml

@@ -12,12 +12,12 @@ console_log = "0.2"
 console_error_panic_hook = "0.1"
 futures = "0.3"
 cfg-if = "1"
-leptos = { path = "../../../leptos/leptos", default-features = false, features = [
+leptos = { path = "../../leptos", default-features = false, features = [
 	"serde",
 ] }
-leptos_axum = { path = "../../../leptos/integrations/axum", optional = true }
-leptos_meta = { path = "../../../leptos/meta", default-features = false }
-leptos_router = { path = "../../../leptos/router", default-features = false }
+leptos_axum = { path = "../../integrations/axum", optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4"
 simple_logger = "2"
 serde = { version = "1", features = ["derive"] }

examples/router/Cargo.toml

@@ -11,7 +11,7 @@ leptos_router = { path = "../../router", features=["csr"] }
 serde = { version = "1", features = ["derive"] }
 futures = "0.3"
 console_error_panic_hook = "0.1.7"
-leptos_meta = { path = "../../../leptos/meta", default-features = false }
+leptos_meta = { path = "../../meta", default-features = false }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.0"

examples/todo-app-sqlite-axum/Cargo.toml

@@ -12,12 +12,12 @@ console_log = "0.2.0"
 console_error_panic_hook = "0.1.7"
 futures = "0.3.25"
 cfg-if = "1.0.0"
-leptos = { path = "../../../leptos/leptos", default-features = false, features = [
+leptos = { path = "../../leptos", default-features = false, features = [
 	"serde",
 ] }
-leptos_axum = { path = "../../../leptos/integrations/axum", default-features = false, optional = true }
-leptos_meta = { path = "../../../leptos/meta", default-features = false }
-leptos_router = { path = "../../../leptos/router", default-features = false }
+leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4.17"
 simple_logger = "4.0.0"
 serde = { version = "1.0.148", features = ["derive"] }

examples/todo-app-sqlite/Cargo.toml

@@ -16,12 +16,12 @@ console_error_panic_hook = "0.1"
 serde = { version = "1", features = ["derive"] }
 futures = "0.3"
 cfg-if = "1"
-leptos = { path = "../../../leptos/leptos", default-features = false, features = [
+leptos = { path = "../../leptos", default-features = false, features = [
 	"serde",
 ] }
-leptos_actix = { path = "../../../leptos/integrations/actix", optional = true }
-leptos_meta = { path = "../../../leptos/meta", default-features = false }
-leptos_router = { path = "../../../leptos/router", default-features = false }
+leptos_actix = { path = "../../integrations/actix", optional = true }
+leptos_meta = { path = "../../meta", default-features = false }
+leptos_router = { path = "../../router", default-features = false }
 log = "0.4"
 simple_logger = "2"
 gloo = { git = "https://github.com/rustwasm/gloo" }

leptos_dom/Cargo.toml

@@ -137,7 +137,6 @@ features = [
 ]
 
 [features]
-default = ["web"]
 web = ["leptos_reactive/csr", "leptos/csr"]
 ssr = ["leptos_reactive/ssr", "leptos/ssr"]
 stable = ["leptos_reactive/stable"]

leptos_dom/src/ssr.rs

@@ -116,7 +116,7 @@ pub fn render_to_stream_with_prefix_undisposed(
       // this does NOT contain any of the data being loaded asynchronously in resources
       let shell = view(cx).render_to_string(cx);
 
-      let resources = cx.all_resources();
+      let resources = cx.pending_resources();
       let pending_resources = serde_json::to_string(&resources).unwrap();
       let prefix = prefix(cx);
 

leptos_reactive/src/resource.rs

@@ -8,7 +8,7 @@ use std::{
     pin::Pin,
     rc::Rc,
 };
-
+use cfg_if::cfg_if;
 use crate::{
     create_effect, create_isomorphic_effect, create_memo, create_signal, queue_microtask,
     runtime::{with_runtime, RuntimeId},
@@ -116,9 +116,23 @@ where
         suspense_contexts: Default::default(),
     });
 
-    let id = with_runtime(cx.runtime, |runtime| {
-        runtime.create_serializable_resource(Rc::clone(&r))
-    });
+    cfg_if! {
+        if #[cfg(any(feature = "csr", feature = "hydrate"))] {
+            let id = with_runtime(cx.runtime, |runtime| {
+                runtime.create_serializable_resource(Rc::clone(&r))
+            });
+        } else {
+            let id = if use_context::<SuspenseContext>(cx).is_some() {
+                with_runtime(cx.runtime, |runtime| {
+                    runtime.create_serializable_resource(Rc::clone(&r))
+                })
+            } else {
+                with_runtime(cx.runtime, |runtime| {
+                    runtime.create_unserializable_resource(Rc::clone(&r))
+                })
+            };
+        }
+    }
 
     create_isomorphic_effect(cx, {
         let r = Rc::clone(&r);

leptos_reactive/src/runtime.rs

@@ -296,6 +296,19 @@ impl Runtime {
             .collect()
     }
 
+    /// Returns IDs for all [Resource]s found on any scope, pending from the server.
+    pub(crate) fn pending_resources(&self) -> Vec<ResourceId> {
+        self.resources
+            .borrow()
+            .iter()
+            .filter_map(|(resource_id, res)| if matches!(res, AnyResource::Serializable(_)) {
+                Some(resource_id)
+            } else {
+                None
+            })
+            .collect()
+    }
+
     pub(crate) fn serialization_resolvers(
         &self,
     ) -> FuturesUnordered<PinnedFuture<(ResourceId, String)>> {

leptos_reactive/src/scope.rs

@@ -282,6 +282,12 @@ impl Scope {
         with_runtime(self.runtime, |runtime| runtime.all_resources())
     }
 
+     /// Returns IDs for all [Resource](crate::Resource)s found on any scope that are 
+     /// pending from the server.
+     pub fn pending_resources(&self) -> Vec<ResourceId> {
+        with_runtime(self.runtime, |runtime| runtime.pending_resources())
+    }
+
     /// Returns IDs for all [Resource](crate::Resource)s found on any scope.
     pub fn serialization_resolvers(&self) -> FuturesUnordered<PinnedFuture<(ResourceId, String)>> {
         with_runtime(self.runtime, |runtime| runtime.serialization_resolvers())