From: fisker Cheung Date: Tue, 15 Oct 2019 03:15:09 +0000 (+0800) Subject: types: use hook type in options (#284) X-Git-Tag: v3.0.0-alpha.0~434 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5d60a0f7a1dcb2a67fd39266349baec2e654cb2;p=thirdparty%2Fvuejs%2Fcore.git types: use hook type in options (#284) --- diff --git a/packages/runtime-core/src/apiLifecycle.ts b/packages/runtime-core/src/apiLifecycle.ts index 8a22af2390..533cc39a75 100644 --- a/packages/runtime-core/src/apiLifecycle.ts +++ b/packages/runtime-core/src/apiLifecycle.ts @@ -60,7 +60,7 @@ export const onUpdated = createHook(LifecycleHooks.UPDATED) export const onBeforeUnmount = createHook(LifecycleHooks.BEFORE_UNMOUNT) export const onUnmounted = createHook(LifecycleHooks.UNMOUNTED) -type DebuggerHook = (e: DebuggerEvent) => void +export type DebuggerHook = (e: DebuggerEvent) => void export const onRenderTriggered = createHook( LifecycleHooks.RENDER_TRIGGERED ) @@ -68,7 +68,7 @@ export const onRenderTracked = createHook( LifecycleHooks.RENDER_TRACKED ) -type ErrorCapturedHook = ( +export type ErrorCapturedHook = ( err: Error, instance: ComponentPublicInstance | null, info: string diff --git a/packages/runtime-core/src/apiOptions.ts b/packages/runtime-core/src/apiOptions.ts index 6b0fce5847..59b69dc913 100644 --- a/packages/runtime-core/src/apiOptions.ts +++ b/packages/runtime-core/src/apiOptions.ts @@ -25,9 +25,11 @@ import { onRenderTracked, onBeforeUnmount, onUnmounted, - onRenderTriggered + onRenderTriggered, + DebuggerHook, + ErrorCapturedHook } from './apiLifecycle' -import { DebuggerEvent, reactive } from '@vue/reactivity' +import { reactive } from '@vue/reactivity' import { ComponentObjectPropsOptions, ExtractPropTypes } from './componentProps' import { Directive } from './directives' import { VNodeChild } from './vnode' @@ -172,9 +174,9 @@ export interface LegacyOptions< deactivated?(): void beforeUnmount?(): void unmounted?(): void - renderTracked?(e: DebuggerEvent): void - renderTriggered?(e: DebuggerEvent): void - errorCaptured?(): boolean | void + renderTracked?: DebuggerHook + renderTriggered?: DebuggerHook + errorCaptured?: ErrorCapturedHook } export function applyOptions(