From 2a2bf9b93d41df4d0f54f9a69148f54ebc44d3fa Mon Sep 17 00:00:00 2001
From: Pim <pimlie@hotmail.com>
Date: Fri, 14 Jun 2019 19:28:03 +0200
Subject: [PATCH] fix(vue-app): always finish `transition.leave` asynchronously
 (#5891)

---
 .../vue-app/template/components/nuxt-child.js | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/packages/vue-app/template/components/nuxt-child.js b/packages/vue-app/template/components/nuxt-child.js
index b6e8595a06..7754a9a650 100644
--- a/packages/vue-app/template/components/nuxt-child.js
+++ b/packages/vue-app/template/components/nuxt-child.js
@@ -48,21 +48,33 @@ export default {
       window.<%= globals.nuxt %>.$nextTick(() => {
         window.<%= globals.nuxt %>.$emit('triggerScroll')
       })
-      if (beforeEnter) return beforeEnter.call(_parent, el)
+      if (beforeEnter) {
+        return beforeEnter.call(_parent, el)
+      }
     }
 
-    let routerView = [
-      h('router-view', data)
-    ]
-    if (props.keepAlive) {
-      routerView = [
-        h('keep-alive', { props: props.keepAliveProps }, routerView)
-      ]
+    // make sure that leave is called asynchronous (fix #5703)
+    if (transition.css === false) {
+      const leave = listeners.leave
+      listeners.leave = (el, done) => {
+        if (leave) {
+          leave.call(_parent, el)
+        }
+
+        _parent.$nextTick(done)
+      }
     }
+
+    let routerView = h('routerView', data)
+
+    if (props.keepAlive) {
+      routerView = h('keep-alive', { props: props.keepAliveProps }, [routerView])
+    }
+
     return h('transition', {
       props: transitionProps,
       on: listeners
-    }, routerView)
+    }, [routerView])
   }
 }