Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-23 22:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

refator: only throw jsdomerror in window initialization

Browse Source
This commit is contained in:
Clark Du 2018-03-06 16:14:34 +08:00
parent d6f22c904d
commit d9d747c9a8
No known key found for this signature in database
GPG Key ID: D0E5986AF78B86D9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/core/renderer.js
View File

@ -421,12 +421,18 @@ module.exports = class Renderer {
window.scrollTo = () => {} window.scrollTo = () => {}
} }
} }
const jsdomErrHandler = err => { throw err }
if (opts.virtualConsole !== false) { if (opts.virtualConsole !== false) {
options.virtualConsole = new jsdom.VirtualConsole().sendTo(console, { omitJSDOMErrors: true }) options.virtualConsole = new jsdom.VirtualConsole().sendTo(console, { omitJSDOMErrors: false })
options.virtualConsole.on('jsdomError', err => { throw err }) // throw error when window creation failed
options.virtualConsole.on('jsdomError', jsdomErrHandler)
} }
url = url || 'http://localhost:3000' url = url || 'http://localhost:3000'
const { window } = await jsdom.JSDOM.fromURL(url, options) const { window } = await jsdom.JSDOM.fromURL(url, options)
if (opts.virtualConsole !== false) {
// after window initialized successfully
options.virtualConsole.removeListener('jsdomError', jsdomErrHandler)
}
// If Nuxt could not be loaded (error from the server-side) // If Nuxt could not be loaded (error from the server-side)
const nuxtExists = window.document.body.innerHTML.includes( const nuxtExists = window.document.body.innerHTML.includes(
this.options.render.ssr ? 'window.__NUXT__' : '<div id="__nuxt">' this.options.render.ssr ? 'window.__NUXT__' : '<div id="__nuxt">'