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

Add flight render starting point #36760

Merged
merged 8 commits into from May 8, 2022
Merged

Add flight render starting point #36760

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b0a818
Fix leftover todo in loader
timneutkens May 6, 2022
76435f9
Leverage pageExtensions for resolving in loader
timneutkens May 7, 2022
03926a7
Merge branch 'canary' of github.com:vercel/next.js into fix/only-reso…
timneutkens May 7, 2022
24a717d
Fix dev
timneutkens May 7, 2022
52e56fa
Add flight render starting point
timneutkens May 8, 2022
3e4bb81
Merge branch 'canary' of github.com:vercel/next.js into fix/only-reso…
timneutkens May 8, 2022
b4360c3
Update packages/next/server/view-render.tsx
timneutkens May 8, 2022
515638d
Run prettier
timneutkens May 8, 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
14 changes: 12 additions & 2 deletions packages/next/server/view-render.tsx
View file
Open in desktop
Expand Up @@ -219,9 +219,19 @@ export async function renderToHTML(
const hasConcurrentFeatures = !!runtime
const pageIsDynamic = isDynamicRoute(pathname)
const components = Object.keys(ComponentMod.components)
.filter((path) => {
const { __flight__, __flight_router_path__: routerPath } = query
// Rendering part of the page is only allowed for flight data
if (__flight__ !== undefined && routerPath) {
// TODO: check the actual path
const pathLength = path.length
return pathLength >= routerPath.length
}
return true
})
.sort()
.map((key) => {
const mod = ComponentMod.components[key]()
.map((path) => {
const mod = ComponentMod.components[path]()
mod.Component = mod.default || mod
return mod
})
Expand Down