Skip to content

Commit

Permalink
[Flight Parcel] Align with more recent changes (#31741)
Browse files Browse the repository at this point in the history
Follow up to #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.
  • Loading branch information
sebmarkbage authored Dec 12, 2024
1 parent e854ce3 commit 130095f
Show file tree
Hide file tree
Showing 33 changed files with 106 additions and 249 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';

export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
export * from 'react-client/src/ReactClientConsoleConfigBrowser';
export * from 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel';
export * from 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel';
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
export const usedWithSSR = false;
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';

export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
export * from 'react-client/src/ReactClientConsoleConfigServer';
export * from 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel';
export * from 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel';
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
export const usedWithSSR = true;
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';

export * from 'react-client/src/ReactFlightClientStreamConfigNode';
export * from 'react-client/src/ReactClientConsoleConfigServer';
export * from 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel';
export * from 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel';
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
export const usedWithSSR = true;

This file was deleted.

15 changes: 13 additions & 2 deletions packages/react-server-dom-parcel/npm/server.browser.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
'use strict';

var s;
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-server-dom-parcel-server.browser.production.js');
s = require('./cjs/react-server-dom-parcel-server.browser.production.js');
} else {
module.exports = require('./cjs/react-server-dom-parcel-server.browser.development.js');
s = require('./cjs/react-server-dom-parcel-server.browser.development.js');
}

exports.renderToReadableStream = s.renderToReadableStream;
exports.decodeReply = s.decodeReply;
exports.decodeAction = s.decodeAction;
exports.decodeFormState = s.decodeFormState;
exports.createClientReference = s.createClientReference;
exports.registerServerReference = s.registerServerReference;
exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;
exports.registerServerActions = s.registerServerActions;
exports.loadServerAction = s.loadServerAction;
15 changes: 13 additions & 2 deletions packages/react-server-dom-parcel/npm/server.edge.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
'use strict';

var s;
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-server-dom-parcel-server.edge.production.js');
s = require('./cjs/react-server-dom-parcel-server.edge.production.js');
} else {
module.exports = require('./cjs/react-server-dom-parcel-server.edge.development.js');
s = require('./cjs/react-server-dom-parcel-server.edge.development.js');
}

exports.renderToReadableStream = s.renderToReadableStream;
exports.decodeReply = s.decodeReply;
exports.decodeAction = s.decodeAction;
exports.decodeFormState = s.decodeFormState;
exports.createClientReference = s.createClientReference;
exports.registerServerReference = s.registerServerReference;
exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;
exports.registerServerActions = s.registerServerActions;
exports.loadServerAction = s.loadServerAction;
16 changes: 14 additions & 2 deletions packages/react-server-dom-parcel/npm/server.node.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
'use strict';

var s;
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-server-dom-parcel-server.node.production.js');
s = require('./cjs/react-server-dom-parcel-server.node.production.js');
} else {
module.exports = require('./cjs/react-server-dom-parcel-server.node.development.js');
s = require('./cjs/react-server-dom-parcel-server.node.development.js');
}

exports.renderToPipeableStream = s.renderToPipeableStream;
exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy;
exports.decodeReply = s.decodeReply;
exports.decodeAction = s.decodeAction;
exports.decodeFormState = s.decodeFormState;
exports.createClientReference = s.createClientReference;
exports.registerServerReference = s.registerServerReference;
exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;
exports.registerServerActions = s.registerServerActions;
exports.loadServerAction = s.loadServerAction;
12 changes: 12 additions & 0 deletions packages/react-server-dom-parcel/npm/static.browser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use strict';

var s;
if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-parcel-server.browser.production.js');
} else {
s = require('./cjs/react-server-dom-parcel-server.browser.development.js');
}

if (s.unstable_prerender) {
exports.unstable_prerender = s.unstable_prerender;
}
12 changes: 12 additions & 0 deletions packages/react-server-dom-parcel/npm/static.edge.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use strict';

var s;
if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-parcel-server.edge.production.js');
} else {
s = require('./cjs/react-server-dom-parcel-server.edge.development.js');
}

if (s.unstable_prerender) {
exports.unstable_prerender = s.unstable_prerender;
}
6 changes: 6 additions & 0 deletions packages/react-server-dom-parcel/npm/static.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
'use strict';

throw new Error(
'The React Server Writer cannot be used outside a react-server environment. ' +
'You must configure Node.js using the `--conditions react-server` flag.'
);
12 changes: 12 additions & 0 deletions packages/react-server-dom-parcel/npm/static.node.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use strict';

var s;
if (process.env.NODE_ENV === 'production') {
s = require('./cjs/react-server-dom-parcel-server.node.production.js');
} else {
s = require('./cjs/react-server-dom-parcel-server.node.development.js');
}

if (s.unstable_prerenderToNodeStream) {
exports.unstable_prerenderToNodeStream = s.unstable_prerenderToNodeStream;
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import type {Thenable} from 'shared/ReactTypes';

import type {ImportMetadata} from './ReactFlightImportMetadata';
import type {ImportMetadata} from '../shared/ReactFlightImportMetadata';

import {ID, NAME, BUNDLES} from './ReactFlightImportMetadata';
import {ID, NAME, BUNDLES} from '../shared/ReactFlightImportMetadata';

export type ServerManifest = {
[string]: Array<string>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
import type {Thenable} from 'shared/ReactTypes.js';
import type {Response as FlightResponse} from 'react-client/src/ReactFlightClient';
import type {ReactServerValue} from 'react-client/src/ReactFlightReplyClient';
import type {ServerReferenceId} from '../shared/ReactFlightClientConfigBundlerParcel';
import type {ServerReferenceId} from '../client/ReactFlightClientConfigBundlerParcel';

import {
createResponse,
getRoot,
reportGlobalError,
processBinaryChunk,
close,
injectIntoDevTools,
} from 'react-client/src/ReactFlightClient';

import {
Expand Down Expand Up @@ -177,3 +178,7 @@ export function encodeReply(
}
});
}

if (__DEV__) {
injectIntoDevTools();
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
resolveServerReference,
type ServerManifest,
type ServerReferenceId,
} from '../shared/ReactFlightClientConfigBundlerParcel';
} from '../client/ReactFlightClientConfigBundlerParcel';

import {
createRequest,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
resolveServerReference,
type ServerManifest,
type ServerReferenceId,
} from '../shared/ReactFlightClientConfigBundlerParcel';
} from '../client/ReactFlightClientConfigBundlerParcel';

import {
createRequest,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type {ReactFormState, Thenable} from 'shared/ReactTypes';
import type {
ServerManifest,
ServerReferenceId,
} from '../shared/ReactFlightClientConfigBundlerParcel';
} from '../client/ReactFlightClientConfigBundlerParcel';

import {Readable} from 'stream';
import {
Expand Down Expand Up @@ -49,7 +49,7 @@ import {
preloadModule,
requireModule,
resolveServerReference,
} from '../shared/ReactFlightClientConfigBundlerParcel';
} from '../client/ReactFlightClientConfigBundlerParcel';

export {
createClientReference,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToReadableStream,
prerender,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToReadableStream,
prerender,
prerender as unstable_prerender,
decodeReply,
decodeAction,
decodeFormState,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

export {
renderToPipeableStream,
prerenderToNodeStream,
prerenderToNodeStream as unstable_prerenderToNodeStream,
decodeReplyFromBusboy,
decodeReply,
decodeAction,
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion packages/react-server-dom-parcel/static.browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export {prerender} from './src/server/react-flight-dom-server.browser';
export {unstable_prerender} from './src/server/react-flight-dom-server.browser';
2 changes: 1 addition & 1 deletion packages/react-server-dom-parcel/static.edge.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export {prerender} from './src/server/react-flight-dom-server.edge';
export {unstable_prerender} from './src/server/react-flight-dom-server.edge';
2 changes: 1 addition & 1 deletion packages/react-server-dom-parcel/static.node.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export {prerenderToNodeStream} from './src/server/react-flight-dom-server.node';
export {unstable_prerenderToNodeStream} from './src/server/react-flight-dom-server.node';

This file was deleted.

This file was deleted.

Loading

0 comments on commit 130095f

Please sign in to comment.