Unverified Commit 89f36a98 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Hot reload when conflicted pages detected and when conflicts are resolved (#51516)

When conflicted pages occur between app and pages server used to throw error and you need to solve the conflicts and restart the server.

This PR capture the error during files aggregation, and send to client to display the error for files confliction. This will send all the conflicts to client and it will still error until you solve all of them. But since the server is not stuck by errors, client can recover once the error is solved.

Closes NEXT-1283
parent db4b9858
...@@ -209,7 +209,39 @@ function processMessage( ...@@ -209,7 +209,39 @@ function processMessage(
router: ReturnType<typeof useRouter>, router: ReturnType<typeof useRouter>,
dispatcher: Dispatcher dispatcher: Dispatcher
) { ) {
const obj = JSON.parse(e.data) let obj
try {
obj = JSON.parse(e.data)
} catch {}
if (!obj || !('action' in obj)) {
return
}
function handleErrors(errors: any[]) {
// "Massage" webpack messages.
const formatted = formatWebpackMessages({
errors: errors,
warnings: [],
})
// Only show the first error.
dispatcher.onBuildError(formatted.errors[0])
// Also log them to the console.
for (let i = 0; i < formatted.errors.length; i++) {
console.error(stripAnsi(formatted.errors[i]))
}
// Do not attempt to reload now.
// We will reload on next success instead.
if (process.env.__NEXT_TEST_MODE) {
if (self.__NEXT_HMR_CB) {
self.__NEXT_HMR_CB(formatted.errors[0])
self.__NEXT_HMR_CB = null
}
}
}
switch (obj.action) { switch (obj.action) {
case 'building': { case 'building': {
...@@ -239,28 +271,7 @@ function processMessage( ...@@ -239,28 +271,7 @@ function processMessage(
}) })
) )
// "Massage" webpack messages. handleErrors(errors)
let formatted = formatWebpackMessages({
errors: errors,
warnings: [],
})
// Only show the first error.
dispatcher.onBuildError(formatted.errors[0])
// Also log them to the console.
for (let i = 0; i < formatted.errors.length; i++) {
console.error(stripAnsi(formatted.errors[i]))
}
// Do not attempt to reload now.
// We will reload on next success instead.
if (process.env.__NEXT_TEST_MODE) {
if (self.__NEXT_HMR_CB) {
self.__NEXT_HMR_CB(formatted.errors[0])
self.__NEXT_HMR_CB = null
}
}
return return
} }
...@@ -388,6 +399,16 @@ function processMessage( ...@@ -388,6 +399,16 @@ function processMessage(
router.fastRefresh() router.fastRefresh()
return return
} }
case 'serverError': {
const { errorJSON } = obj
if (errorJSON) {
const { message, stack } = JSON.parse(errorJSON)
const error = new Error(message)
error.stack = stack
handleErrors([error])
}
return
}
case 'pong': { case 'pong': {
const { invalid } = obj const { invalid } = obj
if (invalid) { if (invalid) {
...@@ -468,18 +489,12 @@ export default function HotReload({ ...@@ -468,18 +489,12 @@ export default function HotReload({
const router = useRouter() const router = useRouter()
useEffect(() => { useEffect(() => {
const handler = (event: MessageEvent<PongEvent>) => { const handler = (event: MessageEvent<PongEvent>) => {
if (
!event.data.includes('action') &&
// TODO-APP: clean this up for consistency
!event.data.includes('pong')
) {
return
}
try { try {
processMessage(event, sendMessage, router, dispatcher) processMessage(event, sendMessage, router, dispatcher)
} catch (ex) { } catch (err: any) {
console.warn('Invalid HMR message: ' + event.data + '\n', ex) console.warn(
'[HMR] Invalid message: ' + event.data + '\n' + (err?.stack ?? '')
)
} }
} }
......
...@@ -85,6 +85,8 @@ addMessageListener((event) => { ...@@ -85,6 +85,8 @@ addMessageListener((event) => {
try { try {
const message = JSON.parse(event.data) const message = JSON.parse(event.data)
// action `serverError` is not for amp-dev
if (message.action === 'serverError') return
if (message.action === 'sync' || message.action === 'built') { if (message.action === 'sync' || message.action === 'built') {
if (!message.hash) { if (!message.hash) {
return return
...@@ -94,8 +96,10 @@ addMessageListener((event) => { ...@@ -94,8 +96,10 @@ addMessageListener((event) => {
} else if (message.action === 'reloadPage') { } else if (message.action === 'reloadPage') {
window.location.reload() window.location.reload()
} }
} catch (ex) { } catch (err: any) {
console.warn('Invalid HMR message: ' + event.data + '\n' + ex) console.warn(
'[HMR] Invalid message: ' + event.data + '\n' + (err?.stack ?? '')
)
} }
}) })
......
...@@ -64,12 +64,15 @@ export default function connect() { ...@@ -64,12 +64,15 @@ export default function connect() {
register() register()
addMessageListener((event) => { addMessageListener((event) => {
if (!event.data.includes('action')) return
try { try {
processMessage(event) const payload = JSON.parse(event.data)
} catch (ex) { if (!('action' in payload)) return
console.warn('Invalid HMR message: ' + event.data + '\n', ex)
processMessage(payload)
} catch (err: any) {
console.warn(
'[HMR] Invalid message: ' + event.data + '\n' + (err?.stack ?? '')
)
} }
}) })
...@@ -226,8 +229,7 @@ function handleAvailableHash(hash: string) { ...@@ -226,8 +229,7 @@ function handleAvailableHash(hash: string) {
} }
// Handle messages from the server. // Handle messages from the server.
function processMessage(e: any) { function processMessage(obj: any) {
const obj = JSON.parse(e.data)
switch (obj.action) { switch (obj.action) {
case 'building': { case 'building': {
startLatency = Date.now() startLatency = Date.now()
...@@ -279,6 +281,16 @@ function processMessage(e: any) { ...@@ -279,6 +281,16 @@ function processMessage(e: any) {
window.location.reload() window.location.reload()
return return
} }
case 'serverError': {
const { errorJSON } = obj
if (errorJSON) {
const { message, stack } = JSON.parse(errorJSON)
const error = new Error(message)
error.stack = stack
handleErrors([error])
}
return
}
default: { default: {
if (customHmrEventHandler) { if (customHmrEventHandler) {
customHmrEventHandler(obj) customHmrEventHandler(obj)
......
...@@ -26,7 +26,6 @@ export function connectHMR(options: { ...@@ -26,7 +26,6 @@ export function connectHMR(options: {
path: string path: string
assetPrefix: string assetPrefix: string
timeout?: number timeout?: number
log?: boolean
}) { }) {
if (!options.timeout) { if (!options.timeout) {
options.timeout = 5 * 1000 options.timeout = 5 * 1000
...@@ -36,7 +35,7 @@ export function connectHMR(options: { ...@@ -36,7 +35,7 @@ export function connectHMR(options: {
if (source) source.close() if (source) source.close()
function handleOnline() { function handleOnline() {
if (options.log) console.log('[HMR] connected') window.console.log('[HMR] connected')
lastActivity = Date.now() lastActivity = Date.now()
} }
......
...@@ -45,6 +45,9 @@ export default () => { ...@@ -45,6 +45,9 @@ export default () => {
} }
return return
} }
if (obj.action === 'serverError') {
return
}
throw new Error('Unexpected action ' + obj.action) throw new Error('Unexpected action ' + obj.action)
}) })
......
...@@ -54,8 +54,19 @@ initialize({ webpackHMR }) ...@@ -54,8 +54,19 @@ initialize({ webpackHMR })
let buildIndicatorHandler: any = () => {} let buildIndicatorHandler: any = () => {}
function devPagesManifestListener(event: any) { function devPagesHmrListener(event: any) {
if (event.data.includes('devPagesManifest')) { let payload
try {
payload = JSON.parse(event.data)
} catch {}
if (payload.event === 'server-error' && payload.errorJSON) {
const { stack, message } = JSON.parse(payload.errorJSON)
const error = new Error(message)
error.stack = stack
throw error
} else if (payload.action === 'reloadPage') {
window.location.reload()
} else if (payload.action === 'devPagesManifestUpdate') {
fetch( fetch(
`${assetPrefix}/_next/static/development/_devPagesManifest.json` `${assetPrefix}/_next/static/development/_devPagesManifest.json`
) )
...@@ -66,10 +77,10 @@ initialize({ webpackHMR }) ...@@ -66,10 +77,10 @@ initialize({ webpackHMR })
.catch((err) => { .catch((err) => {
console.log(`Failed to fetch devPagesManifest`, err) console.log(`Failed to fetch devPagesManifest`, err)
}) })
} else if (event.data.includes('middlewareChanges')) { } else if (payload.event === 'middlewareChanges') {
return window.location.reload() return window.location.reload()
} else if (event.data.includes('serverOnlyChanges')) { } else if (payload.event === 'serverOnlyChanges') {
const { pages } = JSON.parse(event.data) const { pages } = payload
// Make sure to reload when the dev-overlay is showing for an // Make sure to reload when the dev-overlay is showing for an
// API route // API route
...@@ -106,7 +117,7 @@ initialize({ webpackHMR }) ...@@ -106,7 +117,7 @@ initialize({ webpackHMR })
} }
} }
} }
addMessageListener(devPagesManifestListener) addMessageListener(devPagesHmrListener)
if (process.env.__NEXT_BUILD_INDICATOR) { if (process.env.__NEXT_BUILD_INDICATOR) {
initializeBuildWatcher((handler: any) => { initializeBuildWatcher((handler: any) => {
......
...@@ -185,6 +185,7 @@ export default class HotReloader { ...@@ -185,6 +185,7 @@ export default class HotReloader {
public edgeServerStats: webpack.Stats | null public edgeServerStats: webpack.Stats | null
private clientError: Error | null = null private clientError: Error | null = null
private serverError: Error | null = null private serverError: Error | null = null
private hmrServerError: Error | null = null
private serverPrevDocumentHash: string | null private serverPrevDocumentHash: string | null
private serverChunkNames?: Set<string> private serverChunkNames?: Set<string>
private prevChunkNames?: Set<any> private prevChunkNames?: Set<any>
...@@ -327,10 +328,21 @@ export default class HotReloader { ...@@ -327,10 +328,21 @@ export default class HotReloader {
return { finished } return { finished }
} }
public setHmrServerError(error: Error | null): void {
this.hmrServerError = error
}
public clearHmrServerError(): void {
if (this.hmrServerError) {
this.setHmrServerError(null)
this.send('reloadPage')
}
}
public onHMR(req: IncomingMessage, _socket: Duplex, head: Buffer) { public onHMR(req: IncomingMessage, _socket: Duplex, head: Buffer) {
wsServer.handleUpgrade(req, req.socket, head, (client) => { wsServer.handleUpgrade(req, req.socket, head, (client) => {
this.webpackHotMiddleware?.onHMR(client) this.webpackHotMiddleware?.onHMR(client)
this.onDemandEntries?.onHMR(client) this.onDemandEntries?.onHMR(client, () => this.hmrServerError)
client.addEventListener('message', ({ data }) => { client.addEventListener('message', ({ data }) => {
data = typeof data !== 'string' ? data.toString() : data data = typeof data !== 'string' ? data.toString() : data
......
...@@ -427,6 +427,7 @@ export default class DevServer extends Server { ...@@ -427,6 +427,7 @@ export default class DevServer extends Server {
const fileWatchTimes = new Map() const fileWatchTimes = new Map()
let enabledTypeScript = this.usingTypeScript let enabledTypeScript = this.usingTypeScript
let previousClientRouterFilters: any let previousClientRouterFilters: any
let previousConflictingPagePaths: Set<string> = new Set()
wp.on('aggregated', async () => { wp.on('aggregated', async () => {
let middlewareMatchers: MiddlewareMatcher[] | undefined let middlewareMatchers: MiddlewareMatcher[] | undefined
...@@ -440,6 +441,7 @@ export default class DevServer extends Server { ...@@ -440,6 +441,7 @@ export default class DevServer extends Server {
let envChange = false let envChange = false
let tsconfigChange = false let tsconfigChange = false
let conflictingPageChange = 0
devPageFiles.clear() devPageFiles.clear()
...@@ -598,20 +600,30 @@ export default class DevServer extends Server { ...@@ -598,20 +600,30 @@ export default class DevServer extends Server {
} }
const numConflicting = conflictingAppPagePaths.size const numConflicting = conflictingAppPagePaths.size
conflictingPageChange =
numConflicting - previousConflictingPagePaths.size
if (conflictingPageChange !== 0) {
if (numConflicting > 0) { if (numConflicting > 0) {
Log.error( let errorMessage = `Conflicting app and page file${
`Conflicting app and page file${
numConflicting === 1 ? ' was' : 's were' numConflicting === 1 ? ' was' : 's were'
} found, please remove the conflicting files to continue:` } found, please remove the conflicting files to continue:\n`
)
for (const p of conflictingAppPagePaths) { for (const p of conflictingAppPagePaths) {
const appPath = relative(this.dir, appPageFilePaths.get(p)!) const appPath = relative(this.dir, appPageFilePaths.get(p)!)
const pagesPath = relative(this.dir, pagesPageFilePaths.get(p)!) const pagesPath = relative(this.dir, pagesPageFilePaths.get(p)!)
Log.error(` "${pagesPath}" - "${appPath}"`) errorMessage += ` "${pagesPath}" - "${appPath}"\n`
}
this.hotReloader?.setHmrServerError(new Error(errorMessage))
} else if (numConflicting === 0) {
await this.matchers.reload()
this.hotReloader?.clearHmrServerError()
} }
} }
let clientRouterFilters: any
previousConflictingPagePaths = conflictingAppPagePaths
let clientRouterFilters: any
if (this.nextConfig.experimental.clientRouterFilter) { if (this.nextConfig.experimental.clientRouterFilter) {
clientRouterFilters = createClientRouterFilter( clientRouterFilters = createClientRouterFilter(
Object.keys(appPaths), Object.keys(appPaths),
...@@ -802,7 +814,9 @@ export default class DevServer extends Server { ...@@ -802,7 +814,9 @@ export default class DevServer extends Server {
!this.sortedRoutes?.every((val, idx) => val === sortedRoutes[idx]) !this.sortedRoutes?.every((val, idx) => val === sortedRoutes[idx])
) { ) {
// emit the change so clients fetch the update // emit the change so clients fetch the update
this.hotReloader?.send(undefined, { devPagesManifest: true }) this.hotReloader?.send('devPagesManifestUpdate', {
devPagesManifest: true,
})
} }
this.sortedRoutes = sortedRoutes this.sortedRoutes = sortedRoutes
...@@ -997,9 +1011,7 @@ export default class DevServer extends Server { ...@@ -997,9 +1011,7 @@ export default class DevServer extends Server {
) )
} }
if (appFile && pagesFile) { if (appFile && pagesFile) {
throw new Error( return false
`Conflicting app and page file found: "app${appFile}" and "pages${pagesFile}". Please remove one to continue.`
)
} }
return Boolean(appFile || pagesFile) return Boolean(appFile || pagesFile)
......
...@@ -26,7 +26,7 @@ import { ...@@ -26,7 +26,7 @@ import {
isMiddlewareFile, isMiddlewareFile,
isMiddlewareFilename, isMiddlewareFilename,
} from '../../build/utils' } from '../../build/utils'
import { PageNotFoundError } from '../../shared/lib/utils' import { PageNotFoundError, stringifyError } from '../../shared/lib/utils'
import { import {
CompilerNameValues, CompilerNameValues,
COMPILER_INDEXES, COMPILER_INDEXES,
...@@ -879,9 +879,28 @@ export function onDemandEntryHandler({ ...@@ -879,9 +879,28 @@ export function onDemandEntryHandler({
} }
}, },
onHMR(client: ws) { onHMR(client: ws, getHmrServerError: () => Error | null) {
let bufferedHmrServerError: Error | null = null
client.addEventListener('close', () => {
bufferedHmrServerError = null
})
client.addEventListener('message', ({ data }) => { client.addEventListener('message', ({ data }) => {
try { try {
const error = getHmrServerError()
// New error occurred: buffered error is flushed and new error occurred
if (!bufferedHmrServerError && error) {
client.send(
JSON.stringify({
event: 'server-error', // for pages dir
action: 'serverError', // for app dir
errorJSON: stringifyError(error),
})
)
bufferedHmrServerError = null
}
const parsedData = JSON.parse( const parsedData = JSON.parse(
typeof data !== 'string' ? data.toString() : data typeof data !== 'string' ? data.toString() : data
) )
......
...@@ -64,6 +64,8 @@ export class DefaultRouteMatcherManager implements RouteMatcherManager { ...@@ -64,6 +64,8 @@ export class DefaultRouteMatcherManager implements RouteMatcherManager {
const duplicates: Record<string, RouteMatcher[]> = {} const duplicates: Record<string, RouteMatcher[]> = {}
for (const providerMatchers of providersMatchers) { for (const providerMatchers of providersMatchers) {
for (const matcher of providerMatchers) { for (const matcher of providerMatchers) {
// Reset duplicated matches when reloading from pages conflicting state.
if (matcher.duplicated) delete matcher.duplicated
// Test to see if the matcher being added is a duplicate. // Test to see if the matcher being added is a duplicate.
const duplicate = all.get(matcher.definition.pathname) const duplicate = all.get(matcher.definition.pathname)
if (duplicate) { if (duplicate) {
......
...@@ -55,19 +55,7 @@ export class DevRouteMatcherManager extends DefaultRouteMatcherManager { ...@@ -55,19 +55,7 @@ export class DevRouteMatcherManager extends DefaultRouteMatcherManager {
duplicate.definition.kind === RouteKind.PAGES_API duplicate.definition.kind === RouteKind.PAGES_API
) )
) { ) {
throw new Error( return null
`Conflicting app and page file found: ${matcher.duplicated
// Sort the error output so that the app pages (starting with "app")
// are first.
.sort((a, b) =>
a.definition.filename.localeCompare(b.definition.filename)
)
.map(
(duplicate) =>
`"${path.relative(this.dir, duplicate.definition.filename)}"`
)
.join(' and ')}. Please remove one to continue.`
)
} }
return match return match
......
...@@ -452,3 +452,7 @@ export interface CacheFs { ...@@ -452,3 +452,7 @@ export interface CacheFs {
mkdir(dir: string): Promise<void | string> mkdir(dir: string): Promise<void | string>
stat(f: string): Promise<{ mtime: Date }> stat(f: string): Promise<{ mtime: Date }>
} }
export function stringifyError(error: Error) {
return JSON.stringify({ message: error.message, stack: error.stack })
}
export default function Page(props) { export default function Page(props) {
return <p>hello app</p> return <p>{'another - app'}</p>
} }
export default function Page(props) { export default function Page(props) {
return <p>another app</p> return <p>{`index - app`}</p>
} }
import {
getRedboxHeader,
hasRedbox,
check,
getRedboxSource,
} from 'next-test-utils'
import { createNextDescribe } from 'e2e-utils'
createNextDescribe(
'Conflict between app file and pages file',
{
files: __dirname,
skipDeployment: true,
skipStart: true,
},
({ next, isNextDev, isNextStart }) => {
if (isNextStart) {
it('should print error for conflicting app/page', async () => {
const { cliOutput } = await next.build()
expect(cliOutput).toMatch(
/Conflicting app and page files? (were|was) found/
)
for (const [pagePath, appPath] of [
['pages/index.js', 'app/page.js'],
['pages/another.js', 'app/another/page.js'],
]) {
expect(cliOutput).toContain(`"${pagePath}" - "${appPath}"`)
}
expect(cliOutput).not.toContain('/non-conflict-pages')
expect(cliOutput).not.toContain('/non-conflict')
})
}
async function containConflictsError(browser, conflicts) {
await check(async () => {
expect(await hasRedbox(browser, true)).toBe(true)
const redboxSource = await getRedboxSource(browser)
expect(redboxSource).toMatch(
/Conflicting app and page files? (were|was) found, please remove the conflicting files to continue:/
)
for (const pair of conflicts) {
expect(redboxSource).toContain(`"${pair[0]}" - "${pair[1]}"`)
}
return 'success'
}, /success/)
}
if (isNextDev) {
it('should show error overlay for /another', async () => {
await next.start()
const browser = await next.browser('/another')
expect(await hasRedbox(browser, true)).toBe(true)
await containConflictsError(browser, [
['pages/index.js', 'app/page.js'],
['pages/another.js', 'app/another/page.js'],
])
})
it('should show error overlay for /', async () => {
const browser = await next.browser('/')
expect(await hasRedbox(browser, true)).toBe(true)
await containConflictsError(browser, [
['pages/index.js', 'app/page.js'],
['pages/another.js', 'app/another/page.js'],
])
})
it('should support hmr with conflicts', async () => {
const browser = await next.browser('/')
expect(await hasRedbox(browser, true)).toBe(true)
await next.renameFile('pages/index.js', 'pages/index2.js')
await next.renameFile('pages/another.js', 'pages/another2.js')
// Wait for successful recompilation
await browser.loadPage(next.url + '/')
expect(await hasRedbox(browser, false)).toBe(false)
expect(await browser.elementByCss('p').text()).toContain('index - app')
await browser.loadPage(next.url + '/another')
expect(await browser.elementByCss('p').text()).toBe('another - app')
})
it('should not show error overlay for non conflict pages under app or pages dir', async () => {
const browser = await next.browser('/non-conflict')
expect(await hasRedbox(browser, false)).toBe(false)
expect(await getRedboxHeader(browser)).toBeUndefined()
expect(await browser.elementByCss('p').text()).toBe('non-conflict app')
await browser.loadPage(next.url + '/non-conflict-pages')
expect(await hasRedbox(browser, false)).toBe(false)
expect(await getRedboxHeader(browser)).toBeUndefined()
expect(await browser.elementByCss('h1').text()).toBe(
'non-conflict pages'
)
})
it('should error again when there is new conflict', async () => {
const browser = await next.browser('/')
expect(await hasRedbox(browser, false)).toBe(false)
// Re-trigger the conflicted errors
await next.renameFile('pages/index2.js', 'pages/index.js')
expect(await hasRedbox(browser, true)).toBe(true)
await containConflictsError(browser, [
['pages/index.js', 'app/page.js'],
])
})
}
}
)
export default function Page(props) { export default function Page(props) {
return <p>another page</p> return <p>{'another - pages'}</p>
} }
export default function Page(props) { export default function Page(props) {
return <p>index page</p> return <p>{'index - pages'}</p>
} }
export default function Page() { export default function Page() {
return <h1>Hello World!</h1> return <h1>{`non-conflict pages`}</h1>
} }
export default function Page(props) {
return <p>index page</p>
}
export default function Page(props) {
return <p>hello page</p>
}
/* eslint-env jest */
import path from 'path'
import {
killApp,
findPort,
getRedboxHeader,
hasRedbox,
launchApp,
nextBuild,
waitFor,
check,
} from 'next-test-utils'
import webdriver from 'next-webdriver'
let app
let appPort
const appDir = path.join(__dirname, '..')
let output = ''
function runTests({ dev }) {
it('should print error for conflicting app/page', async () => {
await check(() => output, /Conflicting app and page files were found/)
for (const [pagePath, appPath] of [
['pages/index.js', 'app/page.js'],
['pages/hello.js', 'app/hello/page.js'],
['pages/another.js', 'app/another/page.js'],
]) {
expect(output).toContain(`"${pagePath}" - "${appPath}"`)
}
expect(output).not.toContain('/non-conflict-pages')
expect(output).not.toContain('/non-conflict')
})
if (dev) {
it('should show error overlay for /', async () => {
const browser = await webdriver(appPort, '/')
expect(await hasRedbox(browser, true)).toBe(true)
expect(await getRedboxHeader(browser)).toContain(
'Conflicting app and page file found: "app/page.js" and "pages/index.js". Please remove one to continue.'
)
})
it('should show error overlay for /hello', async () => {
const browser = await webdriver(appPort, '/hello')
expect(await hasRedbox(browser, true)).toBe(true)
expect(await getRedboxHeader(browser)).toContain(
'Conflicting app and page file found: "app/hello/page.js" and "pages/hello.js". Please remove one to continue.'
)
})
it('should show error overlay for /another', async () => {
const browser = await webdriver(appPort, '/another')
expect(await hasRedbox(browser, true)).toBe(true)
expect(await getRedboxHeader(browser)).toContain(
'Conflicting app and page file found: "app/another/page.js" and "pages/another.js". Please remove one to continue.'
)
})
it('should not show error overlay for /non-conflict-pages', async () => {
const browser = await webdriver(appPort, '/non-conflict-pages')
expect(await hasRedbox(browser, false)).toBe(false)
expect(await getRedboxHeader(browser)).toBe(null)
expect(await browser.elementByCss('h1').text()).toBe('Hello World!')
})
it('should not show error overlay for /non-conflict', async () => {
const browser = await webdriver(appPort, '/non-conflict')
expect(await hasRedbox(browser, false)).toBe(false)
expect(await getRedboxHeader(browser)).toBe(null)
expect(await browser.elementByCss('p').text()).toBe('non-conflict app')
})
}
}
describe('Conflict between app file and page file', () => {
describe('next dev', () => {
beforeAll(async () => {
output = ''
appPort = await findPort()
app = await launchApp(appDir, appPort, {
onStdout(msg) {
output += msg || ''
},
onStderr(msg) {
output += msg || ''
},
})
await waitFor(800)
})
afterAll(() => {
killApp(app)
})
runTests({ dev: true })
})
describe('next build', () => {
beforeAll(async () => {
output = ''
const { stdout, stderr } = await nextBuild(appDir, [], {
stdout: true,
stderr: true,
env: { NEXT_SKIP_APP_REACT_INSTALL: '1' },
})
output = stdout + stderr
})
afterAll(() => {
killApp(app)
})
runTests({ dev: false })
})
})
...@@ -138,6 +138,18 @@ export class NextStartInstance extends NextInstance { ...@@ -138,6 +138,18 @@ export class NextStartInstance extends NextInstance {
} }
public async build() { public async build() {
this.spawnOpts = {
cwd: this.testDir,
stdio: ['ignore', 'pipe', 'pipe'],
shell: false,
env: {
...process.env,
...this.env,
NODE_ENV: '' as any,
PORT: this.forcedPort || '0',
__NEXT_TEST_MODE: 'e2e',
},
}
return new Promise((resolve) => { return new Promise((resolve) => {
const curOutput = this._cliOutput.length const curOutput = this._cliOutput.length
const exportArgs = ['pnpm', 'next', 'build'] const exportArgs = ['pnpm', 'next', 'build']
......
...@@ -693,8 +693,9 @@ export async function getRedboxHeader(browser) { ...@@ -693,8 +693,9 @@ export async function getRedboxHeader(browser) {
.find((p) => .find((p) =>
p.shadowRoot.querySelector('[data-nextjs-turbo-dialog-body]') p.shadowRoot.querySelector('[data-nextjs-turbo-dialog-body]')
) )
const root = portal.shadowRoot const root = portal?.shadowRoot
return root.querySelector('[data-nextjs-turbo-dialog-body]').innerText return root?.querySelector('[data-nextjs-turbo-dialog-body]')
?.innerText
}) })
} else { } else {
return evaluate(browser, () => { return evaluate(browser, () => {
...@@ -703,8 +704,8 @@ export async function getRedboxHeader(browser) { ...@@ -703,8 +704,8 @@ export async function getRedboxHeader(browser) {
.find((p) => .find((p) =>
p.shadowRoot.querySelector('[data-nextjs-dialog-header]') p.shadowRoot.querySelector('[data-nextjs-dialog-header]')
) )
const root = portal.shadowRoot const root = portal?.shadowRoot
return root.querySelector('[data-nextjs-dialog-header]').innerText return root?.querySelector('[data-nextjs-dialog-header]')?.innerText
}) })
} }
}, },
......
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