fix(type): fix tying issues in #428 (#444)

* fix(type): fix tying issues in #428 * fix
vuejs · Jul 18, 2020 · 98c7041 · 98c7041
1 parent e8ea208
commit 98c7041
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/component/componentProps.ts b/src/component/componentProps.ts
@@ -43,7 +43,7 @@ type ExtractFunctionPropType<
   T extends Function,
   TArgs extends Array<any> = any[],
   TResult = any
-> = T extends (...args: TArgs) => TResult ? T : never
+> = T extends (...args: TArgs) => TResult ? T : any
 
 type ExtractCorrectPropType<T> = T extends Function
   ? ExtractFunctionPropType<T>

diff --git a/src/component/componentProxy.ts b/src/component/componentProxy.ts
@@ -27,17 +27,12 @@ export type ComponentRenderProxy<
   $data: D
   $props: Readonly<P & PublicProps>
   $attrs: Data
-  $refs: Data
-  $slots: Data
-  $root: ComponentInstance | null
-  $parent: ComponentInstance | null
-  $emit: (event: string, ...args: unknown[]) => void
 } & Readonly<P> &
   UnwrapRef<B> &
   D &
   M &
   ExtractComputedReturns<C> &
-  Vue
+  Omit<Vue, '$data' | '$props' | '$attrs'>
 
 // for Vetur and TSX support
 type VueConstructorProxy<PropsOptions, RawBindings> = VueConstructor & {