Commita71853b

authored and

committed

fix(v-pre): skip compiling custom component tags in v-pre blocks (fixvuejs#8286) (vuejs#8376)

1 parent504d5da commita71853bCopy full SHA for a71853b

File tree

+22

-4

lines changed

+22

-4

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ export function generate (`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`exportfunctiongenElement(el:ASTElement,state:CodegenState):string{`
	`55`	`+if(el.parent){`
	`56`	`+el.pre=el.pre\|\|el.parent.pre`
	`57`	`+}`
	`58`	`+`
`55`	`59`	`if(el.staticRoot&&!el.staticProcessed){`
`56`	`60`	`returngenStatic(el,state)`
`57`	`61`	`}elseif(el.once&&!el.onceProcessed){`
`@@ -70,7 +74,10 @@ export function genElement (el: ASTElement, state: CodegenState): string {`
`70`	`74`	`if(el.component){`
`71`	`75`	`code=genComponent(el.component,el,state)`
`72`	`76`	`}else{`
`73`		`-constdata=el.plain ?undefined :genData(el,state)`
	`77`	`+letdata`
	`78`	`+if(!el.plain\|\|el.pre){`
	`79`	`+data=genData(el,state)`
	`80`	`+}`
`74`	`81`
`75`	`82`	`constchildren=el.inlineTemplate ?null :genChildren(el,state,true)`
`76`	`83`	code=`_c('${el.tag}'${

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ export function _createElement (`
`102`	`102`	`config.parsePlatformTagName(tag),data,children,`
`103`	`103`	`undefined,undefined,context`
`104`	`104`	`)`
`105`		`-}elseif(isDef(Ctor=resolveAsset(context.$options,'components',tag))){`
	`105`	`+}elseif((!data\|\|!data.pre)&&isDef(Ctor=resolveAsset(context.$options,'components',tag))){`
`106`	`106`	`// component`
`107`	`107`	`vnode=createComponent(Ctor,data,context,children,tag)`
`108`	`108`	`}else{`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ describe('Directive v-pre', function () {`
`7`	`7`	`<div v-pre>{{ a }}</div>`
`8`	`8`	`<div>{{ a }}</div>`
`9`	`9`	`<div v-pre>`
`10`		`- <component></component>`
	`10`	`+ <component is="div"></component>`
`11`	`11`	`</div>`
`12`	`12`	</div>`,
`13`	`13`	`data:{`
`@@ -17,7 +17,7 @@ describe('Directive v-pre', function () {`
`17`	`17`	`vm.$mount()`
`18`	`18`	`expect(vm.$el.firstChild.textContent).toBe('{{ a }}')`
`19`	`19`	`expect(vm.$el.children[1].textContent).toBe('123')`
`20`		`-expect(vm.$el.lastChild.innerHTML).toBe('<component></component>')`
	`20`	`+expect(vm.$el.lastChild.innerHTML).toBe('<component is="div"></component>')`
`21`	`21`	`})`
`22`	`22`
`23`	`23`	`it('should not compile on root node',function(){`
`@@ -31,4 +31,15 @@ describe('Directive v-pre', function () {`
`31`	`31`	`vm.$mount()`
`32`	`32`	`expect(vm.$el.firstChild.textContent).toBe('{{ a }}')`
`33`	`33`	`})`
	`34`	`+`
	`35`	`+// #8286`
	`36`	`+it('should not compile custom component tags',function(){`
	`37`	+Vue.component('vtest',{template:` <div>Hello World</div>`})
	`38`	`+constvm=newVue({`
	`39`	`+template:'<div v-pre><vtest></vtest></div>',`
	`40`	`+replace:true`
	`41`	`+})`
	`42`	`+vm.$mount()`
	`43`	`+expect(vm.$el.firstChild.tagName).toBe('VTEST')`
	`44`	`+})`
`34`	`45`	`})`

Comments

(0)