theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

types(runtime-core): update error type to unknown (#798)

Browse Source
This commit is contained in:
hareku 2020-03-10 04:58:52 +09:00 committed by GitHub
parent cb814f646b
commit 257727569a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/runtime-core/__tests__/components/Suspense.spec.ts
View File

@ -536,15 +536,18 @@ describe('Suspense', () => {
const Comp = {
setup() {
const error = ref<Error | null>(null)
onErrorCaptured(e => {
error.value = e
const errorMessage = ref<string | null>(null)
onErrorCaptured(err => {
errorMessage.value =
err instanceof Error
? err.message
: `A non-Error value thrown: ${err}`
return true
})
return () =>
error.value
? h('div', error.value.message)
errorMessage.value
? h('div', errorMessage.value)
: h(Suspense, null, {
default: h(Async),
fallback: h('div', 'fallback')

2
packages/runtime-core/src/apiCreateApp.ts
View File

@ -41,7 +41,7 @@ export interface AppConfig {
readonly isNativeTag?: (tag: string) => boolean
isCustomElement?: (tag: string) => boolean
errorHandler?: (
err: Error,
err: unknown,
instance: ComponentPublicInstance | null,
info: string
) => void

2
packages/runtime-core/src/apiLifecycle.ts
View File

@ -85,7 +85,7 @@ export const onRenderTracked = createHook<DebuggerHook>(
)
export type ErrorCapturedHook = (
err: Error,
err: unknown,
instance: ComponentPublicInstance | null,
info: string
) => boolean | void

6
packages/runtime-core/src/errorHandling.ts
View File

@ -78,7 +78,7 @@ export function callWithAsyncErrorHandling(
if (isFunction(fn)) {
const res = callWithErrorHandling(fn, instance, type, args)
if (res != null && !res._isVue && isPromise(res)) {
res.catch((err: Error) => {
res.catch(err => {
handleError(err, instance, type)
})
}
@ -93,7 +93,7 @@ export function callWithAsyncErrorHandling(
}
export function handleError(
err: Error,
err: unknown,
instance: ComponentInternalInstance | null,
type: ErrorTypes
) {
@ -136,7 +136,7 @@ export function setErrorRecovery(value: boolean) {
forceRecover = value
}
function logError(err: Error, type: ErrorTypes, contextVNode: VNode | null) {
function logError(err: unknown, type: ErrorTypes, contextVNode: VNode | null) {
// default behavior is crash in prod & test, recover in dev.
if (__DEV__ && (forceRecover || !__TEST__)) {
const info = ErrorTypeStrings[type]