Commit2b5c83a

committed

fix: handle errors in errorHandler

1 parentae347a5 commit2b5c83aCopy full SHA for 2b5c83a

File tree

+37

-11

lines changed

+37

-11

lines changed

Lines changed: 18 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,24 @@ import { inBrowser } from './env'`
`6`	`6`
`7`	`7`	`exportfunctionhandleError(err:Error,vm:any,info:string){`
`8`	`8`	`if(config.errorHandler){`
`9`		`-config.errorHandler.call(null,err,vm,info)`
`10`		`-}else{`
`11`		`-if(process.env.NODE_ENV!=='production'){`
`12`		-warn(`Error in${info}: "${err.toString()}"`,vm)
`13`		`-}`
`14`		`-/* istanbul ignore else */`
`15`		`-if(inBrowser&&typeofconsole!=='undefined'){`
`16`		`-console.error(err)`
`17`		`-}else{`
`18`		`-throwerr`
	`9`	`+try{`
	`10`	`+config.errorHandler.call(null,err,vm,info)`
	`11`	`+return`
	`12`	`+}catch(e){`
	`13`	`+logError(e,null,'errorHandler')`
`19`	`14`	`}`
`20`	`15`	`}`
	`16`	`+logError(err,vm,info)`
	`17`	`+}`
	`18`	`+`
	`19`	`+functionlogError(err,vm,info){`
	`20`	`+if(process.env.NODE_ENV!=='production'){`
	`21`	+warn(`Error in${info}: "${err.toString()}"`,vm)
	`22`	`+}`
	`23`	`+/* istanbul ignore else */`
	`24`	`+if(inBrowser&&typeofconsole!=='undefined'){`
	`25`	`+console.error(err)`
	`26`	`+}else{`
	`27`	`+throwerr`
	`28`	`+}`
`21`	`29`	`}`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ describe('Error handling', () => {`
`92`	`92`	`}).then(done)`
`93`	`93`	`})`
`94`	`94`
`95`		`-it('config.errorHandler should capture errors',done=>{`
	`95`	`+it('config.errorHandler should capturerendererrors',done=>{`
`96`	`96`	`constspy=Vue.config.errorHandler=jasmine.createSpy('errorHandler')`
`97`	`97`	`constvm=createTestInstance(components.render)`
`98`	`98`
`@@ -124,6 +124,24 @@ describe('Error handling', () => {`
`124`	`124`	`})`
`125`	`125`	`})`
`126`	`126`	`})`
	`127`	`+`
	`128`	`+it('should recover from errors thrown in errorHandler itself',()=>{`
	`129`	`+Vue.config.errorHandler=()=>{`
	`130`	`+thrownewError('error in errorHandler ¯\\_(ツ)_/¯')`
	`131`	`+}`
	`132`	`+constvm=newVue({`
	`133`	`+render(h){`
	`134`	`+thrownewError('error in render')`
	`135`	`+},`
	`136`	`+renderError(h,err){`
	`137`	`+returnh('div',err.toString())`
	`138`	`+}`
	`139`	`+}).$mount()`
	`140`	`+expect('error in errorHandler').toHaveBeenWarned()`
	`141`	`+expect('error in render').toHaveBeenWarned()`
	`142`	`+expect(vm.$el.textContent).toContain('error in render')`
	`143`	`+Vue.config.errorHandler=null`
	`144`	`+})`
`127`	`145`	`})`
`128`	`146`
`129`	`147`	`functioncreateErrorTestComponents(){`

Comments

(0)