]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
types: fix types
authorEvan You <yyx990803@gmail.com>
Sat, 2 Nov 2019 03:04:28 +0000 (23:04 -0400)
committerEvan You <yyx990803@gmail.com>
Sat, 2 Nov 2019 03:04:28 +0000 (23:04 -0400)
packages/runtime-core/src/apiOptions.ts
packages/runtime-core/src/component.ts
packages/runtime-core/src/keepAlive.ts
packages/runtime-core/src/warning.ts

index 2bdad66a21068869bff271babd43754303d3f54c..fd4523e9b39df2b80ce99a4f7eb248db0bcc2c8e 100644 (file)
@@ -73,7 +73,6 @@ export interface ComponentOptionsBase<
   __isFragment?: never
   __isPortal?: never
   __isSuspense?: never
-  __isKeepAlive?: never
 }
 
 export type ComponentOptionsWithoutProps<
index 07cd2151ac87556e5e7f012f1918025855bef606..ea554144a76c9ee92dd4d59c8ead809472bf54ad 100644 (file)
@@ -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
index a1484af9fc2f6fbc55f27ebdda89003eaa498e71..27b20a4cc3cef36446123883cdc46488aaa7b14e 100644 (file)
@@ -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)
         }
index b1ac6f2716c4032c55263293fc6f6c6e679cc7fb..dfc77d6cda617a32a98b1362e2d3d7917ded1fc6 100644 (file)
@@ -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
       })
     }