archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename flight parameters to rsc/next (#40979)

Browse source 
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Tim Neutkens 2022-09-28 13:18:37 +02:00 committed by GitHub
parent 58d4736116
commit b79d72d4b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/next/client/components/app-router.client.tsx
View file

@ -44,18 +44,18 @@ export async function fetchServerResponse(
prefetch?: true
): Promise<[FlightData: FlightData, canonicalUrlOverride: URL | undefined]> {
const headers: {
__flight__: '1'
__flight_router_state_tree__: string
__flight_prefetch__?: '1'
__rsc__: '1'
__next_router_state_tree__: string
__next_router_prefetch__?: '1'
} = {
// Enable flight response
__flight__: '1',
__rsc__: '1',
// Provide the current router state
__flight_router_state_tree__: JSON.stringify(flightRouterState),
__next_router_state_tree__: JSON.stringify(flightRouterState),
}
if (prefetch) {
// Enable prefetch response
headers.__flight_prefetch__ = '1'
headers.__next_router_prefetch__ = '1'
}
const res = await fetch(url.toString(), {

14
packages/next/server/app-render.tsx
View file

@ -582,9 +582,9 @@ function getScriptNonceFromHeader(cspHeaderValue: string): string | undefined {
}
const FLIGHT_PARAMETERS = [
'__flight__',
'__flight_router_state_tree__',
'__flight_prefetch__',
'__rsc__',
'__next_router_state_tree__',
'__next_router_prefetch__',
] as const
function headersWithoutFlight(headers: IncomingHttpHeaders) {
@ -653,8 +653,8 @@ export async function renderToHTMLOrFlight(
// don't modify original query object
query = Object.assign({}, query)
const isFlight = req.headers.__flight__ !== undefined
const isPrefetch = req.headers.__flight_prefetch__ !== undefined
const isFlight = req.headers.__rsc__ !== undefined
const isPrefetch = req.headers.__next_router_prefetch__ !== undefined
// Handle client-side navigation to pages directory
if (isFlight && isPagesDir) {
@ -688,8 +688,8 @@ export async function renderToHTMLOrFlight(
* Router state provided from the client-side router. Used to handle rendering from the common layout down.
*/
const providedFlightRouterState: FlightRouterState = isFlight
? req.headers.__flight_router_state_tree__
? JSON.parse(req.headers.__flight_router_state_tree__ as string)
? req.headers.__next_router_state_tree__
? JSON.parse(req.headers.__next_router_state_tree__ as string)
: {}
: undefined

4
packages/next/server/base-server.ts
View file

@ -1028,9 +1028,9 @@ export default abstract class Server<ServerOptions extends Options = Options> {
)
}
// Don't delete query.__flight__ yet, it still needs to be used in renderToHTML later
// Don't delete query.__rsc__ yet, it still needs to be used in renderToHTML later
const isFlightRequest = Boolean(
this.serverComponentManifest && req.headers.__flight__
this.serverComponentManifest && req.headers.__rsc__
)
// we need to ensure the status code if /404 is visited directly

6
packages/next/server/internal-utils.ts
View file

@ -6,10 +6,10 @@ const INTERNAL_QUERY_NAMES = [
'__nextDefaultLocale',
'__nextIsNotFound',
// RSC
'__flight__',
'__rsc__',
// Routing
'__flight_router_state_tree__',
'__flight_prefetch__',
'__next_router_state_tree__',
'__next_router_prefetch__',
] as const
const EXTENDED_INTERNAL_QUERY_NAMES = ['__nextDataReq'] as const

2
packages/next/server/next-server.ts
View file

@ -828,7 +828,7 @@ export default class NextNodeServer extends BaseServer {
if (
this.nextConfig.experimental.appDir &&
(renderOpts.isAppPath || req.headers.__flight__)
(renderOpts.isAppPath || req.headers.__rsc__)
) {
const isPagesDir = !renderOpts.isAppPath
return appRenderToHTMLOrFlight(

6
packages/next/server/web/adapter.ts
View file

@ -36,9 +36,9 @@ class NextRequestHint extends NextRequest {
}
const FLIGHT_PARAMETERS = [
'__flight__',
'__flight_router_state_tree__',
'__flight_prefetch__',
'__rsc__',
'__next_router_state_tree__',
'__next_router_prefetch__',
] as const
export async function adapter(params: {

2
test/e2e/app-dir/app/middleware.js
View file

@ -19,7 +19,7 @@ export function middleware(request) {
? 'rewrite'
: 'redirect'
const internal = ['__flight__', '__flight_router_state_tree__']
const internal = ['__rsc__', '__next_router_state_tree__']
if (internal.some((name) => request.headers.has(name))) {
return NextResponse[method](new URL('/internal/failure', request.url))
}

4
test/e2e/app-dir/index.test.ts
View file

@ -42,7 +42,7 @@ describe('app dir', () => {
{},
{
headers: {
__flight__: '1',
__rsc__: '1',
},
}
)
@ -56,7 +56,7 @@ describe('app dir', () => {
{},
{
headers: {
__flight__: '1',
__rsc__: '1',
},
}
)

18
test/e2e/app-dir/rsc-basic.test.ts
View file

@ -91,9 +91,9 @@ describe('app dir - react server components', () => {
'__nextLocale',
'__nextDefaultLocale',
'__nextIsNotFound',
'__flight__',
'__flight_router_state_tree__',
'__flight_prefetch__',
'__rsc__',
'__next_router_state_tree__',
'__next_router_prefetch__',
]
const hasNextInternalQuery = inlineFlightContents.some((content) =>
@ -111,9 +111,9 @@ describe('app dir - react server components', () => {
requestsCount++
return request.allHeaders().then((headers) => {
if (
headers.__flight__ === '1' &&
// Prefetches also include `__flight__`
headers.__flight_prefetch__ !== '1'
headers.__rsc__ === '1' &&
// Prefetches also include `__rsc__`
headers.__next_router_prefetch__ !== '1'
) {
hasFlightRequest = true
}
@ -197,8 +197,8 @@ describe('app dir - react server components', () => {
page.on('request', (request) => {
return request.allHeaders().then((headers) => {
if (
headers.__flight__ === '1' &&
headers.__flight_prefetch__ !== '1'
headers.__rsc__ === '1' &&
headers.__next_router_prefetch__ !== '1'
) {
hasFlightRequest = true
}
@ -337,7 +337,7 @@ describe('app dir - react server components', () => {
{},
{
headers: {
__flight__: '1',
__rsc__: '1',
},
}
).then(async (response) => {

4
test/e2e/switchable-runtime/index.test.ts
View file

@ -120,7 +120,7 @@ describe('Switchable runtime', () => {
beforePageLoad(page) {
page.on('request', (request) => {
return request.allHeaders().then((headers) => {
if (headers.__flight__ === '1') {
if (headers.__rsc__ === '1') {
flightRequest = request.url()
}
})
@ -680,7 +680,7 @@ describe('Switchable runtime', () => {
beforePageLoad(page) {
page.on('request', (request) => {
request.allHeaders().then((headers) => {
if (headers.__flight__ === '1') {
if (headers.__rsc__ === '1') {
flightRequest = request.url()
}
})