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

Correct Flight client's condition for SSR and createServerReference #51723

Merged
merged 3 commits into from
Jun 23, 2023
Merged

Correct Flight client's condition for SSR and createServerReference #51723

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d488997
fix createServerReference build
shuding Jun 23, 2023
32ce96f
Merge branch 'canary' into shu/6s1f
shuding Jun 23, 2023
169c257
fix lint error
shuding Jun 23, 2023
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
12 changes: 10 additions & 2 deletions packages/next/src/build/webpack/loaders/next-flight-loader/action-client-wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
// This file must be bundled in the app's client layer, it shouldn't be directly
// imported by the server.

// eslint-disable-next-line import/no-extraneous-dependencies
import { createServerReference } from 'react-server-dom-webpack/client'
import { callServer } from 'next/dist/client/app-call-server'

// A noop wrapper to let the Flight client create the server reference.
// See also: https://github.com/facebook/react/pull/26632
export default function (id: string) {
// Since we're using the Edge build of Flight client for SSR [1], here we need to
// also use the same Edge build to create the reference. For the client bundle,
// we use the default and let Webpack to resolve it to the correct version.
// 1: https://github.com/vercel/next.js/blob/16eb80b0b0be13f04a6407943664b5efd8f3d7d0/packages/next/src/server/app-render/use-flight-response.tsx#L24-L26
const { createServerReference } = (
typeof window === 'undefined'
? require('react-server-dom-webpack/client.edge')
: require('react-server-dom-webpack/client')
) as typeof import('react-server-dom-webpack/client')

return createServerReference(id, callServer)
}