fix: prevent withAsyncContext currentInstance leak in edge cases

2021-06-29 14:21:31 -04:00
parent 0240e82a38
commit 9ee41e14d2
3 changed files with 170 additions and 33 deletions
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -623,6 +623,11 @@ function setupStatefulComponent(
    currentInstance = null

    if (isPromise(setupResult)) {
+      const unsetInstance = () => {
+        currentInstance = null
+      }
+      setupResult.then(unsetInstance, unsetInstance)
+
      if (isSSR) {
        // return the promise so server-renderer can wait on it
        return setupResult