Skip to content

fix(runtime-core): support extends template for runtime compiler #6250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 31, 2022
Merged

fix(runtime-core): support extends template for runtime compiler #6250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7103bde
fix(runtime-core): support extends template for runtime compiler
edison1105 Jul 11, 2022
78a36f6
fix types
edison1105 Jul 11, 2022
c2d4221
test: add test case
edison1105 Jul 12, 2022
dbc6feb
use resolve merged
yyx990803 Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/runtime-core/__tests__/apiOptions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
createApp,
computed
} from '@vue/runtime-test'
import { render as domRender } from 'vue'

describe('api: options', () => {
test('data', async () => {
Expand Down Expand Up @@ -1035,6 +1036,19 @@ describe('api: options', () => {
expect(renderToString(h(Comp))).toBe('base,base')
})

test('extends template', () => {
const Comp = {
extends: {
template: `<h1>Foo</h1>`
}
}

const root = document.createElement('div') as any
domRender(h(Comp), root)
expect(root.innerHTML).toBe(`<h1>Foo</h1>`)
})


test('options defined in component have higher priority', async () => {
const Mixin = {
msg1: 'base'
Expand Down
6 changes: 4 additions & 2 deletions packages/runtime-core/src/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ import {
applyOptions,
ComponentOptions,
ComputedOptions,
MethodOptions
MethodOptions,
resolveMergedOptions
} from './componentOptions'
import {
EmitsOptions,
Expand Down Expand Up @@ -788,7 +789,8 @@ export function finishComponentSetup(
(__COMPAT__ &&
instance.vnode.props &&
instance.vnode.props['inline-template']) ||
Component.template
Component.template ||
resolveMergedOptions(instance).template
if (template) {
if (__DEV__) {
startMeasure(instance, `compile`)
Expand Down