fix: use Promise.resolve() to cover all possible promise cases (#211)

Co-authored-by: Nicolas Vitaterna <nvitaterna@gmail.com> closes #210
nuxt-community · Aug 18, 2020 · 6d10312 · 6d10312 · vercel · Aug 18, 2020
1 parent 4764d1c
commit 6d10312
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/src/async.ts b/src/async.ts
@@ -43,19 +43,15 @@ export const useAsync = <T>(
       process.client &&
       window[globalNuxt]?.context.isHMR)
   ) {
-    const p = cb()
-
-    if (p instanceof Promise) {
-      if (process.server) {
-        onServerPrefetch(async () => {
-          _ref.value = await p
-        })
-      } else {
-        // eslint-disable-next-line
-        p.then(res => (_ref.value = res))
-      }
+    const p = Promise.resolve(cb())
+
+    if (process.server) {
+      onServerPrefetch(async () => {
+        _ref.value = await p
+      })
     } else {
-      _ref.value = p
+      // eslint-disable-next-line
+      p.then(res => (_ref.value = res))
     }
   }