wip: fix more tests

diff --git a/packages/runtime-core/src/createRenderer.ts b/packages/runtime-core/src/createRenderer.ts
index f8c5c26ea638aff004ef4b2ba6256aa703600c51..41a6845055a2ed8d51a9091015870419385e0d76 100644 (file)
--- a/packages/runtime-core/src/createRenderer.ts
+++ b/packages/runtime-core/src/createRenderer.ts
@@ -227,9 +227,13 @@ export function createRenderer(options: RendererOptions) {
       // kept-alive
       activateComponentInstance(vnode, container, endNode)
     } else {
-      queueJob(() => {
+      if (__COMPAT__) {
         mountComponentInstance(vnode, container, isSVG, endNode)
-      }, flushHooks)
+      } else {
+        queueJob(() => {
+          mountComponentInstance(vnode, container, isSVG, endNode)
+        }, flushHooks)
+      }
     }
   }
 
@@ -257,8 +261,7 @@ export function createRenderer(options: RendererOptions) {
       queueJob(handle.runner)
     })
 
-    // we are using vnode.ref to store the functional component's update job
-    queueJob(() => {
+    const doMount = () => {
       handle.runner = autorun(
         () => {
           if (handle.prevTree) {
@@ -270,6 +273,9 @@ export function createRenderer(options: RendererOptions) {
             const nextTree = (handle.prevTree = current.children = renderFunctionalRoot(
               current
             ))
+            queuePostCommitHook(() => {
+              current.el = nextTree.el
+            })
             patch(
               prevTree as MountedVNode,
               nextTree,
@@ -277,7 +283,6 @@ export function createRenderer(options: RendererOptions) {
               current as MountedVNode,
               isSVG
             )
-            current.el = nextTree.el
             if (__DEV__) {
               popWarningContext()
             }
@@ -289,8 +294,10 @@ export function createRenderer(options: RendererOptions) {
             const subTree = (handle.prevTree = vnode.children = renderFunctionalRoot(
               vnode
             ))
+            queuePostCommitHook(() => {
+              vnode.el = subTree.el as RenderNode
+            })
             mount(subTree, container, vnode as MountedVNode, isSVG, endNode)
-            vnode.el = subTree.el as RenderNode
             if (__DEV__) {
               popWarningContext()
             }
@@ -300,7 +307,14 @@ export function createRenderer(options: RendererOptions) {
           scheduler: queueUpdate
         }
       )
-    })
+    }
+
+    // we are using vnode.ref to store the functional component's update job
+    if (__COMPAT__) {
+      doMount()
+    } else {
+      queueJob(doMount)
+    }
   }
 
   function mountText(
@@ -1200,6 +1214,10 @@ export function createRenderer(options: RendererOptions) {
 
           queuePostCommitHook(() => {
             vnode.el = instance.$vnode.el
+            if (__COMPAT__) {
+              // expose __vue__ for devtools
+              ;(vnode.el as any).__vue__ = instance
+            }
             if (vnode.ref) {
               vnode.ref($proxy)
             }
@@ -1219,11 +1237,6 @@ export function createRenderer(options: RendererOptions) {
             endNode
           )
 
-          if (__COMPAT__) {
-            // expose __vue__ for devtools
-            ;(vnode.el as any).__vue__ = instance
-          }
-
           instance._mounted = true
         }
       },
@@ -1435,11 +1448,18 @@ export function createRenderer(options: RendererOptions) {
         container.vnode = null
       }
     }
-    return nextTick(() => {
+    if (__COMPAT__) {
+      flushHooks()
       return vnode && vnode.flags & VNodeFlags.COMPONENT_STATEFUL
         ? (vnode.children as ComponentInstance).$proxy
         : null
-    })
+    } else {
+      return nextTick(() => {
+        return vnode && vnode.flags & VNodeFlags.COMPONENT_STATEFUL
+          ? (vnode.children as ComponentInstance).$proxy
+          : null
+      })
+    }
   }
 
   return { render }

diff --git a/packages/runtime-test/src/nodeOps.ts b/packages/runtime-test/src/nodeOps.ts
index bcf4e1e4d573408fe05b54bf01a35a0a013dbe14..9b4e48462f660be139bbd24725fccf36a347fc76 100644 (file)
--- a/packages/runtime-test/src/nodeOps.ts
+++ b/packages/runtime-test/src/nodeOps.ts
@@ -63,9 +63,6 @@ export function dumpOps(): NodeOp[] {
 }
 
 function createElement(tag: string): TestElement {
-  if (nodeId === 5) {
-    throw new Error('foo')
-  }
   const node: TestElement = {
     id: nodeId++,
     type: NodeTypes.ELEMENT,

diff --git a/packages/scheduler/src/patchNodeOps.ts b/packages/scheduler/src/patchNodeOps.ts
index 18b0811a30ec96a57def33cec08c792e1a0f86e7..5077aeacda63cc7b9f4a3c482b73fe37607917fb 100644 (file)
--- a/packages/scheduler/src/patchNodeOps.ts
+++ b/packages/scheduler/src/patchNodeOps.ts
@@ -1,3 +1,4 @@
+// temporary hack to wrap nodeOps so it works with time-slicing
 import { NodeOps } from '@vue/runtime-core'
 import { nodeOps } from '../../runtime-dom/src/nodeOps'
 import { nodeOps as testNodeOps } from '../../runtime-test/src/nodeOps'

diff --git a/packages/vue-compat/__tests__/compat.spec.ts b/packages/vue-compat/__tests__/compat.spec.ts
index 9552f743e5a1efac7644dc8f4080ed1c92b37b99..b1aa63c26ce5fecc46d251d422a38333e1ca7327 100644 (file)
--- a/packages/vue-compat/__tests__/compat.spec.ts
+++ b/packages/vue-compat/__tests__/compat.spec.ts
@@ -1,6 +1,6 @@
 ;(global as any).__COMPAT__ = true
 
-import Vue from '../src/index-compat'
+import Vue from '../src/index'
 
 describe('2.x compat build', async () => {
   test('should work', async () => {