Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid bundling appDir rendering into pages edge SSR bundle #43184

Merged
merged 4 commits into from Nov 21, 2022
Merged

Avoid bundling appDir rendering into pages edge SSR bundle #43184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d3906d
Avoid bundling app-render into base-server
huozhi Nov 21, 2022
16a3f12
Merge branch 'canary' into edge/pages-ssr-bundle
huozhi Nov 21, 2022
95abfb7
Merge branch 'canary' into edge/pages-ssr-bundle
ijjk Nov 21, 2022
a8cc12a
Merge branch 'canary' into edge/pages-ssr-bundle
kodiakhq[bot] Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/next/client/components/app-router-headers.ts
View file
Open in desktop
Expand Up @@ -3,3 +3,9 @@ export const NEXT_ROUTER_STATE_TREE = 'Next-Router-State-Tree' as const
export const NEXT_ROUTER_PREFETCH = 'Next-Router-Prefetch' as const
export const RSC_VARY_HEADER =
`${RSC}, ${NEXT_ROUTER_STATE_TREE}, ${NEXT_ROUTER_PREFETCH}` as const

export const FLIGHT_PARAMETERS = [
[RSC],
[NEXT_ROUTER_STATE_TREE],
[NEXT_ROUTER_PREFETCH],
] as const
7 changes: 1 addition & 6 deletions packages/next/server/app-render.tsx
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ import {
NEXT_ROUTER_PREFETCH,
NEXT_ROUTER_STATE_TREE,
RSC,
FLIGHT_PARAMETERS,
} from '../client/components/app-router-headers'
import type { StaticGenerationStore } from '../client/components/static-generation-async-storage'

Expand Down Expand Up @@ -704,12 +705,6 @@ function getScriptNonceFromHeader(cspHeaderValue: string): string | undefined {
return nonce
}

export const FLIGHT_PARAMETERS = [
[RSC],
[NEXT_ROUTER_STATE_TREE],
[NEXT_ROUTER_PREFETCH],
] as const

function headersWithoutFlight(headers: IncomingHttpHeaders) {
const newHeaders = { ...headers }
for (const param of FLIGHT_PARAMETERS) {
Expand Down
7 changes: 5 additions & 2 deletions packages/next/server/base-server.ts
View file
Open in desktop
Expand Up @@ -74,8 +74,11 @@ import { getHostname } from '../shared/lib/get-hostname'
import { parseUrl as parseUrlUtil } from '../shared/lib/router/utils/parse-url'
import { getNextPathnameInfo } from '../shared/lib/router/utils/get-next-pathname-info'
import { MiddlewareMatcher } from '../build/analysis/get-page-static-info'
import { RSC, RSC_VARY_HEADER } from '../client/components/app-router-headers'
import { FLIGHT_PARAMETERS } from './app-render'
import {
RSC,
RSC_VARY_HEADER,
FLIGHT_PARAMETERS,
} from '../client/components/app-router-headers'

export type FindComponentsResult = {
components: LoadComponentsReturnType
Expand Down