From e23d3abb4394fa7e80d32289ba7f0c9e9c456241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@nuxtjs.com>
Date: Wed, 12 Feb 2020 17:31:42 +0100
Subject: [PATCH] chore: don't server render if an error happens on static
 target

---
 packages/vue-app/template/server.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/vue-app/template/server.js b/packages/vue-app/template/server.js
index 12a8e265b701..dbf3f48bc0f7 100644
--- a/packages/vue-app/template/server.js
+++ b/packages/vue-app/template/server.js
@@ -102,6 +102,10 @@ export default async (ssrContext) => {
   }
 
   const renderErrorPage = async () => {
+    // Don't server-render the page in static target
+    if (ssrContext.target === 'static' || !ssrContext.res) {
+      ssrContext.nuxt.serverRendered = false
+    }
     <% if (features.layouts) { %>
     // Load layout for error page
     const layout = (NuxtError.options || NuxtError).layout
@@ -247,10 +251,6 @@ export default async (ssrContext) => {
 
   // ...If .validate() returned false
   if (!isValid) {
-    // Don't server-render the page in generate mode
-    if (ssrContext.target === 'static') {
-      ssrContext.nuxt.serverRendered = false
-    }
     // Render a 404 error page
     return render404Page()
   }