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

Use renderToStream with React 18 #34106

Merged
merged 2 commits into from
Feb 8, 2022
Merged

Use renderToStream with React 18 #34106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6923909
Use renderToStream for React 18
devknoll Feb 8, 2022
f589fa2
Merge branch 'canary' into x-use-stream-with-react-root
devknoll Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/next/build/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ export function createEntrypoints(
'base64'
),
i18n: config.i18n ? JSON.stringify(config.i18n) : '',
reactRoot: config.experimental.reactRoot ? 'true' : '',
}

Object.keys(pages).forEach((page) => {
Expand Down
3 changes: 3 additions & 0 deletions packages/next/build/webpack/loaders/next-serverless-loader/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export type ServerlessLoaderQuery = {
previewProps: string
loadedEnvFiles: string
i18n: string
reactRoot: string
}

const nextServerlessLoader: webpack.loader.Loader = function () {
Expand All @@ -52,6 +53,7 @@ const nextServerlessLoader: webpack.loader.Loader = function () {
previewProps,
loadedEnvFiles,
i18n,
reactRoot,
}: ServerlessLoaderQuery =
typeof this.query === 'string' ? parse(this.query.substr(1)) : this.query

Expand Down Expand Up @@ -193,6 +195,7 @@ const nextServerlessLoader: webpack.loader.Loader = function () {
canonicalBase: "${canonicalBase}",
generateEtags: ${generateEtags || 'false'},
poweredByHeader: ${poweredByHeader || 'false'},
reactRoot: ${reactRoot || 'false'},

runtimeConfig,
buildManifest,
Expand Down
1 change: 1 addition & 0 deletions packages/next/export/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ export default async function exportApp(
optimizeCss: nextConfig.experimental.optimizeCss,
optimizeFonts: nextConfig.optimizeFonts,
optimizeImages: nextConfig.experimental.optimizeImages,
reactRoot: nextConfig.experimental.reactRoot || false,
}

const { serverRuntimeConfig, publicRuntimeConfig } = nextConfig
Expand Down
2 changes: 2 additions & 0 deletions packages/next/server/base-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ export default abstract class Server {
serverComponentManifest?: any
renderServerComponentData?: boolean
serverComponentProps?: any
reactRoot: boolean
}
private incrementalCache: IncrementalCache
private responseCache: ResponseCache
Expand Down Expand Up @@ -321,6 +322,7 @@ export default abstract class Server {
crossOrigin: this.nextConfig.crossOrigin
? this.nextConfig.crossOrigin
: undefined,
reactRoot: this.nextConfig.experimental.reactRoot === true,
}

// Only the `publicRuntimeConfig` key is exposed to the client side
Expand Down
6 changes: 4 additions & 2 deletions packages/next/server/render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ export type RenderOptsPartial = {
serverComponents?: boolean
customServer?: boolean
crossOrigin?: string
reactRoot: boolean
}

export type RenderOpts = LoadComponentsReturnType & RenderOptsPartial
Expand Down Expand Up @@ -456,6 +457,7 @@ export async function renderToHTML(
basePath,
devOnlyCacheBusterQueryString,
supportsDynamicHTML,
reactRoot,
runtime,
} = renderOpts

Expand Down Expand Up @@ -1265,7 +1267,7 @@ export async function renderToHTML(
)
}

if (hasConcurrentFeatures) {
if (reactRoot) {
bodyResult = async (suffix: string) => {
// this must be called inside bodyResult so appWrappers is
// up to date when getWrappedApp is called
Expand All @@ -1277,7 +1279,7 @@ export async function renderToHTML(
suffix,
serverComponentsInlinedTransformStream?.readable ??
streamFromArray([]),
generateStaticHTML
generateStaticHTML || !hasConcurrentFeatures
)
}
} else {
Expand Down