* create static site generation helpers in the router crate * work on integrating static site generation into fullstack * move ssg into a separate crate * integrate ssg with the launch builder * simplify ssg example * fix static_routes for child routes * move CLI hot reloading websocket code into dioxus-hot-reload * fix some unused imports * use the same hot reloading websocket code for fullstack * fix fullstack hot reloading * move cli hot reloading logic into the hot reload crate * ssg example working with dx serve * add more examples * fix clippy * switch to a result for Element * fix formatting * fix hot reload doctest imports * fix axum imports * add show method to error context * implement retaining nodes during suspense * fix unterminated if statements * communicate between tasks and suspense boundaries * make suspense placeholders easier to use * implement IntoDynNode and IntoVNode for more wrappers * fix clippy examples * fix rsx tests * add streaming html utilities to the ssr package * unify hydration and non-hydration ssr cache * fix router with Result Element * don't run server doc tests * Fix hot reload websocket doc examples * simple apps working with fullstack streaming * fix preloading wasm * Report errors encountered while streaming * remove async from incremental renderer * document new VirtualDom suspense methods * make streaming work with incremental rendering * fix static site generation * document suspense structs * create closure type; allow async event handlers in props; allow shorthand event handlers * test forwarding event handlers with the shorthand syntax * fix clippy * fix imports in spawn async doctest * fix empty rsx * fix async result event handlers * fix mounting router in multiple places * Fix task dead cancel race condition * simplify diffing before adding suspense * fix binary size increase * fix attribute diffing * more diffing fixes * create minimal fullstack feature * smaller fullstack bundles * allow mounting nodes that are already created and creating nodes without mounting them * fix hot reload feature * fix replacing components * don't reclaim virtual nodes * client side suspense working! * fix CLI * slightly smaller fullstack builds * fix multiple suspended scopes * fix merge errors * yield back to tokio every few polls to fix suspending on many tasks at once * remove logs * document suspense boundary and update suspense example * fix ssg * make streaming optional * fix some router and core tests * fix suspense example * fix serialization with out of order server futures * add incremental streaming hackernews demo * fix hackernews demo * fix root hackernews redirect * fix formatting * add tests for suspense cases * slightly smaller binaries * slightly smaller * improve error handling docs * fix errors example link * fix doc tests * remove log file * fix ssr cache type inference * remove index.html * fix ssg render template * fix assigning ids on elements with dynamic attributes * add desktop feature to the workspace examples * remove router static generation example; ssg lives in the dioxus-static-generation package * add a test for effects during suspense * only run effects on mounted nodes * fix multiple suspense roots * fix node iterator * fix closures without arguments * fix dioxus-core readme doctest * remove suspense logs * fix scope stack * fix clippy * remove unused suspense boundary from hackernews * assert that launch never returns for better compiler errors * fix static generation launch function * fix web renderer * pass context providers into server functions * add an example for FromContext * clean up DioxusRouterExt * fix server function context * fix fullstack desktop example * forward CLI serve settings to fullstack * re-export serve config at the root of fullstack * forward env directly instead of using a guard * just set the port in the CLI for fullstack playwright tests * fix fullstack dioxus-cli-config feature * fix launch server merge conflicts * fix fullstack launch context * Merge branch 'main' into suspense-2.0 * fix fullstack html data * remove drop virtual dom feature * add a comment about only_write_templates binary size workaround * remove explicit dependencies from use_server_future * make ErrorContext and SuspenseContext more similar * Tweak: small tweaks to tomls to make diff smaller * only rerun components under suspense after the initial placeholders are sent to the client * add module docs for suspense * keep track of when suspense boundaries are resolved * start implementing JS out of order streaming * fix core tests * implement the server side of suspense with js * fix streaming ssr with nested suspense * move streaming ssr code into fullstack * revert minification changes * serialize server future data as the html streams * start loading scripts wasm immediately instead of defering the script * very basic nested suspense example working with minimal html updates * clean up some suspense/error docs * fix hydrating nested pending server futures * sort resolved boundaries by height * Fix disconnecting clients while streaming * fix static generation crate * don't insert extra divs when hydrating streamed chunks * wait to swap in the elements until they are hydrated * remove inline streaming script * hackernews partially working * fix spa mode * banish the open shadow dom * fix removing placeholder * set up streaming playwright test * run web playwright tests on 9999 to avoid port conflicts with other local servers * remove suspense nodes if the suspense boundary is replaced before the suspense resolves on the server * ignore hydration of removed suspense boundaries * use path based indexing to fix hydrating suspense after parent suspense with child is removed * re-export dioxus error * remove resolved suspense divs if the suspense boundary has been removed * Fix client side initialized server futures * ignore comment nodes while traversing nodes in core to avoid lists getting swapped out with suspense * Pass initial hydration data to the client * hide pre nodes * don't panic if reclaiming an element fails * fix scope stack when polling tasks * improve deserialization out of length message * Ok(VNode::placeholder()) -> VNode::empty() * fix typo in rsx usage * restore testing changes from suspense example * clean up some logs and comments * fix playwright tests * clean up more changes in core * clean up core tests * remove anymap dependency * clean up changes to hooks * clean up changes in the router, rsx, and web * revert changes to axum-hello-world * fix use_server_future * fix clippy in dioxus-core * check that the next or previous node exist before checking if we should ignore them * fix formatting * fix suspense playwright test * remove unused suspense code * add more suspense playwright tests * add more docs for error boundaries * fix suspense core tests * fix ErrorBoundary example * remove a bunch of debug logging in js * fix router failure_external_navigation * use absolute paths in the interpreter build.rs * strip '\r' while hashing ts files * add a wrapper with a default error boundary and suspense boundary * restore hot reloading * ignore non-ts files when hashing * sort ts files before hashing them * fix rsx tests * fix fullstack doc tests * fix core tests * fix axum auth example * update suspense hydration diagram * longer playwright build limit * tiny fixes - spelling, formatting * update diagram link * remove comment and template nodes for suspense placeholders * remove comment nodes as we hydrate text * simplify hackernews example * clean up hydrating text nodes * switch to a separate environment variable for the base path for smaller binaries * clean up file system html trait * fix form data * move streaming code into fullstack * implement serialize and deserialize for CapturedError * remove waits in the nested suspense playwright spec * force sequential fullstack builds for CI * longer nested suspense delay for CI * fix --force-sequential flag * wait to launch server until client build is done --------- Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
146 lines
5.1 KiB
Rust
146 lines
5.1 KiB
Rust
use crate::innerlude::{throw_error, RenderError, RenderReturn, ScopeOrder};
|
|
use crate::prelude::ReactiveContext;
|
|
use crate::scope_context::SuspenseLocation;
|
|
use crate::{
|
|
any_props::{AnyProps, BoxedAnyProps},
|
|
innerlude::ScopeState,
|
|
scope_context::Scope,
|
|
scopes::ScopeId,
|
|
virtual_dom::VirtualDom,
|
|
};
|
|
use crate::{Element, VNode};
|
|
|
|
impl VirtualDom {
|
|
pub(super) fn new_scope(
|
|
&mut self,
|
|
props: BoxedAnyProps,
|
|
name: &'static str,
|
|
) -> &mut ScopeState {
|
|
let parent_id = self.runtime.current_scope_id();
|
|
let height = match parent_id.and_then(|id| self.runtime.get_state(id)) {
|
|
Some(parent) => parent.height() + 1,
|
|
None => 0,
|
|
};
|
|
let suspense_boundary = self
|
|
.runtime
|
|
.suspense_stack
|
|
.borrow()
|
|
.last()
|
|
.cloned()
|
|
.unwrap_or(SuspenseLocation::NotSuspended);
|
|
let entry = self.scopes.vacant_entry();
|
|
let id = ScopeId(entry.key());
|
|
|
|
let scope_runtime = Scope::new(name, id, parent_id, height, suspense_boundary);
|
|
let reactive_context = ReactiveContext::new_for_scope(&scope_runtime, &self.runtime);
|
|
|
|
let scope = entry.insert(ScopeState {
|
|
runtime: self.runtime.clone(),
|
|
context_id: id,
|
|
props,
|
|
last_rendered_node: Default::default(),
|
|
reactive_context,
|
|
});
|
|
|
|
self.runtime.create_scope(scope_runtime);
|
|
tracing::trace!("created scope {id:?} with parent {parent_id:?}");
|
|
|
|
scope
|
|
}
|
|
|
|
/// Run a scope and return the rendered nodes. This will not modify the DOM or update the last rendered node of the scope.
|
|
#[tracing::instrument(skip(self), level = "trace", name = "VirtualDom::run_scope")]
|
|
pub(crate) fn run_scope(&mut self, scope_id: ScopeId) -> RenderReturn {
|
|
debug_assert!(
|
|
crate::Runtime::current().is_some(),
|
|
"Must be in a dioxus runtime"
|
|
);
|
|
self.runtime.push_scope(scope_id);
|
|
|
|
let scope = &self.scopes[scope_id.0];
|
|
let output = {
|
|
let scope_state = scope.state();
|
|
|
|
scope_state.hook_index.set(0);
|
|
|
|
// Run all pre-render hooks
|
|
for pre_run in scope_state.before_render.borrow_mut().iter_mut() {
|
|
pre_run();
|
|
}
|
|
|
|
let props: &dyn AnyProps = &*scope.props;
|
|
|
|
let span = tracing::trace_span!("render", scope = %scope.state().name);
|
|
span.in_scope(|| {
|
|
scope.reactive_context.reset_and_run_in(|| {
|
|
let mut render_return = props.render();
|
|
self.handle_element_return(&mut render_return.node, scope_id, &scope.state());
|
|
render_return
|
|
})
|
|
})
|
|
};
|
|
|
|
let scope_state = scope.state();
|
|
|
|
// Run all post-render hooks
|
|
for post_run in scope_state.after_render.borrow_mut().iter_mut() {
|
|
post_run();
|
|
}
|
|
|
|
// remove this scope from dirty scopes
|
|
self.dirty_scopes
|
|
.remove(&ScopeOrder::new(scope_state.height, scope_id));
|
|
|
|
self.runtime.pop_scope();
|
|
|
|
output
|
|
}
|
|
|
|
/// Insert any errors, or suspended tasks from an element return into the runtime
|
|
fn handle_element_return(&self, node: &mut Element, scope_id: ScopeId, scope_state: &Scope) {
|
|
match node {
|
|
Err(RenderError::Aborted(e)) => {
|
|
tracing::error!(
|
|
"Error while rendering component `{}`: {e:?}",
|
|
scope_state.name
|
|
);
|
|
throw_error(e.clone_mounted());
|
|
e.render = VNode::placeholder();
|
|
}
|
|
Err(RenderError::Suspended(e)) => {
|
|
let task = e.task();
|
|
// Insert the task into the nearest suspense boundary if it exists
|
|
let boundary = self
|
|
.runtime
|
|
.get_state(scope_id)
|
|
.unwrap()
|
|
.suspense_boundary();
|
|
let already_suspended = self
|
|
.runtime
|
|
.tasks
|
|
.borrow()
|
|
.get(task.id)
|
|
.expect("Suspended on a task that no longer exists")
|
|
.suspend(boundary.clone());
|
|
if !already_suspended {
|
|
tracing::trace!("Suspending {:?} on {:?}", scope_id, task);
|
|
// Add this task to the suspended tasks list of the boundary
|
|
if let SuspenseLocation::UnderSuspense(boundary) = &boundary {
|
|
boundary.add_suspended_task(e.clone());
|
|
}
|
|
self.runtime
|
|
.suspended_tasks
|
|
.set(self.runtime.suspended_tasks.get() + 1);
|
|
}
|
|
e.placeholder = VNode::placeholder();
|
|
}
|
|
Ok(_) => {
|
|
// If the render was successful, we can move the render generation forward by one
|
|
scope_state
|
|
.render_count
|
|
.set(scope_state.render_count.get() + 1);
|
|
}
|
|
}
|
|
}
|
|
}
|