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

wip: beforeDestroy & destroyed compat

Browse Source
This commit is contained in:
Evan You 2021-04-06 10:07:16 -04:00
parent 960e0943f7
commit 65cc649559
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/runtime-core/src/compat/deprecations.ts
View File

@ -20,7 +20,9 @@ export const enum DeprecationTypes {
INSTANCE_DESTROY, INSTANCE_DESTROY,
OPTIONS_DATA_FN, OPTIONS_DATA_FN,
OPTIONS_DATA_MERGE OPTIONS_DATA_MERGE,
OPTIONS_BEFORE_DESTROY,
OPTIONS_DESTROYED
} }
type DeprecationData = { type DeprecationData = {
@ -138,6 +140,14 @@ const deprecations: Record<DeprecationTypes, DeprecationData> = {
`Detected conflicting key "${key}" when merging "data" option values. ` + `Detected conflicting key "${key}" when merging "data" option values. ` +
`In Vue 3, data keys are merged shallowly and will override one another.`, `In Vue 3, data keys are merged shallowly and will override one another.`,
link: `https://v3.vuejs.org/guide/migration/data-option.html#mixin-merge-behavior-change` link: `https://v3.vuejs.org/guide/migration/data-option.html#mixin-merge-behavior-change`
},
[DeprecationTypes.OPTIONS_BEFORE_DESTROY]: {
message: `\`beforeDestroy\` has been renamed to \`beforeUnmount\`.`
},
[DeprecationTypes.OPTIONS_DESTROYED]: {
message: `\`destroyed\` has been renamed to \`unmounted\`.`
} }
} }

18
packages/runtime-core/src/componentOptions.ts
View File

@ -66,6 +66,7 @@ import { VNodeChild } from './vnode'
import { callWithAsyncErrorHandling } from './errorHandling' import { callWithAsyncErrorHandling } from './errorHandling'
import { UnionToIntersection } from './helpers/typeUtils' import { UnionToIntersection } from './helpers/typeUtils'
import { deepMergeData } from './compat/data' import { deepMergeData } from './compat/data'
import { DeprecationTypes, warnDeprecation } from './compat/deprecations'
/** /**
* Interface for declaring custom options. * Interface for declaring custom options.
@ -796,19 +797,24 @@ export function applyOptions(
if (renderTriggered) { if (renderTriggered) {
onRenderTriggered(renderTriggered.bind(publicThis)) onRenderTriggered(renderTriggered.bind(publicThis))
} }
if (__DEV__ && beforeDestroy) {
warn(`\`beforeDestroy\` has been renamed to \`beforeUnmount\`.`)
}
if (beforeUnmount) { if (beforeUnmount) {
onBeforeUnmount(beforeUnmount.bind(publicThis)) onBeforeUnmount(beforeUnmount.bind(publicThis))
} }
if (__DEV__ && destroyed) {
warn(`\`destroyed\` has been renamed to \`unmounted\`.`)
}
if (unmounted) { if (unmounted) {
onUnmounted(unmounted.bind(publicThis)) onUnmounted(unmounted.bind(publicThis))
} }
if (__COMPAT__) {
if (beforeDestroy) {
__DEV__ && warnDeprecation(DeprecationTypes.OPTIONS_BEFORE_DESTROY)
onBeforeUnmount(beforeDestroy.bind(publicThis))
}
if (destroyed) {
__DEV__ && warnDeprecation(DeprecationTypes.OPTIONS_DESTROYED)
onUnmounted(destroyed.bind(publicThis))
}
}
if (isArray(expose)) { if (isArray(expose)) {
if (!asMixin) { if (!asMixin) {
if (expose.length) { if (expose.length) {