Skip to content

Commit

Permalink
Fix middleware fallback: false case (#69799)
Browse files Browse the repository at this point in the history
This ensures we properly set the request meta during our middleware
invoke so that the `NoFallbackError` bubbling is handled properly.
Without these fields set we bubble the error unexpectedly causing an
unexpected 500 instead of a 404.

x-ref: #66987
Closes: #69428
  • Loading branch information
ijjk committed Sep 6, 2024
1 parent bf48448 commit e50ad14
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 0 deletions.
3 changes: 3 additions & 0 deletions packages/next/src/server/lib/router-utils/resolve-routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,9 @@ export function getResolveRoutes(
throw new Error(`Failed to initialize render server "middleware"`)
}

addRequestMeta(req, 'invokePath', '')
addRequestMeta(req, 'invokeOutput', '')
addRequestMeta(req, 'invokeQuery', {})
addRequestMeta(req, 'middlewareInvoke', true)
debug('invoking middleware', req.url, req.headers)

Expand Down
53 changes: 53 additions & 0 deletions test/e2e/middleware-general/app/pages/ssg-fallback-false/[slug].js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { useRouter } from 'next/router'
import { useEffect } from 'react'
import { useState } from 'react'

export default function Page(props) {
const router = useRouter()
const [asPath, setAsPath] = useState(
router.isReady ? router.asPath : router.href
)

if (!props.params) {
console.error('props', props)
throw new Error('missing props!!!')
}

useEffect(() => {
if (router.isReady) {
setAsPath(router.asPath)
}
}, [router.asPath, router.isReady])

return (
<>
<p id="ssg">/blog/[slug]</p>
<p id="query">{JSON.stringify(router.query)}</p>
<p id="pathname">{router.pathname}</p>
<p id="as-path">{asPath}</p>
<p id="props">{JSON.stringify(props)}</p>
</>
)
}

export function getStaticProps({ params }) {
if (params.slug.includes('not-found')) {
return {
notFound: true,
}
}

return {
props: {
now: Date.now(),
params,
},
}
}

export function getStaticPaths() {
return {
paths: ['/ssg-fallback-false/first', '/ssg-fallback-false/hello'],
fallback: false,
}
}
9 changes: 9 additions & 0 deletions test/e2e/middleware-general/test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ describe('Middleware Runtime', () => {
}

function runTests({ i18n }: { i18n?: boolean }) {
it('should handle 404 on fallback: false route correctly', async () => {
const res = await next.fetch('/ssg-fallback-false/first')
expect(res.status).toBe(200)
expect(await res.text()).toContain('blog')

const res2 = await next.fetch('/ssg-fallback-false/non-existent')
expect(res2.status).toBe(404)
})

it('should work with notFound: true correctly', async () => {
const browser = await next.browser('/ssr-page')
await browser.eval('window.next.router.push("/ssg/not-found-1")')
Expand Down

0 comments on commit e50ad14

Please sign in to comment.