Suspense boundaries/out of order streaming/anyhow like error handling (#2365)

* 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>
2024-07-01 20:50:36 -07:00
1 parent ffa36a67c3
commit 022e4ad203
@@ -54,6 +54,7 @@ impl<'a> DynamicContext<'a> {
    /// they'll get picked up after codegen for compilation. Cool stuff.
    ///
    /// If updating fails (IE the root is a dynamic node that has changed), then we return None.
+    #[cfg(feature = "hot_reload")]
    pub fn populate_by_updating<Ctx: HotReloadingContext>(
        &mut self,
        roots: &'a [BodyNode],
@@ -104,10 +105,7 @@ impl<'a> DynamicContext<'a> {
        let ct = self.dynamic_nodes.len();
        self.dynamic_nodes.push(root);
        self.node_paths.push(self.current_path.clone());
-        match root {
-            BodyNode::Text(_) => quote! { dioxus_core::TemplateNode::DynamicText { id: #ct } },
-            _ => quote! { dioxus_core::TemplateNode::Dynamic { id: #ct } },
-        }
+        quote! { dioxus_core::TemplateNode::Dynamic { id: #ct } }
    }

    fn render_static_element(&mut self, el: &'a Element) -> TokenStream2 {
@@ -254,6 +252,7 @@ impl<'a> DynamicContext<'a> {
    /// If the change between the old and new template results in a mapping that doesn't exist, then we need to bail out.
    /// Basically if we *had* a mapping of `[0, 1]` and the new template is `[1, 2]`, then we need to bail out, since
    /// the new mapping doesn't exist in the original.
+    #[cfg(feature = "hot_reload")]
    fn update_dynamic_node(&mut self, root: &'a BodyNode) -> Option<TemplateNode> {
        let idx = match self.has_tracked_nodes() {
            //    Bail out if the mapping doesn't exist
@@ -274,11 +273,12 @@ impl<'a> DynamicContext<'a> {
        self.node_paths[idx].clone_from(&self.current_path);

        Some(match root {
-            BodyNode::Text(_) => TemplateNode::DynamicText { id: idx },
+            BodyNode::Text(_) => TemplateNode::Dynamic { id: idx },
            _ => TemplateNode::Dynamic { id: idx },
        })
    }

+    #[cfg(feature = "hot_reload")]
    fn update_element<Ctx: HotReloadingContext>(
        &mut self,
        el: &'a Element,
@@ -321,6 +321,7 @@ impl<'a> DynamicContext<'a> {
        })
    }

+    #[cfg(feature = "hot_reload")]
    fn update_dynamic_attribute(&mut self, attr: &'a AttributeType) -> Option<usize> {
        let idx = match self.has_tracked_nodes() {
            true => self.tracked_attribute_idx(attr)?,
@@ -337,6 +338,7 @@ impl<'a> DynamicContext<'a> {
        Some(idx)
    }

+    #[cfg(feature = "hot_reload")]
    fn make_static_attribute<Ctx: HotReloadingContext>(
        value: &IfmtInput,
        name: &ElementAttrName,
@@ -356,6 +358,7 @@ impl<'a> DynamicContext<'a> {
        static_attr
    }

+    #[cfg(feature = "hot_reload")]
    /// Check if we're tracking any nodes
    ///
    /// If we're tracking, then we'll attempt to use the old mapping
@@ -414,12 +417,14 @@ impl<'a> DynamicContext<'a> {
        idx
    }

+    #[cfg(feature = "hot_reload")]
    pub(crate) fn tracked_attribute_idx(&mut self, attr: &AttributeType) -> Option<usize> {
        self.attribute_to_idx
            .get_mut(attr)
            .and_then(|idxs| idxs.pop())
    }

+    #[cfg(feature = "hot_reload")]
    pub(crate) fn tracked_node_idx(&mut self, node: &BodyNode) -> Option<usize> {
        self.node_to_idx.get_mut(node).and_then(|idxs| idxs.pop())
    }
@@ -1,8 +1,14 @@
+#[cfg(feature = "hot_reload")]
 mod hot_reload_diff;
+#[cfg(feature = "hot_reload")]
 pub use hot_reload_diff::*;

+#[cfg(feature = "hot_reload_traits")]
 mod hot_reloading_context;
+#[cfg(feature = "hot_reload_traits")]
 pub use hot_reloading_context::*;

+#[cfg(feature = "hot_reload")]
 mod hot_reloading_file_map;
+#[cfg(feature = "hot_reload")]
 pub use hot_reloading_file_map::*;
@@ -71,12 +71,11 @@ pub use element::*;
 pub use ifmt::*;
 pub use node::*;

-#[cfg(feature = "hot_reload")]
 pub mod hot_reload;

 #[cfg(feature = "hot_reload")]
 use dioxus_core::{Template, TemplateAttribute, TemplateNode};
-#[cfg(feature = "hot_reload")]
+#[cfg(feature = "hot_reload_traits")]
 pub use hot_reload::HotReloadingContext;
 #[cfg(feature = "hot_reload")]
 use internment::Intern;
@@ -215,7 +214,8 @@ impl ToTokens for CallBody {
    fn to_tokens(&self, out_tokens: &mut TokenStream2) {
        // Empty templates just are placeholders for "none"
        match self.roots.is_empty() {
-            true => out_tokens.append_all(quote! { None }),
+            true => out_tokens
+                .append_all(quote! { dioxus_core::prelude::Element::Ok(dioxus_core::prelude::VNode::placeholder()) }),
            false => {
                let body = TemplateRenderer::as_tokens(&self.roots, None);
                out_tokens.append_all(quote! { { #body } })
@@ -424,7 +424,7 @@ impl ToTokens for IfChain {

        if !terminated {
            body.append_all(quote! {
-                else { None }
+                else { dioxus_core::VNode::empty() }
            });
        }

@@ -69,7 +69,7 @@ impl<'a> TemplateRenderer<'a> {
            }
        };

-        quote! { Some({ #vnode }) }
+        quote! { dioxus_core::Element::Ok({ #vnode }) }
    }

    fn get_template_id_tokens(&self) -> TokenStream2 {