Skip to content
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

Jump to bottom

fix(compiler): maybeComponent should return true when "is" attribute exists #8114

Merged
merged 10 commits into from
Oct 24, 2018
Merged

fix(compiler): maybeComponent should return true when "is" attribute exists #8114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7fb6021
fix: beforeUpdate should be called before render and allow state muta…
yyx990803 Mar 11, 2018
4f8de9b
perf: avoid unnecessary re-renders when computed property value did n…
yyx990803 Mar 11, 2018
7af77da
fix(ssr): fix SSR for async functional components
yyx990803 Mar 11, 2018
9140adf
fix conflicts
javoski Mar 14, 2018
749d36c
Merge remote-tracking branch 'upstream/dev' into dev
javoski Mar 24, 2018
d4823ef
Merge remote-tracking branch 'upstream/dev' into dev
javoski Apr 4, 2018
067c76f
Merge remote-tracking branch 'upstream/dev' into dev
javoski Apr 16, 2018
c351505
Merge remote-tracking branch 'upstream/dev' into dev
javoski May 1, 2018
31fd08f
fix(compiler): maybeComponent should aware of "is" attribute
javoski May 1, 2018
5402f27
add test case
javoski May 1, 2018
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
2 changes: 1 addition & 1 deletion src/compiler/codegen/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class CodegenState {
this.dataGenFns = pluckModuleFunction(options.modules, 'genData')
this.directives = extend(extend({}, baseDirectives), options.directives)
const isReservedTag = options.isReservedTag || no
this.maybeComponent = (el: ASTElement) => !isReservedTag(el.tag)
this.maybeComponent = (el: ASTElement) => !(isReservedTag(el.tag) && !el.component)
this.onceId = 0
this.staticRenderFns = []
}
Expand Down
5 changes: 5 additions & 0 deletions test/unit/modules/compiler/codegen.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,11 @@ describe('codegen', () => {
'<div :is="component1"></div>',
`with(this){return _c(component1,{tag:"div"})}`
)
// maybe a component and normalize type should be 1
assertCodegen(
'<div><div is="component1"></div></div>',
`with(this){return _c('div',[_c("component1",{tag:"div"})],1)}`
)
})

it('generate component with inline-template', () => {
Expand Down