From: Evan You <yyx990803@gmail.com>
Date: Sat, 2 Nov 2019 03:04:28 +0000 (-0400)
Subject: types: fix types
X-Git-Tag: v3.0.0-alpha.0~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cdeeaa7027743e0de851dcdfd53a177cef7d5a1;p=thirdparty%2Fvuejs%2Fcore.git

types: fix types
---

diff --git a/packages/runtime-core/src/apiOptions.ts b/packages/runtime-core/src/apiOptions.ts
index 2bdad66a21..fd4523e9b3 100644
--- a/packages/runtime-core/src/apiOptions.ts
+++ b/packages/runtime-core/src/apiOptions.ts
@@ -73,7 +73,6 @@ export interface ComponentOptionsBase<
   __isFragment?: never
   __isPortal?: never
   __isSuspense?: never
-  __isKeepAlive?: never
 }
 
 export type ComponentOptionsWithoutProps<
diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index 07cd2151ac..ea554144a7 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -145,7 +145,7 @@ export function createComponentInstance(
     vnode,
     parent,
     appContext,
-    type: vnode.type,
+    type: vnode.type as Component,
     root: null!, // set later so it can point to itself
     next: null,
     subTree: null!, // will be set synchronously right after creation
diff --git a/packages/runtime-core/src/keepAlive.ts b/packages/runtime-core/src/keepAlive.ts
index a1484af9fc..27b20a4cc3 100644
--- a/packages/runtime-core/src/keepAlive.ts
+++ b/packages/runtime-core/src/keepAlive.ts
@@ -100,7 +100,7 @@ export const KeepAlive = {
 
     function pruneCache(filter?: (name: string) => boolean) {
       cache.forEach((vnode, key) => {
-        const name = getName(vnode.type)
+        const name = getName(vnode.type as Component)
         if (name && (!filter || !filter(name))) {
           pruneCacheEntry(key)
         }
diff --git a/packages/runtime-core/src/warning.ts b/packages/runtime-core/src/warning.ts
index b1ac6f2716..dfc77d6cda 100644
--- a/packages/runtime-core/src/warning.ts
+++ b/packages/runtime-core/src/warning.ts
@@ -17,7 +17,7 @@ type TraceEntry = {
 
 type ComponentTraceStack = TraceEntry[]
 
-export function pushWarningContext(vnode: ComponentVNode) {
+export function pushWarningContext(vnode: VNode) {
   stack.push(vnode)
 }
 
@@ -83,7 +83,7 @@ function getComponentTrace(): ComponentTraceStack {
       last.recurseCount++
     } else {
       normalizedStack.push({
-        vnode: currentVNode,
+        vnode: currentVNode as ComponentVNode,
         recurseCount: 0
       })
     }