Unverified Commit 28eb15f6 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Fix manifest error when using route.js (#46102)

This ensures there is no client component entry created for route.js.
@shuding is going to investigate further why this would break the
manifest generation in development.


Fixes #45956
Fixes NEXT-588

<!--
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:
-->

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have a helpful link attached, see
[`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ]
[e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see
[`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm build && pnpm lint`
- [ ] The "examples guidelines" are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
parent be2d4136
...@@ -31,6 +31,7 @@ import { ...@@ -31,6 +31,7 @@ import {
} from '../loaders/utils' } from '../loaders/utils'
import { traverseModules } from '../utils' import { traverseModules } from '../utils'
import { normalizePathSep } from '../../../shared/lib/page-path/normalize-path-sep' import { normalizePathSep } from '../../../shared/lib/page-path/normalize-path-sep'
import { isAppRouteRoute } from '../../../lib/is-app-route-route'
interface Options { interface Options {
dev: boolean dev: boolean
...@@ -165,7 +166,13 @@ export class FlightClientEntryPlugin { ...@@ -165,7 +166,13 @@ export class FlightClientEntryPlugin {
) { ) {
for (const [name, entry] of compilation.entries.entries()) { for (const [name, entry] of compilation.entries.entries()) {
// Skip for entries under pages/ // Skip for entries under pages/
if (name.startsWith('pages/')) continue if (
name.startsWith('pages/') ||
// Skip for route.js entries
(name.startsWith('app/') && isAppRouteRoute(name))
) {
continue
}
// Check if the page entry is a server component or not. // Check if the page entry is a server component or not.
const entryDependency: webpack.NormalModule | undefined = const entryDependency: webpack.NormalModule | undefined =
......
import { NextResponse } from 'next/server'
export async function GET() {
return NextResponse.json({ url: 'https://www.example.com' })
}
export default function RootLayout({ children }) {
return (
<html>
<head />
<body>{children}</body>
</html>
)
}
'use client'
export default function Home() {
return <h1 id="page-title">Page that would break</h1>
}
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
experimental: { appDir: true },
}
module.exports = nextConfig
import { createNextDescribe } from 'e2e-utils'
import { check } from 'next-test-utils'
createNextDescribe(
'route-page-manifest-bug',
{
files: __dirname,
},
({ next }) => {
// Recommended for tests that check HTML. Cheerio is a HTML parser that has a jQuery like API.
it('should work when requesting route handler after page', async () => {
const browser = await next.browser('/')
expect(await browser.elementByCss('#page-title').text()).toBe(
'Page that would break'
)
await browser.eval('window.location.href = "/abc"')
await check(
() => browser.eval('document.body.textContent'),
'{"url":"https://www.example.com"}'
)
await browser.refresh()
await check(
() => browser.eval('document.body.textContent'),
'{"url":"https://www.example.com"}'
)
await browser.refresh()
await check(
() => browser.eval('document.body.textContent'),
'{"url":"https://www.example.com"}'
)
await browser.refresh()
await check(
() => browser.eval('document.body.textContent'),
'{"url":"https://www.example.com"}'
)
await browser.back()
expect(await browser.waitForElementByCss('#page-title').text()).toBe(
'Page that would break'
)
await browser.refresh()
expect(await browser.waitForElementByCss('#page-title').text()).toBe(
'Page that would break'
)
await browser.refresh()
expect(await browser.waitForElementByCss('#page-title').text()).toBe(
'Page that would break'
)
})
}
)
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