Unverified Commit 0409b384 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Fix useStatic404 condition (#35749)

Static optimization is now supported with concurrent features, this PR fixes the condition for `useStatic404`.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `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`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `yarn lint`
Co-authored-by: 's avatarJJ Kasper <22380829+ijjk@users.noreply.github.com>
parent 23be63dc
...@@ -1394,9 +1394,7 @@ export default async function build( ...@@ -1394,9 +1394,7 @@ export default async function build(
// Since custom _app.js can wrap the 404 page we have to opt-out of static optimization if it has getInitialProps // Since custom _app.js can wrap the 404 page we have to opt-out of static optimization if it has getInitialProps
// Only export the static 404 when there is no /_error present // Only export the static 404 when there is no /_error present
const useStatic404 = const useStatic404 =
!hasConcurrentFeatures && !customAppGetInitialProps && (!hasNonStaticErrorPage || hasPages404)
!customAppGetInitialProps &&
(!hasNonStaticErrorPage || hasPages404)
if (invalidPages.size > 0) { if (invalidPages.size > 0) {
const err = new Error( const err = new Error(
......
...@@ -113,7 +113,7 @@ describe('Without global runtime configuration', () => { ...@@ -113,7 +113,7 @@ describe('Without global runtime configuration', () => {
/^[┌├└/]/.test(line) /^[┌├└/]/.test(line)
) )
const expectedOutputLines = splitLines(` const expectedOutputLines = splitLines(`
┌ λ /404 ┌ ○ /404
├ ℇ /edge ├ ℇ /edge
├ ℇ /edge-rsc ├ ℇ /edge-rsc
├ ○ /node ├ ○ /node
......
...@@ -38,6 +38,14 @@ describe('react 18 streaming SSR in minimal mode', () => { ...@@ -38,6 +38,14 @@ describe('react 18 streaming SSR in minimal mode', () => {
const html = await renderViaHTTP(next.url, '/') const html = await renderViaHTTP(next.url, '/')
expect(html).toContain('static streaming') expect(html).toContain('static streaming')
}) })
it('should have generated a static 404 page', async () => {
expect(await next.readFile('.next/server/pages/404.html')).toBeTruthy()
const res = await fetchViaHTTP(next.url, '/non-existent')
expect(res.status).toBe(404)
expect(await res.text()).toContain('This page could not be found')
})
}) })
describe('react 18 streaming SSR with custom next configs', () => { describe('react 18 streaming SSR with custom next configs', () => {
......
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