mirrors/leptos
1
0
Fork 0
mirror of https://github.com/leptos-rs/leptos.git synced 2025-12-27 09:54:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly establish root ownership for static site generation (closes #3822) (#3824)

Browse Source
This commit is contained in:
Greg Johnston
2025-04-05 19:50:28 -04:00
committed by GitHub
parent bdc73594ea
commit b8810ba42f
2 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
integrations/actix/src/lib.rs
View File

@@ -1100,6 +1100,10 @@ where
/// Allows generating any prerendered routes.
#[allow(clippy::type_complexity)]
pub struct StaticRouteGenerator(
// this is here to keep the root owner alive for the duration
// of the route generation, so that base context provided continues
// to exist until it is dropped
#[allow(dead_code)] Owner,
Box<dyn FnOnce(&LeptosOptions) -> PinnedFuture<()> + Send>,
);
@@ -1159,46 +1163,50 @@ impl StaticRouteGenerator {
where
IV: IntoView + 'static,
{
Self({
let owner = Owner::new();
Self(owner.clone(), {
let routes = routes.clone();
Box::new(move |options| {
let options = options.clone();
let app_fn = app_fn.clone();
let additional_context = additional_context.clone();
Box::pin(routes.generate_static_files(
move |path: &ResolvedStaticPath| {
Self::render_route(
path.to_string(),
app_fn.clone(),
additional_context.clone(),
)
},
move |path: &ResolvedStaticPath,
owner: &Owner,
html: String| {
let options = options.clone();
let path = path.to_owned();
let response_options = owner.with(use_context);
async move {
write_static_route(
&options,
response_options,
path.as_ref(),
&html,
owner.with(|| {
additional_context();
Box::pin(ScopedFuture::new(routes.generate_static_files(
move |path: &ResolvedStaticPath| {
Self::render_route(
path.to_string(),
app_fn.clone(),
additional_context.clone(),
)
.await
}
},
was_404,
))
},
move |path: &ResolvedStaticPath,
owner: &Owner,
html: String| {
let options = options.clone();
let path = path.to_owned();
let response_options = owner.with(use_context);
async move {
write_static_route(
&options,
response_options,
path.as_ref(),
&html,
)
.await
}
},
was_404,
)))
})
})
})
}
/// Generates the routes.
pub async fn generate(self, options: &LeptosOptions) {
(self.0)(options).await
(self.1)(options).await
}
}

32
integrations/axum/src/lib.rs
View File

@@ -1386,6 +1386,10 @@ where
/// Allows generating any prerendered routes.
#[allow(clippy::type_complexity)]
pub struct StaticRouteGenerator(
// this is here to keep the root owner alive for the duration
// of the route generation, so that base context provided continues
// to exist until it is dropped
#[allow(dead_code)] Owner,
Box<dyn FnOnce(&LeptosOptions) -> PinnedFuture<()> + Send>,
);
@@ -1453,14 +1457,16 @@ impl StaticRouteGenerator {
{
#[cfg(feature = "default")]
{
Self({
let owner = Owner::new();
Self(owner.clone(), {
let routes = routes.clone();
Box::new(move |options| {
let options = options.clone();
let app_fn = app_fn.clone();
let additional_context = additional_context.clone();
Box::pin(routes.generate_static_files(
owner.with(|| {
additional_context();
Box::pin(ScopedFuture::new(routes.generate_static_files(
move |path: &ResolvedStaticPath| {
Self::render_route(
path.to_string(),
@@ -1485,7 +1491,8 @@ impl StaticRouteGenerator {
}
},
was_404,
))
)))
})
})
})
}
@@ -1495,18 +1502,21 @@ impl StaticRouteGenerator {
_ = routes;
_ = app_fn;
_ = additional_context;
Self(Box::new(|_| {
panic!(
"Static routes are not currently supported on WASM32 \
server targets."
);
}))
Self(
Owner::new(),
Box::new(|_| {
panic!(
"Static routes are not currently supported on WASM32 \
server targets."
);
}),
)
}
}
/// Generates the routes.
pub async fn generate(self, options: &LeptosOptions) {
(self.0)(options).await
(self.1)(options).await
}
}