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

wip: fix root data option compat

Browse Source
This commit is contained in:
Evan You 2021-04-06 15:02:07 -04:00
parent 3d810eb422
commit 926e12862b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/runtime-core/src/compat/global.ts
View File

@ -93,6 +93,12 @@ export function createCompatVue(
const singletonApp = createApp({}) const singletonApp = createApp({})
function createCompatApp(options: ComponentOptions = {}, Ctor: any) { function createCompatApp(options: ComponentOptions = {}, Ctor: any) {
const { data } = options
if (data && !isFunction(data)) {
__DEV__ && warnDeprecation(DeprecationTypes.OPTIONS_DATA_FN)
options.data = () => data
}
const app = createApp(options) const app = createApp(options)
// copy over asset registries and deopt flag // copy over asset registries and deopt flag
@ -142,14 +148,9 @@ export function createCompatVue(
if (!inlineOptions) { if (!inlineOptions) {
return createCompatApp(options, SubVue) return createCompatApp(options, SubVue)
} else { } else {
const { el, data } = inlineOptions
if (data && !isFunction(data)) {
__DEV__ && warnDeprecation(DeprecationTypes.OPTIONS_DATA_FN)
inlineOptions.data = () => data
}
return createCompatApp( return createCompatApp(
{ {
el, el: inlineOptions.el,
extends: options, extends: options,
mixins: [inlineOptions] mixins: [inlineOptions]
}, },