Unverified Commit 1d900730 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix accessing router before ready for HMR ping (#31588)

* Fix accessing router before ready for HMR ping

* update test name

* lint-fix
parent 9f7c7746
...@@ -94,4 +94,5 @@ connectHMR({ ...@@ -94,4 +94,5 @@ connectHMR({
path: '/_next/webpack-hmr', path: '/_next/webpack-hmr',
}) })
displayContent() displayContent()
initOnDemandEntries()
initOnDemandEntries(data.page)
import Router from 'next/router' import Router from 'next/router'
import { addMessageListener, sendMessage } from './error-overlay/websocket' import { addMessageListener, sendMessage } from './error-overlay/websocket'
export default async () => { export default async (page) => {
setInterval(() => { if (page) {
sendMessage(JSON.stringify({ event: 'ping', page: Router.pathname })) // in AMP the router isn't initialized on the client and
}, 2500) // client-transitions don't occur so ping initial page
setInterval(() => {
sendMessage(JSON.stringify({ event: 'ping', page }))
}, 2500)
} else {
Router.ready(() => {
setInterval(() => {
sendMessage(JSON.stringify({ event: 'ping', page: Router.pathname }))
}, 2500)
})
}
addMessageListener((event) => { addMessageListener((event) => {
if (event.data.indexOf('{') === -1) return if (event.data.indexOf('{') === -1) return
......
{
"extends": ["next"],
"rules": {
"import/no-anonymous-default-export": "off",
"react/display-name": "off",
"@next/next/no-img-element": "off",
"jsx-a11y/alt-text": "off",
"@next/next/no-css-tags": "off",
"@next/next/no-page-custom-font": "off",
"@next/next/no-sync-scripts": "off",
"react/no-unescaped-entities": "off",
"@next/next/no-html-link-for-pages": "off",
"react/no-unknown-property": "off",
"@next/next/google-font-display": "off"
}
}
...@@ -28,6 +28,35 @@ const appDir = join(__dirname, '../') ...@@ -28,6 +28,35 @@ const appDir = join(__dirname, '../')
const buildIdPath = join(appDir, '.next/BUILD_ID') const buildIdPath = join(appDir, '.next/BUILD_ID')
function runTests(dev) { function runTests(dev) {
if (dev) {
it('should not have error after pinging WebSocket', async () => {
const browser = await webdriver(appPort, '/')
await browser.eval(`(function() {
window.uncaughtErrs = []
window.addEventListener('uncaughtexception', function (err) {
window.uncaught.push(err)
})
})()`)
const curFrames = [...(await browser.websocketFrames())]
await check(async () => {
const frames = await browser.websocketFrames()
const newFrames = frames.slice(curFrames.length)
// console.error({newFrames, curFrames, frames});
return newFrames.some((frame) => {
try {
const data = JSON.parse(frame.payload)
return data.event === 'pong'
} catch (_) {}
return false
})
? 'success'
: JSON.stringify(newFrames)
}, 'success')
expect(await browser.eval('window.uncaughtErrs.length')).toBe(0)
})
}
it('should support long URLs for dynamic routes', async () => { it('should support long URLs for dynamic routes', async () => {
const res = await fetchViaHTTP( const res = await fetchViaHTTP(
appPort, appPort,
......
...@@ -78,6 +78,9 @@ export class BrowserInterface { ...@@ -78,6 +78,9 @@ export class BrowserInterface {
async log(): Promise<any[]> { async log(): Promise<any[]> {
return [] return []
} }
async websocketFrames(): Promise<any[]> {
return []
}
async url(): Promise<string> { async url(): Promise<string> {
return '' return ''
} }
......
...@@ -15,6 +15,7 @@ let page: Page ...@@ -15,6 +15,7 @@ let page: Page
let browser: Browser let browser: Browser
let context: BrowserContext let context: BrowserContext
let pageLogs: Array<{ source: string; message: string }> = [] let pageLogs: Array<{ source: string; message: string }> = []
let websocketFrames: Array<{ payload: string | Buffer }> = []
const tracePlaywright = process.env.TRACE_PLAYWRIGHT const tracePlaywright = process.env.TRACE_PLAYWRIGHT
...@@ -71,6 +72,7 @@ class Playwright extends BrowserInterface { ...@@ -71,6 +72,7 @@ class Playwright extends BrowserInterface {
} }
page = await context.newPage() page = await context.newPage()
pageLogs = [] pageLogs = []
websocketFrames = []
page.on('console', (msg) => { page.on('console', (msg) => {
console.log('browser log:', msg) console.log('browser log:', msg)
...@@ -83,25 +85,30 @@ class Playwright extends BrowserInterface { ...@@ -83,25 +85,30 @@ class Playwright extends BrowserInterface {
console.error('page error', error) console.error('page error', error)
}) })
if (tracePlaywright) { page.on('websocket', (ws) => {
page.on('websocket', (ws) => { if (tracePlaywright) {
page page
.evaluate(`console.log('connected to ws at ${ws.url()}')`) .evaluate(`console.log('connected to ws at ${ws.url()}')`)
.catch(() => {}) .catch(() => {})
ws.on('close', () => ws.on('close', () =>
page page
.evaluate(`console.log('closed websocket ${ws.url()}')`) .evaluate(`console.log('closed websocket ${ws.url()}')`)
.catch(() => {}) .catch(() => {})
) )
ws.on('framereceived', (frame) => { }
ws.on('framereceived', (frame) => {
websocketFrames.push({ payload: frame.payload })
if (tracePlaywright) {
if (!frame.payload.includes('pong')) { if (!frame.payload.includes('pong')) {
page page
.evaluate(`console.log('received ws message ${frame.payload}')`) .evaluate(`console.log('received ws message ${frame.payload}')`)
.catch(() => {}) .catch(() => {})
} }
}) }
}) })
} })
if (tracePlaywright) { if (tracePlaywright) {
await context.tracing.start({ await context.tracing.start({
...@@ -310,6 +317,10 @@ class Playwright extends BrowserInterface { ...@@ -310,6 +317,10 @@ class Playwright extends BrowserInterface {
return this.chain(() => pageLogs) as any return this.chain(() => pageLogs) as any
} }
async websocketFrames() {
return this.chain(() => websocketFrames) as any
}
async url() { async url() {
return this.chain(() => page.evaluate('window.location.href')) as any return this.chain(() => page.evaluate('window.location.href')) as any
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment