fix: redirect without unresolved promise

nuxt · Jan 16, 2018 · 24185c9 · 24185c9
1 parent 97d70f4
commit 24185c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/app/client.js b/lib/app/client.js
@@ -60,6 +60,9 @@ Vue.config.errorHandler = function (err, vm, info) {
 createApp()
 .then(mountApp)
 .catch(err => {
+  if (err.message === 'ERR_REDIRECT') {
+    return // Wait for browser to redirect...
+  }
   console.error('[nuxt] Error while initializing app', err)
 })
 

diff --git a/lib/app/utils.js b/lib/app/utils.js
@@ -153,10 +153,11 @@ export async function setContext(app, context) {
           })
         }
         if (process.client) {
-          window.location = path
-          return new Promise((resolve) => {
-            // Wait for browser to redirect...
-          })
+          // https://developer.mozilla.org/en-US/docs/Web/API/Location/replace
+          window.location.replace(path)
+
+          // Throw a redirect error
+          throw new Error('ERR_REDIRECT')
         }
       }
     }