Merge branch 'main' into fix/ssr-error-page-base-url

nuxt · Nov 10, 2022 · 3c5747b · 3c5747b
2 parents a331343 + 83b5c09
commit 3c5747b
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts
@@ -172,18 +172,13 @@ export default defineRenderHandler(async (event) => {
     writeEarlyHints(event, link)
   }
 
-  const _rendered = await renderer.renderToString(ssrContext).catch((err) => {
-    if (!ssrError) {
-      // Use explicitly thrown error in preference to subsequent rendering errors
-      throw ssrContext.payload?.error || err
-    }
+  const _rendered = await renderer.renderToString(ssrContext).catch((error) => {
+    // Use explicitly thrown error in preference to subsequent rendering errors
+    throw (!ssrError && ssrContext.payload?.error) || error
   })
   await ssrContext.nuxt?.hooks.callHook('app:rendered', { ssrContext })
 
   // Handle errors
-  if (!_rendered) {
-    return undefined!
-  }
   if (ssrContext.payload?.error && !ssrError) {
     throw ssrContext.payload.error
   }