Skip to content

Commit 130095f

Browse files
authored
[Flight Parcel] Align with more recent changes (facebook#31741)
Follow up to facebook#31725. I diffed against the Turbopack one to find any unexpected discrepancies. Some parts are forked enough that it's hard to diff but I think I got most of it.
1 parent e854ce3 commit 130095f

33 files changed

Lines changed: 106 additions & 249 deletions

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-parcel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';
1212

1313
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1414
export * from 'react-client/src/ReactClientConsoleConfigBrowser';
15-
export * from 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel';
15+
export * from 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel';
1616
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
1717
export const usedWithSSR = false;

packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-parcel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';
1212

1313
export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
1414
export * from 'react-client/src/ReactClientConsoleConfigServer';
15-
export * from 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel';
15+
export * from 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel';
1616
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
1717
export const usedWithSSR = true;

packages/react-client/src/forks/ReactFlightClientConfig.dom-node-parcel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';
1212

1313
export * from 'react-client/src/ReactFlightClientStreamConfigNode';
1414
export * from 'react-client/src/ReactClientConsoleConfigServer';
15-
export * from 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel';
15+
export * from 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel';
1616
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
1717
export const usedWithSSR = true;

packages/react-server-dom-esm/src/server/react-flight-dom-server.node.stable.js

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
'use strict';
22

3+
var s;
34
if (process.env.NODE_ENV === 'production') {
4-
module.exports = require('./cjs/react-server-dom-parcel-server.browser.production.js');
5+
s = require('./cjs/react-server-dom-parcel-server.browser.production.js');
56
} else {
6-
module.exports = require('./cjs/react-server-dom-parcel-server.browser.development.js');
7+
s = require('./cjs/react-server-dom-parcel-server.browser.development.js');
78
}
9+
10+
exports.renderToReadableStream = s.renderToReadableStream;
11+
exports.decodeReply = s.decodeReply;
12+
exports.decodeAction = s.decodeAction;
13+
exports.decodeFormState = s.decodeFormState;
14+
exports.createClientReference = s.createClientReference;
15+
exports.registerServerReference = s.registerServerReference;
16+
exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;
17+
exports.registerServerActions = s.registerServerActions;
18+
exports.loadServerAction = s.loadServerAction;
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
'use strict';
22

3+
var s;
34
if (process.env.NODE_ENV === 'production') {
4-
module.exports = require('./cjs/react-server-dom-parcel-server.edge.production.js');
5+
s = require('./cjs/react-server-dom-parcel-server.edge.production.js');
56
} else {
6-
module.exports = require('./cjs/react-server-dom-parcel-server.edge.development.js');
7+
s = require('./cjs/react-server-dom-parcel-server.edge.development.js');
78
}
9+
10+
exports.renderToReadableStream = s.renderToReadableStream;
11+
exports.decodeReply = s.decodeReply;
12+
exports.decodeAction = s.decodeAction;
13+
exports.decodeFormState = s.decodeFormState;
14+
exports.createClientReference = s.createClientReference;
15+
exports.registerServerReference = s.registerServerReference;
16+
exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;
17+
exports.registerServerActions = s.registerServerActions;
18+
exports.loadServerAction = s.loadServerAction;
Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
'use strict';
22

3+
var s;
34
if (process.env.NODE_ENV === 'production') {
4-
module.exports = require('./cjs/react-server-dom-parcel-server.node.production.js');
5+
s = require('./cjs/react-server-dom-parcel-server.node.production.js');
56
} else {
6-
module.exports = require('./cjs/react-server-dom-parcel-server.node.development.js');
7+
s = require('./cjs/react-server-dom-parcel-server.node.development.js');
78
}
9+
10+
exports.renderToPipeableStream = s.renderToPipeableStream;
11+
exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy;
12+
exports.decodeReply = s.decodeReply;
13+
exports.decodeAction = s.decodeAction;
14+
exports.decodeFormState = s.decodeFormState;
15+
exports.createClientReference = s.createClientReference;
16+
exports.registerServerReference = s.registerServerReference;
17+
exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;
18+
exports.registerServerActions = s.registerServerActions;
19+
exports.loadServerAction = s.loadServerAction;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
'use strict';
2+
3+
var s;
4+
if (process.env.NODE_ENV === 'production') {
5+
s = require('./cjs/react-server-dom-parcel-server.browser.production.js');
6+
} else {
7+
s = require('./cjs/react-server-dom-parcel-server.browser.development.js');
8+
}
9+
10+
if (s.unstable_prerender) {
11+
exports.unstable_prerender = s.unstable_prerender;
12+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
'use strict';
2+
3+
var s;
4+
if (process.env.NODE_ENV === 'production') {
5+
s = require('./cjs/react-server-dom-parcel-server.edge.production.js');
6+
} else {
7+
s = require('./cjs/react-server-dom-parcel-server.edge.development.js');
8+
}
9+
10+
if (s.unstable_prerender) {
11+
exports.unstable_prerender = s.unstable_prerender;
12+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
'use strict';
2+
3+
throw new Error(
4+
'The React Server Writer cannot be used outside a react-server environment. ' +
5+
'You must configure Node.js using the `--conditions react-server` flag.'
6+
);

0 commit comments

Comments
 (0)