mirror of
https://github.com/hanzoai/next.js.git
synced 2026-09-24 17:00:51 +00:00
Tim NeutkensandGitHub
bd28752495
## What? Fixes the check for Turbopack. Follow-up to #62531 which fixes the underlying issue but it wasn't checking the right value. <!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # --> Closes NEXT-2665
129 lines
4.3 KiB
TypeScript
129 lines
4.3 KiB
TypeScript
import {
|
|
getRedboxHeader,
|
|
hasRedbox,
|
|
getRedboxSource,
|
|
retry,
|
|
getRedboxDescription,
|
|
} 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()
|
|
if (process.env.TURBOPACK) {
|
|
expect(cliOutput).toContain(
|
|
'App Router and Pages Router both match path: /'
|
|
)
|
|
expect(cliOutput).toContain(
|
|
'App Router and Pages Router both match path: /another'
|
|
)
|
|
} else {
|
|
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 retry(async () => {
|
|
expect(await hasRedbox(browser)).toBe(true)
|
|
if (process.env.TURBOPACK) {
|
|
expect(await getRedboxDescription(browser)).toContain(
|
|
'App Router and Pages Router both match path:'
|
|
)
|
|
}
|
|
|
|
if (!process.env.TURBOPACK) {
|
|
for (const pair of conflicts) {
|
|
expect(await getRedboxSource(browser)).toContain(
|
|
`"${pair[0]}" - "${pair[1]}"`
|
|
)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
if (isNextDev) {
|
|
it('should show error overlay for /another', async () => {
|
|
await next.start()
|
|
const browser = await next.browser('/another')
|
|
expect(await hasRedbox(browser)).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)).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)).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)).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)).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)).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)).toBe(false)
|
|
|
|
// Re-trigger the conflicted errors
|
|
await next.renameFile('pages/index2.js', 'pages/index.js')
|
|
expect(await hasRedbox(browser)).toBe(true)
|
|
await containConflictsError(browser, [
|
|
['pages/index.js', 'app/page.js'],
|
|
])
|
|
})
|
|
}
|
|
}
|
|
)
|