test: basic test for suspense

diff --git a/packages/runtime-core/__tests__/rendererSuspense.spec.ts b/packages/runtime-core/__tests__/rendererSuspense.spec.ts
new file mode 100644 (file)
index 0000000..6f7e2d2
--- /dev/null
+++ b/packages/runtime-core/__tests__/rendererSuspense.spec.ts
@@ -0,0 +1,64 @@
+import {
+  h,
+  ref,
+  Suspense,
+  ComponentOptions,
+  render,
+  nodeOps,
+  serializeInner,
+  nextTick
+} from '@vue/runtime-test'
+
+describe('renderer: suspense', () => {
+  it('should work', async () => {
+    const msg = ref('hello')
+    const deps: Promise<any>[] = []
+
+    const createAsyncComponent = (loader: () => Promise<ComponentOptions>) => ({
+      async setup(props: any, { slots }: any) {
+        const p = loader()
+        deps.push(p)
+        const Inner = await p
+        return () => h(Inner, props, slots)
+      }
+    })
+
+    const AsyncChild = createAsyncComponent(
+      () =>
+        new Promise(resolve => {
+          setTimeout(() => {
+            resolve({
+              setup(props: { msg: string }) {
+                return () => h('div', props.msg)
+              }
+            })
+          }, 0)
+        })
+    )
+
+    const Mid = {
+      setup() {
+        return () =>
+          h(AsyncChild, {
+            msg: msg.value
+          })
+      }
+    }
+
+    const Comp = {
+      name: 'root',
+      setup() {
+        // TODO test fallback
+        return () => h(Suspense, [msg.value, h(Mid)])
+      }
+    }
+
+    const root = nodeOps.createElement('div')
+    render(h(Comp), root)
+    expect(serializeInner(root)).toBe(`<!---->`)
+
+    await Promise.all(deps)
+    await nextTick()
+    expect(serializeInner(root)).toBe(`<!---->hello<div>hello</div><!---->`)
+  })
+})

diff --git a/packages/runtime-core/src/createRenderer.ts b/packages/runtime-core/src/createRenderer.ts
index fb404feb0e71c6c838a7db9c8caa8e2968006fd2..45ba646b1e878c3dd3880181de107e945b6c1431 100644 (file)
--- a/packages/runtime-core/src/createRenderer.ts
+++ b/packages/runtime-core/src/createRenderer.ts
@@ -634,10 +634,10 @@ export function createRenderer<
       })
 
       suspense.onResolve(() => {
+        // unmount fallback tree
+        unmount(suspense.fallbackTree as HostVNode, parentComponent, true)
         // move content from off-dom container to actual container
-        ;(suspense.subTree as any).children.forEach((vnode: HostVNode) => {
-          move(vnode, container, anchor)
-        })
+        move(suspense.subTree as HostVNode, container, anchor)
         suspense.vnode.el = (suspense.subTree as HostVNode).el
         // check if there is a pending parent suspense
         let parent = suspense.parent
@@ -682,7 +682,12 @@ export function createRenderer<
       // now check if we have encountered any async deps
       if (suspense.deps > 0) {
         // TODO mount the fallback tree.
-        console.log('fallback')
+        processEmptyNode(
+          null,
+          (suspense.fallbackTree = createVNode(Empty)),
+          container,
+          anchor
+        )
       } else {
         suspense.resolve()
       }
@@ -815,6 +820,10 @@ export function createRenderer<
         suspense.deps--
         suspense.retry()
       })
+      // give it a placeholder
+      const placeholder = (instance.subTree = createVNode(Empty))
+      processEmptyNode(null, placeholder, container, anchor)
+      initialVNode.el = placeholder.el
       return
     }