Skip to content

Commit 2341b09

Browse files
committed
React is removing Server Context (it was never documented) and Next never fully implemented it anyway. This removes any references to server context APIs (entirely internal) which is now required since the latest React canary no longer exposes these APIs.
1 parent 3b2c5aa commit 2341b09

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ export type AppRenderContext = AppRenderBaseContext & {
104104
pagePath: string
105105
clientReferenceManifest: ClientReferenceManifest
106106
assetPrefix: string
107-
serverContexts: ServerContext[]
108107
flightDataRendererErrorHandler: ErrorHandler
109108
serverComponentsErrorHandler: ErrorHandler
110109
isNotFoundPath: boolean
@@ -290,7 +289,6 @@ async function generateFlight(
290289
: buildIdFlightDataPair,
291290
ctx.clientReferenceManifest.clientModules,
292291
{
293-
context: ctx.serverContexts,
294292
onError: ctx.flightDataRendererErrorHandler,
295293
}
296294
).pipeThrough(createBufferedTransformStream())
@@ -525,15 +523,6 @@ async function renderToHTMLOrFlightImpl(
525523
: query
526524
const searchParamsProps = { searchParams: providedSearchParams }
527525

528-
/**
529-
* Server Context is specifically only available in Server Components.
530-
* It has to hold values that can't change while rendering from the common layout down.
531-
* An example of this would be that `headers` are available but `searchParams` are not because that'd mean we have to render from the root layout down on all requests.
532-
*/
533-
const serverContexts: Array<[string, any]> = [
534-
['WORKAROUND', null], // TODO-APP: First value has a bug currently where the value is not set on the second request: https://github.com/facebook/react/issues/24849
535-
]
536-
537526
/**
538527
* Dynamic parameters. E.g. when you visit `/dashboard/vercel` which is rendered by `/dashboard/[slug]` the value will be {"slug": "vercel"}.
539528
*/
@@ -561,7 +550,6 @@ async function renderToHTMLOrFlightImpl(
561550
assetPrefix,
562551
flightDataRendererErrorHandler,
563552
serverComponentsErrorHandler,
564-
serverContexts,
565553
isNotFoundPath,
566554
res,
567555
}
@@ -580,7 +568,6 @@ async function renderToHTMLOrFlightImpl(
580568
const serverComponentsRenderOpts = {
581569
inlinedDataTransformStream: new TransformStream<Uint8Array, Uint8Array>(),
582570
clientReferenceManifest,
583-
serverContexts,
584571
formState: null,
585572
}
586573

packages/next/src/server/app-render/create-server-components-renderer.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ export function createServerComponentRenderer<Props>(
1616
{
1717
inlinedDataTransformStream,
1818
clientReferenceManifest,
19-
serverContexts,
2019
formState,
2120
}: {
2221
inlinedDataTransformStream: TransformStream<Uint8Array, Uint8Array>
2322
clientReferenceManifest: NonNullable<RenderOpts['clientReferenceManifest']>
24-
serverContexts: Array<
25-
[ServerContextName: string, JSONValue: Object | number | string]
26-
>
2723
formState: null | any
2824
},
2925
serverComponentsErrorHandler: ReturnType<typeof createErrorHandler>,
@@ -36,7 +32,6 @@ export function createServerComponentRenderer<Props>(
3632
<ComponentToRender {...(props as any)} />,
3733
clientReferenceManifest.clientModules,
3834
{
39-
context: serverContexts,
4035
onError: serverComponentsErrorHandler,
4136
}
4237
)

0 commit comments

Comments
 (0)