refactor: simplify suspense ssr + adjust behavior

packages/server-renderer/src/renderToString.ts

@@ -11,7 +11,8 @@ import {
   ssrUtils,
   Slots,
   createApp,
-  ssrContextKey
+  ssrContextKey,
+  warn
 } from 'vue'
 import {
   ShapeFlags,
@@ -138,8 +139,6 @@ export function renderComponent(
   )
 }
 
-export const AsyncSetupErrorMarker = Symbol('Vue async setup error')
-
 function renderComponentVNode(
   vnode: VNode,
   parentComponent: ComponentInternalInstance | null = null
@@ -153,17 +152,7 @@ function renderComponentVNode(
   if (isPromise(res)) {
     return res
       .catch(err => {
-        // normalize async setup rejection
-        if (!(err instanceof Error)) {
-          err = new Error(String(err))
-        }
-        err[AsyncSetupErrorMarker] = true
-        console.error(
-          `[@vue/server-renderer]: Uncaught error in async setup:\n`,
-          err
-        )
-        // rethrow for suspense
-        throw err
+        warn(`[@vue/server-renderer]: Uncaught error in async setup:\n`, err)
       })
       .then(() => renderComponentSubTree(instance))
   } else {
@@ -192,11 +181,12 @@ function renderComponentSubTree(
     } else if (instance.render) {
       renderVNode(push, renderComponentRoot(instance), instance)
     } else {
-      throw new Error(
+      warn(
         `Component ${
           comp.name ? `${comp.name} ` : ``
         } is missing template or render function.`
       )
+      push(`<!---->`)
     }
   }
   return getBuffer()
@@ -233,7 +223,7 @@ function ssrCompile(
             err.loc.start.offset,
             err.loc.end.offset
           )
-        console.error(codeFrame ? `${message}\n${codeFrame}` : message)
+        warn(codeFrame ? `${message}\n${codeFrame}` : message)
       } else {
         throw err
       }
@@ -268,9 +258,13 @@ function renderVNode(
       } else if (shapeFlag & ShapeFlags.PORTAL) {
         renderPortalVNode(vnode, parentComponent)
       } else if (shapeFlag & ShapeFlags.SUSPENSE) {
-        push(renderSuspenseVNode(vnode, parentComponent))
+        renderVNode(
+          push,
+          normalizeSuspenseChildren(vnode).content,
+          parentComponent
+        )
       } else {
-        console.error(
+        warn(
           '[@vue/server-renderer] Invalid VNode type:',
           type,
           `(${typeof type})`
@@ -350,11 +344,11 @@ function renderPortalVNode(
 ) {
   const target = vnode.props && vnode.props.target
   if (!target) {
-    console.error(`[@vue/server-renderer] Portal is missing target prop.`)
+    warn(`[@vue/server-renderer] Portal is missing target prop.`)
     return []
   }
   if (!isString(target)) {
-    console.error(
+    warn(
       `[@vue/server-renderer] Portal target must be a query selector string.`
     )
     return []
@@ -385,24 +379,3 @@ async function resolvePortals(context: SSRContext) {
     }
   }
 }
-
-async function renderSuspenseVNode(
-  vnode: VNode,
-  parentComponent: ComponentInternalInstance
-): Promise<ResolvedSSRBuffer> {
-  const { content, fallback } = normalizeSuspenseChildren(vnode)
-  try {
-    const { push, getBuffer } = createBuffer()
-    renderVNode(push, content, parentComponent)
-    // await here so error can be caught
-    return await getBuffer()
-  } catch (e) {
-    if (e[AsyncSetupErrorMarker]) {
-      const { push, getBuffer } = createBuffer()
-      renderVNode(push, fallback, parentComponent)
-      return getBuffer()
-    } else {
-      throw e
-    }
-  }
-}