diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
index b46a5ec3881c5..0c7c66133f009 100644
--- a/packages/next/src/server/app-render/app-render.tsx
+++ b/packages/next/src/server/app-render/app-render.tsx
@@ -259,6 +259,17 @@ function makeGetDynamicParamFromSegment(
}
}
+function NonIndex({ ctx }: { ctx: AppRenderContext }) {
+ const is404Page = ctx.pagePath === '/404'
+ const isInvalidStatusCode =
+ typeof ctx.res.statusCode === 'number' && ctx.res.statusCode > 400
+
+ if (is404Page || isInvalidStatusCode) {
+ return
+ }
+ return null
+}
+
// Handle Flight render request. This is only used when client-side navigating. E.g. when you `router.push('/dashboard')` or `router.reload()`.
async function generateFlight(
ctx: AppRenderContext,
@@ -306,8 +317,11 @@ async function generateFlight(
isFirst: true,
// For flight, render metadata inside leaf page
rscPayloadHead: (
- // Adding requestId as react key to make metadata remount for each render
-
+ <>
+
+ {/* Adding requestId as react key to make metadata remount for each render */}
+
+
),
injectedCSS: new Set(),
injectedJS: new Set(),
@@ -457,9 +471,7 @@ async function ReactServerApp({ tree, ctx, asNotFound }: ReactServerAppProps) {
couldBeIntercepted={couldBeIntercepted}
initialHead={
<>
- {ctx.res.statusCode > 400 && (
-
- )}
+
{/* Adding requestId as react key to make metadata remount for each render */}
@@ -495,7 +507,6 @@ async function ReactServerError({
},
staticGenerationStore: { urlPathname },
requestId,
- res,
} = ctx
const [MetadataTree] = createMetadataComponents({
@@ -511,9 +522,9 @@ async function ReactServerError({
const head = (
<>
+
{/* Adding requestId as react key to make metadata remount for each render */}
- {res.statusCode >= 400 && }
{process.env.NODE_ENV === 'development' && (
)}
@@ -1200,7 +1211,7 @@ async function renderToHTMLOrFlightImpl(
res.setHeader('Location', redirectUrl)
}
- const is404 = res.statusCode === 404
+ const is404 = ctx.res.statusCode === 404
if (!is404 && !hasRedirectError && !shouldBailoutToCSR) {
res.statusCode = 500
}
diff --git a/test/e2e/app-dir/not-found/default/app/foo/page.js b/test/e2e/app-dir/not-found/default/app/foo/page.js
new file mode 100644
index 0000000000000..9c373d74ea69a
--- /dev/null
+++ b/test/e2e/app-dir/not-found/default/app/foo/page.js
@@ -0,0 +1,3 @@
+export default function Page() {
+ return Foo
+}
diff --git a/test/e2e/app-dir/not-found/default/app/layout.js b/test/e2e/app-dir/not-found/default/app/layout.js
new file mode 100644
index 0000000000000..750eb927b1980
--- /dev/null
+++ b/test/e2e/app-dir/not-found/default/app/layout.js
@@ -0,0 +1,7 @@
+export default function Layout({ children }) {
+ return (
+
+ {children}
+
+ )
+}
diff --git a/test/e2e/app-dir/not-found/default/default.test.ts b/test/e2e/app-dir/not-found/default/default.test.ts
new file mode 100644
index 0000000000000..b7e936d5a9bf5
--- /dev/null
+++ b/test/e2e/app-dir/not-found/default/default.test.ts
@@ -0,0 +1,27 @@
+import { nextTestSetup } from 'e2e-utils'
+
+const isPPREnabled = process.env.__NEXT_EXPERIMENTAL_PPR === 'true'
+
+describe('app dir - not-found - default', () => {
+ const { next, isNextStart } = nextTestSetup({
+ files: __dirname,
+ skipDeployment: true,
+ })
+
+ it('should has noindex in the head html', async () => {
+ const $ = await next.render$('/does-not-exist')
+ expect(await $('meta[name="robots"]').attr('content')).toBe('noindex')
+ })
+
+ if (isNextStart) {
+ it('should contain noindex contain in the page', async () => {
+ const html = await next.readFile('.next/server/app/_not-found.html')
+ const rsc = await next.readFile(
+ `.next/server/app/_not-found.${isPPREnabled ? 'prefetch.' : ''}rsc`
+ )
+
+ expect(html).toContain('noindex')
+ expect(rsc).toContain('noindex')
+ })
+ }
+})