Should not show no index for client rendering bailout

packages/next/src/client/on-recoverable-error.ts

@@ -1,4 +1,4 @@
-import { NEXT_DYNAMIC_NO_SSR_CODE } from '../shared/lib/lazy-dynamic/no-ssr-error'
+import { isBailoutCSRError } from '../shared/lib/lazy-dynamic/no-ssr-error'
 
 export default function onRecoverableError(err: any) {
   // Using default react onRecoverableError
@@ -13,7 +13,7 @@ export default function onRecoverableError(err: any) {
         }
 
   // Skip certain custom errors which are not expected to be reported on client
-  if (err.digest === NEXT_DYNAMIC_NO_SSR_CODE) return
+  if (isBailoutCSRError(err)) return
 
   defaultOnRecoverableError(err)
 }

packages/next/src/export/helpers/is-dynamic-usage-error.ts

@@ -1,10 +1,10 @@
 import { DYNAMIC_ERROR_CODE } from '../../client/components/hooks-server-context'
 import { isNotFoundError } from '../../client/components/not-found'
 import { isRedirectError } from '../../client/components/redirect'
-import { NEXT_DYNAMIC_NO_SSR_CODE } from '../../shared/lib/lazy-dynamic/no-ssr-error'
+import { isBailoutCSRError } from '../../shared/lib/lazy-dynamic/no-ssr-error'
 
 export const isDynamicUsageError = (err: any) =>
   err.digest === DYNAMIC_ERROR_CODE ||
   isNotFoundError(err) ||
-  err.digest === NEXT_DYNAMIC_NO_SSR_CODE ||
+  isBailoutCSRError(err) ||
   isRedirectError(err)

packages/next/src/export/routes/pages.ts

@@ -15,7 +15,7 @@ import {
   NEXT_DATA_SUFFIX,
   SERVER_PROPS_EXPORT_ERROR,
 } from '../../lib/constants'
-import { NEXT_DYNAMIC_NO_SSR_CODE } from '../../shared/lib/lazy-dynamic/no-ssr-error'
+import { isBailoutCSRError } from '../../shared/lib/lazy-dynamic/no-ssr-error'
 import AmpHtmlValidator from 'next/dist/compiled/amphtml-validator'
 import { FileType, fileExists } from '../../lib/file-exists'
 import { lazyRenderPagesPage } from '../../server/future/route-modules/pages/module.render'
@@ -106,7 +106,7 @@ export async function exportPages(
         renderOpts
       )
     } catch (err: any) {
-      if (err.digest !== NEXT_DYNAMIC_NO_SSR_CODE) {
+      if (!isBailoutCSRError(err)) {
         throw err
       }
     }
@@ -164,7 +164,7 @@ export async function exportPages(
           renderOpts
         )
       } catch (err: any) {
-        if (err.digest !== NEXT_DYNAMIC_NO_SSR_CODE) {
+        if (!isBailoutCSRError(err)) {
           throw err
         }
       }

packages/next/src/server/app-render/app-render.tsx

@@ -66,7 +66,7 @@ import { parseAndValidateFlightRouterState } from './parse-and-validate-flight-r
 import { validateURL } from './validate-url'
 import { createFlightRouterStateFromLoaderTree } from './create-flight-router-state-from-loader-tree'
 import { handleAction } from './action-handler'
-import { NEXT_DYNAMIC_NO_SSR_CODE } from '../../shared/lib/lazy-dynamic/no-ssr-error'
+import { isBailoutCSRError } from '../../shared/lib/lazy-dynamic/no-ssr-error'
 import { warn, error } from '../../build/output/log'
 import { appendMutableCookies } from '../web/spec-extension/adapters/request-cookies'
 import { createServerInsertedHTML } from './server-inserted-html'
@@ -863,7 +863,8 @@ async function renderToHTMLOrFlightImpl(
           throw err
         }
 
-        if (err.digest === NEXT_DYNAMIC_NO_SSR_CODE) {
+        const isBailoutCSR = isBailoutCSRError(err)
+        if (isBailoutCSR) {
           warn(
             `Entire page ${pagePath} deopted into client-side rendering. https://nextjs.org/docs/messages/deopted-into-client-rendering`,
             pagePath
@@ -894,7 +895,7 @@ async function renderToHTMLOrFlightImpl(
         }
 
         const is404 = res.statusCode === 404
-        if (!is404 && !hasRedirectError) {
+        if (!is404 && !hasRedirectError && !isBailoutCSR) {
           res.statusCode = 500
         }
 

packages/next/src/shared/lib/lazy-dynamic/no-ssr-error.ts

@@ -7,3 +7,7 @@ export function throwWithNoSSR() {
   ;(error as any).digest = NEXT_DYNAMIC_NO_SSR_CODE
   throw error
 }
+
+export function isBailoutCSRError(err: any) {
+  return err?.digest === NEXT_DYNAMIC_NO_SSR_CODE
+}

test/e2e/app-dir/hooks/app/hooks/use-pathname/layout.js

@@ -0,0 +1,5 @@
+export default function Layout({ children }) {
+  return children
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/app-dir/hooks/app/hooks/use-pathname/page.js

@@ -13,3 +13,5 @@ export default function Page() {
     </>
   )
 }
+
+export const dynamic = 'force-dynamic'

test/e2e/app-dir/hooks/app/hooks/use-search-params/dynamic/layout.js

@@ -0,0 +1,5 @@
+export default function Layout({ children }) {
+  return children
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/app-dir/hooks/app/hooks/use-search-params/static/page.js

@@ -0,0 +1,16 @@
+'use client'
+
+import { useSearchParams } from 'next/navigation'
+
+export default function Page() {
+  const params = useSearchParams()
+
+  return (
+    <>
+      <p id="params-first">{params.get('first') ?? 'N/A'}</p>
+      <p id="params-second">{params.get('second') ?? 'N/A'}</p>
+      <p id="params-third">{params.get('third') ?? 'N/A'}</p>
+      <p id="params-not-real">{params.get('notReal') ?? 'N/A'}</p>
+    </>
+  )
+}

test/e2e/app-dir/hooks/app/layout.js

@@ -1,7 +1,5 @@
 import React from 'react'
 
-export const revalidate = 0
-
 export default function Layout({ children }) {
   return (
     <html>

test/e2e/app-dir/hooks/hooks.test.ts

@@ -5,7 +5,7 @@ createNextDescribe(
   {
     files: __dirname,
   },
-  ({ next, isNextDeploy }) => {
+  ({ next, isNextStart, isNextDeploy }) => {
     describe('from pages', () => {
       it.each([
         { pathname: '/adapter-hooks/static' },
@@ -54,12 +54,26 @@ createNextDescribe(
     describe('useSearchParams', () => {
       it('should have the correct search params', async () => {
         const $ = await next.render$(
-          '/hooks/use-search-params?first=value&second=other%20value&third'
+          '/hooks/use-search-params/dynamic?first=value&second=other%20value&third'
         )
         expect($('#params-first').text()).toBe('value')
         expect($('#params-second').text()).toBe('other value')
         expect($('#params-third').text()).toBe('')
         expect($('#params-not-real').text()).toBe('N/A')
+
+        // dynamic page doesn't have bail out
+        expect($('html#__next_error__').length).toBe(0)
+        expect($('meta[content=noindex]').length).toBe(0)
+      })
+
+      it('should not contain noindex meta tag for static built page', async () => {
+        const $ = await next.render$(
+          '/hooks/use-search-params/static?first=value'
+        )
+        // static built page will not have search params
+        expect($('#params-first').text()).toBe(isNextStart ? '' : 'value')
+        // should not have noindex meta tag as it's erroring on purpose, for nextjs internal use only
+        expect($('meta[content=noindex]').length).toBe(0)
       })
 
       // TODO-APP: correct this behavior when deployed

test/e2e/app-dir/hooks/next.config.js

@@ -5,7 +5,7 @@ module.exports = {
         {
           source: '/rewritten-use-search-params',
           destination:
-            '/hooks/use-search-params?first=value&second=other%20value&third',
+            '/hooks/use-search-params/dynamic?first=value&second=other%20value&third',
         },
         {
           source: '/rewritten-use-pathname',