Skip to content

Commit 280ff6f

Browse files
authored
[Flight] Add Web Stream support to the Flight Client in Node (#33473)
This effectively lets us consume Web Streams in a Node build. In fact the Node entry point is now just adding Node stream APIs. For the client, this is simple because the configs are not actually stream type specific. The server is a little trickier.
1 parent 82f3684 commit 280ff6f

File tree

4 files changed

+8
-37
lines changed

4 files changed

+8
-37
lines changed

packages/react-server-dom-parcel/src/client/ReactFlightDOMClientNode.js

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ import {
1919
close,
2020
} from 'react-client/src/ReactFlightClient';
2121

22-
import {createServerReference as createServerReferenceImpl} from 'react-client/src/ReactFlightReplyClient';
23-
24-
export {registerServerReference} from 'react-client/src/ReactFlightReplyClient';
22+
export * from './ReactFlightDOMClientEdge';
2523

2624
function findSourceMapURL(filename: string, environmentName: string) {
2725
const devServer = parcelRequire.meta.devServer;
@@ -42,19 +40,6 @@ function noServerCall() {
4240
);
4341
}
4442

45-
export function createServerReference<A: Iterable<any>, T>(
46-
id: string,
47-
exportName: string,
48-
): (...A) => Promise<T> {
49-
return createServerReferenceImpl(
50-
id + '#' + exportName,
51-
noServerCall,
52-
undefined,
53-
findSourceMapURL,
54-
exportName,
55-
);
56-
}
57-
5843
type EncodeFormActionCallback = <A>(
5944
id: any,
6045
args: Promise<A>,

packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ import {
3636
close,
3737
} from 'react-client/src/ReactFlightClient';
3838

39-
import {createServerReference as createServerReferenceImpl} from 'react-client/src/ReactFlightReplyClient';
40-
41-
export {registerServerReference} from 'react-client/src/ReactFlightReplyClient';
39+
export * from './ReactFlightDOMClientEdge';
4240

4341
function noServerCall() {
4442
throw new Error(
@@ -48,13 +46,6 @@ function noServerCall() {
4846
);
4947
}
5048

51-
export function createServerReference<A: Iterable<any>, T>(
52-
id: any,
53-
callServer: any,
54-
): (...A) => Promise<T> {
55-
return createServerReferenceImpl(id, noServerCall);
56-
}
57-
5849
type EncodeFormActionCallback = <A>(
5950
id: any,
6051
args: Promise<A>,

packages/react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ import {
3737
close,
3838
} from 'react-client/src/ReactFlightClient';
3939

40-
import {createServerReference as createServerReferenceImpl} from 'react-client/src/ReactFlightReplyClient';
41-
42-
export {registerServerReference} from 'react-client/src/ReactFlightReplyClient';
40+
export * from './ReactFlightDOMClientEdge';
4341

4442
function noServerCall() {
4543
throw new Error(
@@ -49,13 +47,6 @@ function noServerCall() {
4947
);
5048
}
5149

52-
export function createServerReference<A: Iterable<any>, T>(
53-
id: any,
54-
callServer: any,
55-
): (...A) => Promise<T> {
56-
return createServerReferenceImpl(id, noServerCall);
57-
}
58-
5950
type EncodeFormActionCallback = <A>(
6051
id: any,
6152
args: Promise<A>,

scripts/shared/inlinedHostConfigs.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ module.exports = [
8989
'react-server-dom-webpack/server.node.unbundled',
9090
'react-server-dom-webpack/static',
9191
'react-server-dom-webpack/static.node.unbundled',
92+
'react-server-dom-webpack/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-webpack/client.node
9293
'react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-webpack/client.node
9394
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js',
9495
'react-server-dom-webpack/src/client/react-flight-dom-client.node.unbundled',
@@ -131,7 +132,8 @@ module.exports = [
131132
'react-server-dom-webpack/server.node',
132133
'react-server-dom-webpack/static',
133134
'react-server-dom-webpack/static.node',
134-
'react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node
135+
'react-server-dom-webpack/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-webpack/client.node
136+
'react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-webpack/client.node
135137
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js',
136138
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js',
137139
'react-server-dom-webpack/src/client/react-flight-dom-client.node',
@@ -176,6 +178,7 @@ module.exports = [
176178
'react-server-dom-turbopack/server.node',
177179
'react-server-dom-turbopack/static',
178180
'react-server-dom-turbopack/static.node',
181+
'react-server-dom-turbopack/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-turbopack/client.node
179182
'react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node
180183
'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js',
181184
'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer.js',
@@ -221,6 +224,7 @@ module.exports = [
221224
'react-server-dom-parcel/server.node',
222225
'react-server-dom-parcel/static',
223226
'react-server-dom-parcel/static.node',
227+
'react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-parcel/client.node
224228
'react-server-dom-parcel/src/client/ReactFlightDOMClientNode.js', // react-server-dom-parcel/client.node
225229
'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel.js',
226230
'react-server-dom-parcel/src/client/react-flight-dom-client.node',

0 commit comments

Comments
 (0)