@samitouri / QOS-React-2 / commits / 130095f76b

[Flight Parcel] Align with more recent changes (#31741)

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.

Sebastian Markbåge committed Dec 12, 2024 at 14:39 UTC 130095f76b7c0a90943fe8062afd1355a6d3188f
33 files changed +106 -249
packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-parcel.js
+1 -1
@@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';
12
13 export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
14 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';
16 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
17 export const usedWithSSR = false;
packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-parcel.js
+1 -1
@@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';
12
13 export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
14 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';
16 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
17 export const usedWithSSR = true;
packages/react-client/src/forks/ReactFlightClientConfig.dom-node-parcel.js
+1 -1
@@ -12,6 +12,6 @@ export const rendererPackageName = 'react-server-dom-parcel';
12
13 export * from 'react-client/src/ReactFlightClientStreamConfigNode';
14 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';
16 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
17 export const usedWithSSR = true;
packages/react-server-dom-esm/src/server/react-flight-dom-server.node.stable.js deleted
-20
@@ -1,20 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToPipeableStream,
12 - prerenderToNodeStream as unstable_prerenderToNodeStream,
13 - decodeReplyFromBusboy,
14 - decodeReply,
15 - decodeAction,
16 - decodeFormState,
17 - registerServerReference,
18 - registerClientReference,
19 - createTemporaryReferenceSet,
20 -} from './ReactFlightDOMServerNode';
packages/react-server-dom-parcel/npm/server.browser.js
+13 -2
@@ -1,7 +1,18 @@
1 'use strict';
2
3 +var s;
4 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');
6 } 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');
8 }
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;
packages/react-server-dom-parcel/npm/server.edge.js
+13 -2
@@ -1,7 +1,18 @@
1 'use strict';
2
3 +var s;
4 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');
6 } 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');
8 }
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;
packages/react-server-dom-parcel/npm/server.node.js
+14 -2
@@ -1,7 +1,19 @@
1 'use strict';
2
3 +var s;
4 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');
6 } 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');
8 }
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;
packages/react-server-dom-parcel/npm/static.browser.js new
+12
@@ -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 +}
packages/react-server-dom-parcel/npm/static.edge.js new
+12
@@ -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 +}
packages/react-server-dom-parcel/npm/static.js new
+6
@@ -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 +);
packages/react-server-dom-parcel/npm/static.node.js new
+12
@@ -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.node.production.js');
6 +} else {
7 + s = require('./cjs/react-server-dom-parcel-server.node.development.js');
8 +}
9 +
10 +if (s.unstable_prerenderToNodeStream) {
11 + exports.unstable_prerenderToNodeStream = s.unstable_prerenderToNodeStream;
12 +}
packages/react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel.js renamed
+2 -2
@@ -9,9 +9,9 @@
9
10 import type {Thenable} from 'shared/ReactTypes';
11
12 -import type {ImportMetadata} from './ReactFlightImportMetadata';
12 +import type {ImportMetadata} from '../shared/ReactFlightImportMetadata';
13
14 -import {ID, NAME, BUNDLES} from './ReactFlightImportMetadata';
14 +import {ID, NAME, BUNDLES} from '../shared/ReactFlightImportMetadata';
15
16 export type ServerManifest = {
17 [string]: Array<string>,
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js
+6 -1
@@ -10,7 +10,7 @@
10 import type {Thenable} from 'shared/ReactTypes.js';
11 import type {Response as FlightResponse} from 'react-client/src/ReactFlightClient';
12 import type {ReactServerValue} from 'react-client/src/ReactFlightReplyClient';
13 -import type {ServerReferenceId} from '../shared/ReactFlightClientConfigBundlerParcel';
13 +import type {ServerReferenceId} from '../client/ReactFlightClientConfigBundlerParcel';
14
15 import {
16 createResponse,
@@ -18,6 +18,7 @@ import {
18 reportGlobalError,
19 processBinaryChunk,
20 close,
21 + injectIntoDevTools,
22 } from 'react-client/src/ReactFlightClient';
23
24 import {
@@ -177,3 +178,7 @@ export function encodeReply(
178 }
179 });
180 }
181 +
182 +if (__DEV__) {
183 + injectIntoDevTools();
184 +}
packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js
+1 -1
@@ -15,7 +15,7 @@ import {
15 resolveServerReference,
16 type ServerManifest,
17 type ServerReferenceId,
18 -} from '../shared/ReactFlightClientConfigBundlerParcel';
18 +} from '../client/ReactFlightClientConfigBundlerParcel';
19
20 import {
21 createRequest,
packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js
+1 -1
@@ -15,7 +15,7 @@ import {
15 resolveServerReference,
16 type ServerManifest,
17 type ServerReferenceId,
18 -} from '../shared/ReactFlightClientConfigBundlerParcel';
18 +} from '../client/ReactFlightClientConfigBundlerParcel';
19
20 import {
21 createRequest,
packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js
+2 -2
@@ -18,7 +18,7 @@ import type {ReactFormState, Thenable} from 'shared/ReactTypes';
18 import type {
19 ServerManifest,
20 ServerReferenceId,
21 -} from '../shared/ReactFlightClientConfigBundlerParcel';
21 +} from '../client/ReactFlightClientConfigBundlerParcel';
22
23 import {Readable} from 'stream';
24 import {
@@ -49,7 +49,7 @@ import {
49 preloadModule,
50 requireModule,
51 resolveServerReference,
52 -} from '../shared/ReactFlightClientConfigBundlerParcel';
52 +} from '../client/ReactFlightClientConfigBundlerParcel';
53
54 export {
55 createClientReference,
packages/react-server-dom-parcel/src/server/react-flight-dom-server.browser.js
+1 -1
@@ -9,7 +9,7 @@
9
10 export {
11 renderToReadableStream,
12 - prerender,
12 + prerender as unstable_prerender,
13 decodeReply,
14 decodeAction,
15 decodeFormState,
packages/react-server-dom-parcel/src/server/react-flight-dom-server.browser.stable.js deleted
-20
@@ -1,20 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToReadableStream,
12 - decodeReply,
13 - decodeAction,
14 - decodeFormState,
15 - createClientReference,
16 - registerServerReference,
17 - createTemporaryReferenceSet,
18 - registerServerActions,
19 - loadServerAction,
20 -} from './ReactFlightDOMServerBrowser';
packages/react-server-dom-parcel/src/server/react-flight-dom-server.edge.js
+1 -1
@@ -9,7 +9,7 @@
9
10 export {
11 renderToReadableStream,
12 - prerender,
12 + prerender as unstable_prerender,
13 decodeReply,
14 decodeAction,
15 decodeFormState,
packages/react-server-dom-parcel/src/server/react-flight-dom-server.edge.stable.js deleted
-20
@@ -1,20 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToReadableStream,
12 - decodeReply,
13 - decodeAction,
14 - decodeFormState,
15 - createClientReference,
16 - registerServerReference,
17 - createTemporaryReferenceSet,
18 - registerServerActions,
19 - loadServerAction,
20 -} from './ReactFlightDOMServerEdge';
packages/react-server-dom-parcel/src/server/react-flight-dom-server.node.js
+1 -1
@@ -9,7 +9,7 @@
9
10 export {
11 renderToPipeableStream,
12 - prerenderToNodeStream,
12 + prerenderToNodeStream as unstable_prerenderToNodeStream,
13 decodeReplyFromBusboy,
14 decodeReply,
15 decodeAction,
packages/react-server-dom-parcel/src/server/react-flight-dom-server.node.stable.js deleted
-21
@@ -1,21 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToPipeableStream,
12 - decodeReplyFromBusboy,
13 - decodeReply,
14 - decodeAction,
15 - decodeFormState,
16 - createClientReference,
17 - registerServerReference,
18 - createTemporaryReferenceSet,
19 - registerServerActions,
20 - loadServerAction,
21 -} from './ReactFlightDOMServerNode';
packages/react-server-dom-parcel/static.browser.js
+1 -1
@@ -7,4 +7,4 @@
7 * @flow
8 */
9
10 -export {prerender} from './src/server/react-flight-dom-server.browser';
10 +export {unstable_prerender} from './src/server/react-flight-dom-server.browser';
packages/react-server-dom-parcel/static.edge.js
+1 -1
@@ -7,4 +7,4 @@
7 * @flow
8 */
9
10 -export {prerender} from './src/server/react-flight-dom-server.edge';
10 +export {unstable_prerender} from './src/server/react-flight-dom-server.edge';
packages/react-server-dom-parcel/static.node.js
+1 -1
@@ -7,4 +7,4 @@
7 * @flow
8 */
9
10 -export {prerenderToNodeStream} from './src/server/react-flight-dom-server.node';
10 +export {unstable_prerenderToNodeStream} from './src/server/react-flight-dom-server.node';
packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.stable.js deleted
-20
@@ -1,20 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToReadableStream,
12 - prerender as unstable_prerender,
13 - decodeReply,
14 - decodeAction,
15 - decodeFormState,
16 - registerServerReference,
17 - registerClientReference,
18 - createClientModuleProxy,
19 - createTemporaryReferenceSet,
20 -} from './ReactFlightDOMServerBrowser';
packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.stable.js deleted
-20
@@ -1,20 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToReadableStream,
12 - prerender as unstable_prerender,
13 - decodeReply,
14 - decodeAction,
15 - decodeFormState,
16 - registerServerReference,
17 - registerClientReference,
18 - createClientModuleProxy,
19 - createTemporaryReferenceSet,
20 -} from './ReactFlightDOMServerEdge';
packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.stable.js deleted
-21
@@ -1,21 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToPipeableStream,
12 - prerenderToNodeStream as unstable_prerenderToNodeStream,
13 - decodeReplyFromBusboy,
14 - decodeReply,
15 - decodeAction,
16 - decodeFormState,
17 - registerServerReference,
18 - registerClientReference,
19 - createClientModuleProxy,
20 - createTemporaryReferenceSet,
21 -} from './ReactFlightDOMServerNode';
packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.stable.js deleted
-20
@@ -1,20 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToReadableStream,
12 - prerender as unstable_prerender,
13 - decodeReply,
14 - decodeAction,
15 - decodeFormState,
16 - registerServerReference,
17 - registerClientReference,
18 - createClientModuleProxy,
19 - createTemporaryReferenceSet,
20 -} from './ReactFlightDOMServerBrowser';
packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.stable.js deleted
-20
@@ -1,20 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToReadableStream,
12 - prerender as unstable_prerender,
13 - decodeReply,
14 - decodeAction,
15 - decodeFormState,
16 - registerServerReference,
17 - registerClientReference,
18 - createClientModuleProxy,
19 - createTemporaryReferenceSet,
20 -} from './ReactFlightDOMServerEdge';
packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.stable.js deleted
-21
@@ -1,21 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToPipeableStream,
12 - prerenderToNodeStream as unstable_prerenderToNodeStream,
13 - decodeReplyFromBusboy,
14 - decodeReply,
15 - decodeAction,
16 - decodeFormState,
17 - registerServerReference,
18 - registerClientReference,
19 - createClientModuleProxy,
20 - createTemporaryReferenceSet,
21 -} from './ReactFlightDOMServerNode';
packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.stable.js deleted
-21
@@ -1,21 +0,0 @@
1 -/**
2 - * Copyright (c) Meta Platforms, Inc. and affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export {
11 - renderToPipeableStream,
12 - prerenderToNodeStream as unstable_prerenderToNodeStream,
13 - decodeReplyFromBusboy,
14 - decodeReply,
15 - decodeAction,
16 - decodeFormState,
17 - registerServerReference,
18 - registerClientReference,
19 - createClientModuleProxy,
20 - createTemporaryReferenceSet,
21 -} from './ReactFlightDOMServerNode';
scripts/shared/inlinedHostConfigs.js
+3 -3
@@ -217,7 +217,7 @@ module.exports = [
217 'react-server-dom-parcel/static',
218 'react-server-dom-parcel/static.node',
219 'react-server-dom-parcel/src/client/ReactFlightDOMClientNode.js', // react-server-dom-parcel/client.node
220 - 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel.js',
220 + 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel.js',
221 'react-server-dom-parcel/src/server/react-flight-dom-server.node',
222 'react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js', // react-server-dom-parcel/src/server/react-flight-dom-server.node
223 'react-server-dom-parcel/node-register',
@@ -335,7 +335,7 @@ module.exports = [
335 'react-server-dom-parcel/server.browser',
336 'react-server-dom-parcel/static.browser',
337 'react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js', // react-server-dom-parcel/client.browser
338 - 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel.js',
338 + 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel.js',
339 'react-server-dom-parcel/src/server/react-flight-dom-server.browser',
340 'react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js', // react-server-dom-parcel/src/server/react-flight-dom-server.browser
341 'react-devtools',
@@ -455,7 +455,7 @@ module.exports = [
455 'react-server-dom-parcel/server.edge',
456 'react-server-dom-parcel/static.edge',
457 'react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-parcel/client.edge
458 - 'react-server-dom-parcel/src/shared/ReactFlightClientConfigBundlerParcel.js',
458 + 'react-server-dom-parcel/src/client/ReactFlightClientConfigBundlerParcel.js',
459 'react-server-dom-parcel/src/server/react-flight-dom-server.edge',
460 'react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js', // react-server-dom-parcel/src/server/react-flight-dom-server.edge
461 'react-devtools',