Commit33e669b

authored and

committed

fix(ssr): computed properties should pass vm as first argument in ssr (vuejs#9090)

1 parentf43ae6d commit33e669bCopy full SHA for 33e669b

File tree

+26

-2

lines changed

+26

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -216,13 +216,13 @@ export function defineComputed (`
`216`	`216`	`if(typeofuserDef==='function'){`
`217`	`217`	`sharedPropertyDefinition.get=shouldCache`
`218`	`218`	`?createComputedGetter(key)`
`219`		`- :userDef`
	`219`	`+ :createGetterInvoker(userDef)`
`220`	`220`	`sharedPropertyDefinition.set=noop`
`221`	`221`	`}else{`
`222`	`222`	`sharedPropertyDefinition.get=userDef.get`
`223`	`223`	`?shouldCache&&userDef.cache!==false`
`224`	`224`	`?createComputedGetter(key)`
`225`		`- :userDef.get`
	`225`	`+ :createGetterInvoker(userDef.get)`
`226`	`226`	`:noop`
`227`	`227`	`sharedPropertyDefinition.set=userDef.set\|\|noop`
`228`	`228`	`}`
`@@ -253,6 +253,12 @@ function createComputedGetter (key) {`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
	`256`	`+functioncreateGetterInvoker(fn){`
	`257`	`+returnfunctioncomputedGetter(){`
	`258`	`+returnfn.call(this,this)`
	`259`	`+}`
	`260`	`+}`
	`261`	`+`
`256`	`262`	`functioninitMethods(vm:Component,methods:Object){`
`257`	`263`	`constprops=vm.$options.props`
`258`	`264`	`for(constkeyinmethods){`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1076,6 +1076,24 @@ describe('SSR: renderToString', () => {`
`1076`	`1076`	`})`
`1077`	`1077`	`})`
`1078`	`1078`
	`1079`	`+// #8977`
	`1080`	`+it('should call computed properties with vm as first argument',done=>{`
	`1081`	`+renderToString(newVue({`
	`1082`	`+data:{`
	`1083`	`+firstName:'Evan',`
	`1084`	`+lastName:'You'`
	`1085`	`+},`
	`1086`	`+computed:{`
	`1087`	+fullName:({ firstName, lastName})=>`${firstName}${lastName}`,
	`1088`	`+},`
	`1089`	`+template:'<div>{{ fullName }}</div>',`
	`1090`	`+}),(err,result)=>{`
	`1091`	`+expect(err).toBeNull()`
	`1092`	`+expect(result).toContain('<div data-server-rendered="true">Evan You</div>')`
	`1093`	`+done()`
	`1094`	`+})`
	`1095`	`+})`
	`1096`	`+`
`1079`	`1097`	`it('return Promise',done=>{`
`1080`	`1098`	`renderToString(newVue({`
`1081`	`1099`	template:`<div>{{ foo }}</div>`,

Comments

(0)