Mirrors/leptos
2
0
Fork 0
mirror of https://github.com/leptos-rs/leptos synced 2024-11-10 06:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Routes SSR

Browse source
This commit is contained in:
Greg Johnston 2024-06-10 06:51:06 -04:00
parent c3656416a2
commit 984ede8887
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
router/src/nested_router.rs
View file

@ -7,7 +7,7 @@ use crate::{
};
use any_spawner::Executor;
use either_of::{Either, EitherOf3};
use futures::future::join_all;
use futures::{future::join_all, FutureExt};
use leptos::{component, oco::Oco};
use or_poisoned::OrPoisoned;
use reactive_graph::{
@ -301,13 +301,22 @@ where
let view = match new_match {
None => Either::Left(fallback),
Some(route) => {
let mut loaders = Vec::new();
route.build_nested_route(
&current_url,
base,
&mut Vec::new(),
&mut loaders,
&mut outlets,
&outer_owner,
);
// outlets will not send their views if the loaders are never polled
// the loaders are async so that they can lazy-load routes in the browser,
// but they should always be synchronously available on the server
join_all(mem::take(&mut loaders))
.now_or_never()
.expect("async routes not supported in SSR");
outer_owner.with(|| {
Either::Right(
Outlet(OutletProps::builder().build()).into_any(),
@ -341,13 +350,22 @@ where
let view = match new_match {
None => Either::Left(fallback),
Some(route) => {
let mut loaders = Vec::new();
route.build_nested_route(
&current_url,
base,
&mut Vec::new(),
&mut loaders,
&mut outlets,
&outer_owner,
);
// outlets will not send their views if the loaders are never polled
// the loaders are async so that they can lazy-load routes in the browser,
// but they should always be synchronously available on the server
join_all(mem::take(&mut loaders))
.now_or_never()
.expect("async routes not supported in SSR");
outer_owner.with(|| {
Either::Right(
Outlet(OutletProps::builder().build()).into_any(),
@ -391,6 +409,10 @@ where
&mut outlets,
&outer_owner,
);
// TODO support for lazy hydration
join_all(mem::take(&mut loaders))
.now_or_never()
.expect("async routes not supported in SSR");
outer_owner.with(|| {
EitherOf3::C(
Outlet(OutletProps::builder().build()).into_any(),