From ea11ab407f0450408ae16c5ab7c99e56fd08b7b3 Mon Sep 17 00:00:00 2001 From: Josh Story Date: Wed, 14 Aug 2024 15:54:16 -0700 Subject: [PATCH] [Flight] reorganize code for forked entrypoints This commit updates the file locations and bulid configurations for flight in preparation for new static entrypoints. This follows a structure similar to Fizz which has a unified build but exports methods from different top level entrypoints. This PR doesn't actually add the new top level entrypoints however, that will arrive in a later update. --- ...ReactFlightClientConfig.dom-browser-esm.js | 4 +- ...lightClientConfig.dom-browser-turbopack.js | 6 +- .../ReactFlightClientConfig.dom-browser.js | 6 +- ...ctFlightClientConfig.dom-edge-turbopack.js | 6 +- ...eactFlightClientConfig.dom-edge-webpack.js | 6 +- .../ReactFlightClientConfig.dom-node-esm.js | 4 +- ...ClientConfig.dom-node-turbopack-bundled.js | 6 +- ...ctFlightClientConfig.dom-node-turbopack.js | 4 +- ...eactFlightClientConfig.dom-node-webpack.js | 6 +- .../forks/ReactFlightClientConfig.dom-node.js | 4 +- .../react-server-dom-esm/client.browser.js | 2 +- packages/react-server-dom-esm/client.node.js | 2 +- .../react-server-dom-esm/npm/server.node.js | 15 ++- packages/react-server-dom-esm/server.node.js | 11 ++- .../ReactFlightClientConfigBundlerESM.js | 0 ...ReactFlightClientConfigTargetESMBrowser.js | 0 .../ReactFlightClientConfigTargetESMServer.js | 0 .../ReactFlightDOMClientBrowser.js | 0 .../{ => client}/ReactFlightDOMClientNode.js | 0 .../{ => server}/ReactFlightDOMServerNode.js | 2 +- .../ReactFlightServerConfigESMBundler.js | 7 +- .../server/react-flight-dom-server.node.js | 20 ++++ .../react-flight-dom-server.node.stable.js | 19 ++++ .../client.browser.js | 2 +- .../react-server-dom-turbopack/client.edge.js | 2 +- .../react-server-dom-turbopack/client.node.js | 2 +- .../client.node.unbundled.js | 2 +- .../npm/server.browser.js | 14 ++- .../npm/server.edge.js | 14 ++- .../npm/server.node.js | 15 ++- .../npm/server.node.unbundled.js | 15 ++- .../server.browser.js | 11 ++- .../react-server-dom-turbopack/server.edge.js | 11 ++- .../react-server-dom-turbopack/server.node.js | 12 ++- .../server.node.unbundled.js | 12 ++- .../ReactFlightClientConfigBundlerNode.js | 4 +- ...ReactFlightClientConfigBundlerTurbopack.js | 4 +- ...ightClientConfigBundlerTurbopackBrowser.js | 0 ...lightClientConfigBundlerTurbopackServer.js | 0 ...lightClientConfigTargetTurbopackBrowser.js | 0 ...FlightClientConfigTargetTurbopackServer.js | 0 .../ReactFlightDOMClientBrowser.js | 0 .../{ => client}/ReactFlightDOMClientEdge.js | 0 .../{ => client}/ReactFlightDOMClientNode.js | 0 .../ReactFlightDOMServerBrowser.js | 2 +- .../{ => server}/ReactFlightDOMServerEdge.js | 2 +- .../{ => server}/ReactFlightDOMServerNode.js | 2 +- ...ReactFlightServerConfigTurbopackBundler.js | 6 +- .../server/react-flight-dom-server.browser.js | 20 ++++ .../react-flight-dom-server.browser.stable.js | 19 ++++ .../server/react-flight-dom-server.edge.js | 20 ++++ .../react-flight-dom-server.edge.stable.js | 19 ++++ .../server/react-flight-dom-server.node.js | 21 ++++ .../react-flight-dom-server.node.stable.js | 20 ++++ .../react-flight-dom-server.node.unbundled.js | 21 ++++ ...flight-dom-server.node.unbundled.stable.js | 20 ++++ .../client.browser.js | 2 +- .../react-server-dom-webpack/client.edge.js | 2 +- .../react-server-dom-webpack/client.node.js | 2 +- .../client.node.unbundled.js | 2 +- .../npm/server.browser.js | 14 ++- .../npm/server.edge.js | 14 ++- .../npm/server.node.js | 15 ++- .../npm/server.node.unbundled.js | 15 ++- .../server.browser.js | 11 ++- .../react-server-dom-webpack/server.edge.js | 11 ++- .../react-server-dom-webpack/server.node.js | 12 ++- .../server.node.unbundled.js | 12 ++- .../src/__tests__/ReactFlightDOM-test.js | 72 ++++++++++++++ .../ReactFlightClientConfigBundlerNode.js | 4 +- .../ReactFlightClientConfigBundlerWebpack.js | 4 +- ...FlightClientConfigBundlerWebpackBrowser.js | 0 ...tFlightClientConfigBundlerWebpackServer.js | 0 ...tFlightClientConfigTargetWebpackBrowser.js | 0 ...ctFlightClientConfigTargetWebpackServer.js | 0 .../ReactFlightDOMClientBrowser.js | 0 .../{ => client}/ReactFlightDOMClientEdge.js | 0 .../{ => client}/ReactFlightDOMClientNode.js | 0 .../ReactFlightDOMServerBrowser.js | 2 +- .../{ => server}/ReactFlightDOMServerEdge.js | 2 +- .../{ => server}/ReactFlightDOMServerNode.js | 2 +- .../ReactFlightServerConfigWebpackBundler.js | 6 +- .../server/react-flight-dom-server.browser.js | 20 ++++ .../react-flight-dom-server.browser.stable.js | 19 ++++ .../server/react-flight-dom-server.edge.js | 20 ++++ .../react-flight-dom-server.edge.stable.js | 19 ++++ .../server/react-flight-dom-server.node.js | 21 ++++ .../react-flight-dom-server.node.stable.js | 20 ++++ .../react-flight-dom-server.node.unbundled.js | 21 ++++ ...flight-dom-server.node.unbundled.stable.js | 20 ++++ ...ReactFlightServerConfig.dom-browser-esm.js | 2 +- ...lightServerConfig.dom-browser-turbopack.js | 2 +- .../ReactFlightServerConfig.dom-browser.js | 2 +- ...ctFlightServerConfig.dom-edge-turbopack.js | 2 +- .../forks/ReactFlightServerConfig.dom-edge.js | 2 +- .../ReactFlightServerConfig.dom-node-esm.js | 2 +- ...ctFlightServerConfig.dom-node-turbopack.js | 2 +- .../forks/ReactFlightServerConfig.dom-node.js | 2 +- scripts/rollup/bundles.js | 31 ++++-- scripts/shared/inlinedHostConfigs.js | 97 ++++++++++--------- 100 files changed, 783 insertions(+), 147 deletions(-) rename packages/react-server-dom-esm/src/{ => client}/ReactFlightClientConfigBundlerESM.js (100%) rename packages/react-server-dom-esm/src/{ => client}/ReactFlightClientConfigTargetESMBrowser.js (100%) rename packages/react-server-dom-esm/src/{ => client}/ReactFlightClientConfigTargetESMServer.js (100%) rename packages/react-server-dom-esm/src/{ => client}/ReactFlightDOMClientBrowser.js (100%) rename packages/react-server-dom-esm/src/{ => client}/ReactFlightDOMClientNode.js (100%) rename packages/react-server-dom-esm/src/{ => server}/ReactFlightDOMServerNode.js (99%) rename packages/react-server-dom-esm/src/{ => server}/ReactFlightServerConfigESMBundler.js (92%) create mode 100644 packages/react-server-dom-esm/src/server/react-flight-dom-server.node.js create mode 100644 packages/react-server-dom-esm/src/server/react-flight-dom-server.node.stable.js rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightClientConfigBundlerNode.js (97%) rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightClientConfigBundlerTurbopack.js (98%) rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightClientConfigBundlerTurbopackBrowser.js (100%) rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightClientConfigBundlerTurbopackServer.js (100%) rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightClientConfigTargetTurbopackBrowser.js (100%) rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightClientConfigTargetTurbopackServer.js (100%) rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightDOMClientBrowser.js (100%) rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightDOMClientEdge.js (100%) rename packages/react-server-dom-turbopack/src/{ => client}/ReactFlightDOMClientNode.js (100%) rename packages/react-server-dom-turbopack/src/{ => server}/ReactFlightDOMServerBrowser.js (98%) rename packages/react-server-dom-turbopack/src/{ => server}/ReactFlightDOMServerEdge.js (98%) rename packages/react-server-dom-turbopack/src/{ => server}/ReactFlightDOMServerNode.js (99%) rename packages/react-server-dom-turbopack/src/{ => server}/ReactFlightServerConfigTurbopackBundler.js (95%) create mode 100644 packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.js create mode 100644 packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.stable.js create mode 100644 packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.js create mode 100644 packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.stable.js create mode 100644 packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.js create mode 100644 packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.stable.js create mode 100644 packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.js create mode 100644 packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.stable.js rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightClientConfigBundlerNode.js (97%) rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightClientConfigBundlerWebpack.js (98%) rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightClientConfigBundlerWebpackBrowser.js (100%) rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightClientConfigBundlerWebpackServer.js (100%) rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightClientConfigTargetWebpackBrowser.js (100%) rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightClientConfigTargetWebpackServer.js (100%) rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightDOMClientBrowser.js (100%) rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightDOMClientEdge.js (100%) rename packages/react-server-dom-webpack/src/{ => client}/ReactFlightDOMClientNode.js (100%) rename packages/react-server-dom-webpack/src/{ => server}/ReactFlightDOMServerBrowser.js (98%) rename packages/react-server-dom-webpack/src/{ => server}/ReactFlightDOMServerEdge.js (98%) rename packages/react-server-dom-webpack/src/{ => server}/ReactFlightDOMServerNode.js (99%) rename packages/react-server-dom-webpack/src/{ => server}/ReactFlightServerConfigWebpackBundler.js (95%) create mode 100644 packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.js create mode 100644 packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.stable.js create mode 100644 packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.js create mode 100644 packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.stable.js create mode 100644 packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.js create mode 100644 packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.stable.js create mode 100644 packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.js create mode 100644 packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.stable.js diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-esm.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-esm.js index 7ae8d5f5cdc7d..55358ab05d10d 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-esm.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-esm.js @@ -9,7 +9,7 @@ export * from 'react-client/src/ReactFlightClientStreamConfigWeb'; export * from 'react-client/src/ReactClientConsoleConfigBrowser'; -export * from 'react-server-dom-esm/src/ReactFlightClientConfigBundlerESM'; -export * from 'react-server-dom-esm/src/ReactFlightClientConfigTargetESMBrowser'; +export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigBundlerESM'; +export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigTargetESMBrowser'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = false; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-turbopack.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-turbopack.js index 28e2489cf22bb..c3c511554ee6d 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-turbopack.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-turbopack.js @@ -9,8 +9,8 @@ export * from 'react-client/src/ReactFlightClientStreamConfigWeb'; export * from 'react-client/src/ReactClientConsoleConfigBrowser'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackBrowser'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackBrowser'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackBrowser'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackBrowser'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = false; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js index 3a5ec6800fd57..41bb93db386e8 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js @@ -9,8 +9,8 @@ export * from 'react-client/src/ReactFlightClientStreamConfigWeb'; export * from 'react-client/src/ReactClientConsoleConfigBrowser'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackBrowser'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackBrowser'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackBrowser'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackBrowser'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = false; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-turbopack.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-turbopack.js index c08af0a6531de..ac6d0933b7818 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-turbopack.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-turbopack.js @@ -9,8 +9,8 @@ export * from 'react-client/src/ReactFlightClientStreamConfigWeb'; export * from 'react-client/src/ReactClientConsoleConfigServer'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackServer'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackServer'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = true; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js index db8da42686215..eb17f259d3e19 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js @@ -9,8 +9,8 @@ export * from 'react-client/src/ReactFlightClientStreamConfigWeb'; export * from 'react-client/src/ReactClientConsoleConfigServer'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackServer'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackServer'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = true; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-esm.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-esm.js index bf2071d6fc864..9a17b9269a948 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-esm.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-esm.js @@ -9,7 +9,7 @@ export * from 'react-client/src/ReactFlightClientStreamConfigNode'; export * from 'react-client/src/ReactClientConsoleConfigServer'; -export * from 'react-server-dom-esm/src/ReactFlightClientConfigBundlerESM'; -export * from 'react-server-dom-esm/src/ReactFlightClientConfigTargetESMServer'; +export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigBundlerESM'; +export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigTargetESMServer'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = true; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack-bundled.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack-bundled.js index 16f649249dd37..f4226a93d86bc 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack-bundled.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack-bundled.js @@ -9,8 +9,8 @@ export * from 'react-client/src/ReactFlightClientStreamConfigNode'; export * from 'react-client/src/ReactClientConsoleConfigServer'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackServer'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackServer'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = true; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack.js index 68047af97b9f8..b6f2b77dd3686 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack.js @@ -9,7 +9,7 @@ export * from 'react-client/src/ReactFlightClientStreamConfigNode'; export * from 'react-client/src/ReactClientConsoleConfigServer'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerNode'; -export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackServer'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode'; +export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackServer'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = true; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js index 37a5322140a8a..ccc12228d837f 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js @@ -9,8 +9,8 @@ export * from 'react-client/src/ReactFlightClientStreamConfigNode'; export * from 'react-client/src/ReactClientConsoleConfigServer'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackServer'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackServer'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = true; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js index 867612c0ac2d7..3425787b6434a 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js @@ -9,7 +9,7 @@ export * from 'react-client/src/ReactFlightClientStreamConfigNode'; export * from 'react-client/src/ReactClientConsoleConfigServer'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerNode'; -export * from 'react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackServer'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode'; +export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackServer'; export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export const usedWithSSR = true; diff --git a/packages/react-server-dom-esm/client.browser.js b/packages/react-server-dom-esm/client.browser.js index 7d26c2771e50a..945ceed7f394a 100644 --- a/packages/react-server-dom-esm/client.browser.js +++ b/packages/react-server-dom-esm/client.browser.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientBrowser'; +export * from './src/client/ReactFlightDOMClientBrowser'; diff --git a/packages/react-server-dom-esm/client.node.js b/packages/react-server-dom-esm/client.node.js index 4f435353a20f0..c2e364f42f133 100644 --- a/packages/react-server-dom-esm/client.node.js +++ b/packages/react-server-dom-esm/client.node.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientNode'; +export * from './src/client/ReactFlightDOMClientNode'; diff --git a/packages/react-server-dom-esm/npm/server.node.js b/packages/react-server-dom-esm/npm/server.node.js index 0896fc96b3aca..6794e62196e6c 100644 --- a/packages/react-server-dom-esm/npm/server.node.js +++ b/packages/react-server-dom-esm/npm/server.node.js @@ -1,7 +1,18 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-esm-server.node.production.js'); + s = require('./cjs/react-server-dom-esm-server.node.production.js'); } else { - module.exports = require('./cjs/react-server-dom-esm-server.node.development.js'); + s = require('./cjs/react-server-dom-esm-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.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-esm/server.node.js b/packages/react-server-dom-esm/server.node.js index 7726b9bb929d4..6e644db0c7c79 100644 --- a/packages/react-server-dom-esm/server.node.js +++ b/packages/react-server-dom-esm/server.node.js @@ -7,4 +7,13 @@ * @flow */ -export * from './src/ReactFlightDOMServerNode'; +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.node'; diff --git a/packages/react-server-dom-esm/src/ReactFlightClientConfigBundlerESM.js b/packages/react-server-dom-esm/src/client/ReactFlightClientConfigBundlerESM.js similarity index 100% rename from packages/react-server-dom-esm/src/ReactFlightClientConfigBundlerESM.js rename to packages/react-server-dom-esm/src/client/ReactFlightClientConfigBundlerESM.js diff --git a/packages/react-server-dom-esm/src/ReactFlightClientConfigTargetESMBrowser.js b/packages/react-server-dom-esm/src/client/ReactFlightClientConfigTargetESMBrowser.js similarity index 100% rename from packages/react-server-dom-esm/src/ReactFlightClientConfigTargetESMBrowser.js rename to packages/react-server-dom-esm/src/client/ReactFlightClientConfigTargetESMBrowser.js diff --git a/packages/react-server-dom-esm/src/ReactFlightClientConfigTargetESMServer.js b/packages/react-server-dom-esm/src/client/ReactFlightClientConfigTargetESMServer.js similarity index 100% rename from packages/react-server-dom-esm/src/ReactFlightClientConfigTargetESMServer.js rename to packages/react-server-dom-esm/src/client/ReactFlightClientConfigTargetESMServer.js diff --git a/packages/react-server-dom-esm/src/ReactFlightDOMClientBrowser.js b/packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js similarity index 100% rename from packages/react-server-dom-esm/src/ReactFlightDOMClientBrowser.js rename to packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js diff --git a/packages/react-server-dom-esm/src/ReactFlightDOMClientNode.js b/packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js similarity index 100% rename from packages/react-server-dom-esm/src/ReactFlightDOMClientNode.js rename to packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js diff --git a/packages/react-server-dom-esm/src/ReactFlightDOMServerNode.js b/packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js similarity index 99% rename from packages/react-server-dom-esm/src/ReactFlightDOMServerNode.js rename to packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js index 9401cb67e8e47..c724d89c2b435 100644 --- a/packages/react-server-dom-esm/src/ReactFlightDOMServerNode.js +++ b/packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js @@ -45,7 +45,7 @@ import { export { registerServerReference, registerClientReference, -} from './ReactFlightESMReferences'; +} from '../ReactFlightESMReferences'; import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences'; diff --git a/packages/react-server-dom-esm/src/ReactFlightServerConfigESMBundler.js b/packages/react-server-dom-esm/src/server/ReactFlightServerConfigESMBundler.js similarity index 92% rename from packages/react-server-dom-esm/src/ReactFlightServerConfigESMBundler.js rename to packages/react-server-dom-esm/src/server/ReactFlightServerConfigESMBundler.js index 97e32eeef76b3..cba5223bcf7af 100644 --- a/packages/react-server-dom-esm/src/ReactFlightServerConfigESMBundler.js +++ b/packages/react-server-dom-esm/src/server/ReactFlightServerConfigESMBundler.js @@ -12,7 +12,7 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer'; import type { ClientReference, ServerReference, -} from './ReactFlightESMReferences'; +} from '../ReactFlightESMReferences'; export type {ClientReference, ServerReference}; @@ -27,7 +27,10 @@ export type ClientReferenceMetadata = [ export type ClientReferenceKey = string; -export {isClientReference, isServerReference} from './ReactFlightESMReferences'; +export { + isClientReference, + isServerReference, +} from '../ReactFlightESMReferences'; export function getClientReferenceKey( reference: ClientReference, diff --git a/packages/react-server-dom-esm/src/server/react-flight-dom-server.node.js b/packages/react-server-dom-esm/src/server/react-flight-dom-server.node.js new file mode 100644 index 0000000000000..f24946fcae8bb --- /dev/null +++ b/packages/react-server-dom-esm/src/server/react-flight-dom-server.node.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + prerenderToNodeStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-esm/src/server/react-flight-dom-server.node.stable.js b/packages/react-server-dom-esm/src/server/react-flight-dom-server.node.stable.js new file mode 100644 index 0000000000000..d14d2b8ed362a --- /dev/null +++ b/packages/react-server-dom-esm/src/server/react-flight-dom-server.node.stable.js @@ -0,0 +1,19 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-turbopack/client.browser.js b/packages/react-server-dom-turbopack/client.browser.js index 7d26c2771e50a..945ceed7f394a 100644 --- a/packages/react-server-dom-turbopack/client.browser.js +++ b/packages/react-server-dom-turbopack/client.browser.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientBrowser'; +export * from './src/client/ReactFlightDOMClientBrowser'; diff --git a/packages/react-server-dom-turbopack/client.edge.js b/packages/react-server-dom-turbopack/client.edge.js index fadceeaf8443a..0ba1d6b6b0457 100644 --- a/packages/react-server-dom-turbopack/client.edge.js +++ b/packages/react-server-dom-turbopack/client.edge.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientEdge'; +export * from './src/client/ReactFlightDOMClientEdge'; diff --git a/packages/react-server-dom-turbopack/client.node.js b/packages/react-server-dom-turbopack/client.node.js index 4f435353a20f0..c2e364f42f133 100644 --- a/packages/react-server-dom-turbopack/client.node.js +++ b/packages/react-server-dom-turbopack/client.node.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientNode'; +export * from './src/client/ReactFlightDOMClientNode'; diff --git a/packages/react-server-dom-turbopack/client.node.unbundled.js b/packages/react-server-dom-turbopack/client.node.unbundled.js index 4f435353a20f0..c2e364f42f133 100644 --- a/packages/react-server-dom-turbopack/client.node.unbundled.js +++ b/packages/react-server-dom-turbopack/client.node.unbundled.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientNode'; +export * from './src/client/ReactFlightDOMClientNode'; diff --git a/packages/react-server-dom-turbopack/npm/server.browser.js b/packages/react-server-dom-turbopack/npm/server.browser.js index 1d0364c5d392b..ec8d6b013e0bd 100644 --- a/packages/react-server-dom-turbopack/npm/server.browser.js +++ b/packages/react-server-dom-turbopack/npm/server.browser.js @@ -1,7 +1,17 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-turbopack-server.browser.production.js'); + s = require('./cjs/react-server-dom-turbopack-server.browser.production.js'); } else { - module.exports = require('./cjs/react-server-dom-turbopack-server.browser.development.js'); + s = require('./cjs/react-server-dom-turbopack-server.browser.development.js'); } + +exports.renderToReadableStream = s.renderToReadableStream; +exports.decodeReply = s.decodeReply; +exports.decodeAction = s.decodeAction; +exports.decodeFormState = s.decodeFormState; +exports.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-turbopack/npm/server.edge.js b/packages/react-server-dom-turbopack/npm/server.edge.js index c893cc3cdfa6e..e34b18fa0156a 100644 --- a/packages/react-server-dom-turbopack/npm/server.edge.js +++ b/packages/react-server-dom-turbopack/npm/server.edge.js @@ -1,7 +1,17 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-turbopack-server.edge.production.js'); + s = require('./cjs/react-server-dom-turbopack-server.edge.production.js'); } else { - module.exports = require('./cjs/react-server-dom-turbopack-server.edge.development.js'); + s = require('./cjs/react-server-dom-turbopack-server.edge.development.js'); } + +exports.renderToReadableStream = s.renderToReadableStream; +exports.decodeReply = s.decodeReply; +exports.decodeAction = s.decodeAction; +exports.decodeFormState = s.decodeFormState; +exports.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-turbopack/npm/server.node.js b/packages/react-server-dom-turbopack/npm/server.node.js index ac6128983dc6b..f9a4cf31f6e8c 100644 --- a/packages/react-server-dom-turbopack/npm/server.node.js +++ b/packages/react-server-dom-turbopack/npm/server.node.js @@ -1,7 +1,18 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-turbopack-server.node.production.js'); + s = require('./cjs/react-server-dom-turbopack-server.node.production.js'); } else { - module.exports = require('./cjs/react-server-dom-turbopack-server.node.development.js'); + s = require('./cjs/react-server-dom-turbopack-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.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-turbopack/npm/server.node.unbundled.js b/packages/react-server-dom-turbopack/npm/server.node.unbundled.js index 86f9dcdefb1d7..1e8648ccef133 100644 --- a/packages/react-server-dom-turbopack/npm/server.node.unbundled.js +++ b/packages/react-server-dom-turbopack/npm/server.node.unbundled.js @@ -1,7 +1,18 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-turbopack-server.node.unbundled.production.js'); + s = require('./cjs/react-server-dom-turbopack-server.node.unbundled.production.js'); } else { - module.exports = require('./cjs/react-server-dom-turbopack-server.node.unbundled.development.js'); + s = require('./cjs/react-server-dom-turbopack-server.node.unbundled.development.js'); } + +exports.renderToPipeableStream = s.renderToPipeableStream; +exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy; +exports.decodeReply = s.decodeReply; +exports.decodeAction = s.decodeAction; +exports.decodeFormState = s.decodeFormState; +exports.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-turbopack/server.browser.js b/packages/react-server-dom-turbopack/server.browser.js index 41a9fb5c44968..46f5b906104b6 100644 --- a/packages/react-server-dom-turbopack/server.browser.js +++ b/packages/react-server-dom-turbopack/server.browser.js @@ -7,4 +7,13 @@ * @flow */ -export * from './src/ReactFlightDOMServerBrowser'; +export { + renderToReadableStream, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.browser'; diff --git a/packages/react-server-dom-turbopack/server.edge.js b/packages/react-server-dom-turbopack/server.edge.js index 98f975cb4706f..c527c7f76a74f 100644 --- a/packages/react-server-dom-turbopack/server.edge.js +++ b/packages/react-server-dom-turbopack/server.edge.js @@ -7,4 +7,13 @@ * @flow */ -export * from './src/ReactFlightDOMServerEdge'; +export { + renderToReadableStream, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.edge'; diff --git a/packages/react-server-dom-turbopack/server.node.js b/packages/react-server-dom-turbopack/server.node.js index 7726b9bb929d4..7e511aa577cec 100644 --- a/packages/react-server-dom-turbopack/server.node.js +++ b/packages/react-server-dom-turbopack/server.node.js @@ -7,4 +7,14 @@ * @flow */ -export * from './src/ReactFlightDOMServerNode'; +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.node'; diff --git a/packages/react-server-dom-turbopack/server.node.unbundled.js b/packages/react-server-dom-turbopack/server.node.unbundled.js index 7726b9bb929d4..9b8455bf66877 100644 --- a/packages/react-server-dom-turbopack/server.node.unbundled.js +++ b/packages/react-server-dom-turbopack/server.node.unbundled.js @@ -7,4 +7,14 @@ * @flow */ -export * from './src/ReactFlightDOMServerNode'; +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.node.unbundled'; diff --git a/packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerNode.js b/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode.js similarity index 97% rename from packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerNode.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode.js index b2bf9b8ae0b53..36832c47e39ec 100644 --- a/packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerNode.js +++ b/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode.js @@ -13,7 +13,7 @@ import type { RejectedThenable, } from 'shared/ReactTypes'; -import type {ImportMetadata} from './shared/ReactFlightImportMetadata'; +import type {ImportMetadata} from '../shared/ReactFlightImportMetadata'; import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig'; import { @@ -21,7 +21,7 @@ import { CHUNKS, NAME, isAsyncImport, -} from './shared/ReactFlightImportMetadata'; +} from '../shared/ReactFlightImportMetadata'; import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig'; export type SSRModuleMap = { diff --git a/packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js b/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js similarity index 98% rename from packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js index b20ad69a408d6..212970222080f 100644 --- a/packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js +++ b/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js @@ -16,7 +16,7 @@ import type { import type { ImportMetadata, ImportManifestEntry, -} from './shared/ReactFlightImportMetadata'; +} from '../shared/ReactFlightImportMetadata'; import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig'; import { @@ -24,7 +24,7 @@ import { CHUNKS, NAME, isAsyncImport, -} from './shared/ReactFlightImportMetadata'; +} from '../shared/ReactFlightImportMetadata'; import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig'; diff --git a/packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackBrowser.js b/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackBrowser.js similarity index 100% rename from packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackBrowser.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackBrowser.js diff --git a/packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer.js b/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer.js similarity index 100% rename from packages/react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer.js diff --git a/packages/react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackBrowser.js b/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackBrowser.js similarity index 100% rename from packages/react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackBrowser.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackBrowser.js diff --git a/packages/react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackServer.js b/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackServer.js similarity index 100% rename from packages/react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackServer.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackServer.js diff --git a/packages/react-server-dom-turbopack/src/ReactFlightDOMClientBrowser.js b/packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientBrowser.js similarity index 100% rename from packages/react-server-dom-turbopack/src/ReactFlightDOMClientBrowser.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientBrowser.js diff --git a/packages/react-server-dom-turbopack/src/ReactFlightDOMClientEdge.js b/packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientEdge.js similarity index 100% rename from packages/react-server-dom-turbopack/src/ReactFlightDOMClientEdge.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientEdge.js diff --git a/packages/react-server-dom-turbopack/src/ReactFlightDOMClientNode.js b/packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js similarity index 100% rename from packages/react-server-dom-turbopack/src/ReactFlightDOMClientNode.js rename to packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js diff --git a/packages/react-server-dom-turbopack/src/ReactFlightDOMServerBrowser.js b/packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js similarity index 98% rename from packages/react-server-dom-turbopack/src/ReactFlightDOMServerBrowser.js rename to packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js index abaf6fe59d5cd..58a87992d6c6e 100644 --- a/packages/react-server-dom-turbopack/src/ReactFlightDOMServerBrowser.js +++ b/packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js @@ -35,7 +35,7 @@ export { registerServerReference, registerClientReference, createClientModuleProxy, -} from './ReactFlightTurbopackReferences'; +} from '../ReactFlightTurbopackReferences'; import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences'; diff --git a/packages/react-server-dom-turbopack/src/ReactFlightDOMServerEdge.js b/packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js similarity index 98% rename from packages/react-server-dom-turbopack/src/ReactFlightDOMServerEdge.js rename to packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js index abaf6fe59d5cd..58a87992d6c6e 100644 --- a/packages/react-server-dom-turbopack/src/ReactFlightDOMServerEdge.js +++ b/packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js @@ -35,7 +35,7 @@ export { registerServerReference, registerClientReference, createClientModuleProxy, -} from './ReactFlightTurbopackReferences'; +} from '../ReactFlightTurbopackReferences'; import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences'; diff --git a/packages/react-server-dom-turbopack/src/ReactFlightDOMServerNode.js b/packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js similarity index 99% rename from packages/react-server-dom-turbopack/src/ReactFlightDOMServerNode.js rename to packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js index 5398ac01b7a0b..d76bcb5759b0e 100644 --- a/packages/react-server-dom-turbopack/src/ReactFlightDOMServerNode.js +++ b/packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js @@ -46,7 +46,7 @@ export { registerServerReference, registerClientReference, createClientModuleProxy, -} from './ReactFlightTurbopackReferences'; +} from '../ReactFlightTurbopackReferences'; import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences'; diff --git a/packages/react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler.js b/packages/react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler.js similarity index 95% rename from packages/react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler.js rename to packages/react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler.js index 73a2819a8cebd..2ebc5d3f10421 100644 --- a/packages/react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler.js +++ b/packages/react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler.js @@ -11,12 +11,12 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer'; import type { ImportMetadata, ImportManifestEntry, -} from './shared/ReactFlightImportMetadata'; +} from '../shared/ReactFlightImportMetadata'; import type { ClientReference, ServerReference, -} from './ReactFlightTurbopackReferences'; +} from '../ReactFlightTurbopackReferences'; export type {ClientReference, ServerReference}; @@ -34,7 +34,7 @@ export type ClientReferenceKey = string; export { isClientReference, isServerReference, -} from './ReactFlightTurbopackReferences'; +} from '../ReactFlightTurbopackReferences'; export function getClientReferenceKey( reference: ClientReference, diff --git a/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.js b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.js new file mode 100644 index 0000000000000..d8373ec551bc0 --- /dev/null +++ b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToReadableStream, + prerender, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerBrowser'; diff --git a/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.stable.js b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.stable.js new file mode 100644 index 0000000000000..0100b65554aec --- /dev/null +++ b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.stable.js @@ -0,0 +1,19 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToReadableStream, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerBrowser'; diff --git a/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.js b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.js new file mode 100644 index 0000000000000..9521ba6b68841 --- /dev/null +++ b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToReadableStream, + prerender, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerEdge'; diff --git a/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.stable.js b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.stable.js new file mode 100644 index 0000000000000..eb887b73a8ae8 --- /dev/null +++ b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.stable.js @@ -0,0 +1,19 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToReadableStream, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerEdge'; diff --git a/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.js b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.js new file mode 100644 index 0000000000000..badc2ed50b691 --- /dev/null +++ b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.js @@ -0,0 +1,21 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + prerenderToNodeStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.stable.js b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.stable.js new file mode 100644 index 0000000000000..0d159704067ea --- /dev/null +++ b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.stable.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.js b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.js new file mode 100644 index 0000000000000..badc2ed50b691 --- /dev/null +++ b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.js @@ -0,0 +1,21 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + prerenderToNodeStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.stable.js b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.stable.js new file mode 100644 index 0000000000000..0d159704067ea --- /dev/null +++ b/packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.stable.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-webpack/client.browser.js b/packages/react-server-dom-webpack/client.browser.js index 7d26c2771e50a..945ceed7f394a 100644 --- a/packages/react-server-dom-webpack/client.browser.js +++ b/packages/react-server-dom-webpack/client.browser.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientBrowser'; +export * from './src/client/ReactFlightDOMClientBrowser'; diff --git a/packages/react-server-dom-webpack/client.edge.js b/packages/react-server-dom-webpack/client.edge.js index fadceeaf8443a..0ba1d6b6b0457 100644 --- a/packages/react-server-dom-webpack/client.edge.js +++ b/packages/react-server-dom-webpack/client.edge.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientEdge'; +export * from './src/client/ReactFlightDOMClientEdge'; diff --git a/packages/react-server-dom-webpack/client.node.js b/packages/react-server-dom-webpack/client.node.js index 4f435353a20f0..c2e364f42f133 100644 --- a/packages/react-server-dom-webpack/client.node.js +++ b/packages/react-server-dom-webpack/client.node.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientNode'; +export * from './src/client/ReactFlightDOMClientNode'; diff --git a/packages/react-server-dom-webpack/client.node.unbundled.js b/packages/react-server-dom-webpack/client.node.unbundled.js index 4f435353a20f0..c2e364f42f133 100644 --- a/packages/react-server-dom-webpack/client.node.unbundled.js +++ b/packages/react-server-dom-webpack/client.node.unbundled.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFlightDOMClientNode'; +export * from './src/client/ReactFlightDOMClientNode'; diff --git a/packages/react-server-dom-webpack/npm/server.browser.js b/packages/react-server-dom-webpack/npm/server.browser.js index 12fe5da29af0f..326cc56b6587b 100644 --- a/packages/react-server-dom-webpack/npm/server.browser.js +++ b/packages/react-server-dom-webpack/npm/server.browser.js @@ -1,7 +1,17 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-webpack-server.browser.production.js'); + s = require('./cjs/react-server-dom-webpack-server.browser.production.js'); } else { - module.exports = require('./cjs/react-server-dom-webpack-server.browser.development.js'); + s = require('./cjs/react-server-dom-webpack-server.browser.development.js'); } + +exports.renderToReadableStream = s.renderToReadableStream; +exports.decodeReply = s.decodeReply; +exports.decodeAction = s.decodeAction; +exports.decodeFormState = s.decodeFormState; +exports.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-webpack/npm/server.edge.js b/packages/react-server-dom-webpack/npm/server.edge.js index ceab7b1ea0626..591b84476884d 100644 --- a/packages/react-server-dom-webpack/npm/server.edge.js +++ b/packages/react-server-dom-webpack/npm/server.edge.js @@ -1,7 +1,17 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-webpack-server.edge.production.js'); + s = require('./cjs/react-server-dom-webpack-server.edge.production.js'); } else { - module.exports = require('./cjs/react-server-dom-webpack-server.edge.development.js'); + s = require('./cjs/react-server-dom-webpack-server.edge.development.js'); } + +exports.renderToReadableStream = s.renderToReadableStream; +exports.decodeReply = s.decodeReply; +exports.decodeAction = s.decodeAction; +exports.decodeFormState = s.decodeFormState; +exports.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-webpack/npm/server.node.js b/packages/react-server-dom-webpack/npm/server.node.js index 84da8eda2a247..6885e43a44fc0 100644 --- a/packages/react-server-dom-webpack/npm/server.node.js +++ b/packages/react-server-dom-webpack/npm/server.node.js @@ -1,7 +1,18 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-webpack-server.node.production.js'); + s = require('./cjs/react-server-dom-webpack-server.node.production.js'); } else { - module.exports = require('./cjs/react-server-dom-webpack-server.node.development.js'); + s = require('./cjs/react-server-dom-webpack-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.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-webpack/npm/server.node.unbundled.js b/packages/react-server-dom-webpack/npm/server.node.unbundled.js index 26e6677eed9bc..333b6b0d3122e 100644 --- a/packages/react-server-dom-webpack/npm/server.node.unbundled.js +++ b/packages/react-server-dom-webpack/npm/server.node.unbundled.js @@ -1,7 +1,18 @@ 'use strict'; +var s; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-server-dom-webpack-server.node.unbundled.production.js'); + s = require('./cjs/react-server-dom-webpack-server.node.unbundled.production.js'); } else { - module.exports = require('./cjs/react-server-dom-webpack-server.node.unbundled.development.js'); + s = require('./cjs/react-server-dom-webpack-server.node.unbundled.development.js'); } + +exports.renderToPipeableStream = s.renderToPipeableStream; +exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy; +exports.decodeReply = s.decodeReply; +exports.decodeAction = s.decodeAction; +exports.decodeFormState = s.decodeFormState; +exports.registerServerReference = s.registerServerReference; +exports.registerClientReference = s.registerClientReference; +exports.createClientModuleProxy = s.createClientModuleProxy; +exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet; diff --git a/packages/react-server-dom-webpack/server.browser.js b/packages/react-server-dom-webpack/server.browser.js index 41a9fb5c44968..46f5b906104b6 100644 --- a/packages/react-server-dom-webpack/server.browser.js +++ b/packages/react-server-dom-webpack/server.browser.js @@ -7,4 +7,13 @@ * @flow */ -export * from './src/ReactFlightDOMServerBrowser'; +export { + renderToReadableStream, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.browser'; diff --git a/packages/react-server-dom-webpack/server.edge.js b/packages/react-server-dom-webpack/server.edge.js index 98f975cb4706f..c527c7f76a74f 100644 --- a/packages/react-server-dom-webpack/server.edge.js +++ b/packages/react-server-dom-webpack/server.edge.js @@ -7,4 +7,13 @@ * @flow */ -export * from './src/ReactFlightDOMServerEdge'; +export { + renderToReadableStream, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.edge'; diff --git a/packages/react-server-dom-webpack/server.node.js b/packages/react-server-dom-webpack/server.node.js index 7726b9bb929d4..7e511aa577cec 100644 --- a/packages/react-server-dom-webpack/server.node.js +++ b/packages/react-server-dom-webpack/server.node.js @@ -7,4 +7,14 @@ * @flow */ -export * from './src/ReactFlightDOMServerNode'; +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.node'; diff --git a/packages/react-server-dom-webpack/server.node.unbundled.js b/packages/react-server-dom-webpack/server.node.unbundled.js index 7726b9bb929d4..9b8455bf66877 100644 --- a/packages/react-server-dom-webpack/server.node.unbundled.js +++ b/packages/react-server-dom-webpack/server.node.unbundled.js @@ -7,4 +7,14 @@ * @flow */ -export * from './src/ReactFlightDOMServerNode'; +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './src/server/react-flight-dom-server.node.unbundled'; diff --git a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js index 718ddf6c5716c..faaf8aef01b0d 100644 --- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js +++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js @@ -10,6 +10,7 @@ 'use strict'; import {patchSetImmediate} from '../../../../scripts/jest/patchSetImmediate'; +import {Readable} from 'stream'; // Polyfills for test environment global.ReadableStream = @@ -28,6 +29,7 @@ let React; let FlightReactDOM; let ReactDOMClient; let ReactServerDOMServer; +let ReactServerDOMStaticServer; let ReactServerDOMClient; let ReactDOMFizzServer; let ReactDOMStaticServer; @@ -59,12 +61,20 @@ describe('ReactFlightDOM', () => { jest.mock('react-server-dom-webpack/server', () => require('react-server-dom-webpack/server.node.unbundled'), ); + if (__EXPERIMENTAL__) { + jest.mock('react-server-dom-webpack/static', () => + require('react-server-dom-webpack/static.node.unbundled'), + ); + } const WebpackMock = require('./utils/WebpackMock'); clientExports = WebpackMock.clientExports; clientModuleError = WebpackMock.clientModuleError; webpackMap = WebpackMock.webpackMap; ReactServerDOMServer = require('react-server-dom-webpack/server'); + if (__EXPERIMENTAL__) { + ReactServerDOMStaticServer = require('react-server-dom-webpack/static'); + } // This reset is to load modules for the SSR/Browser scope. jest.unmock('react-server-dom-webpack/server'); @@ -2650,4 +2660,66 @@ describe('ReactFlightDOM', () => { , ); }); + + // @gate experimental + it('can prerender', async () => { + let resolveGreeting; + const greetingPromise = new Promise(resolve => { + resolveGreeting = resolve; + }); + + function App() { + return ( +
+ +
+ ); + } + + async function Greeting() { + await greetingPromise; + return 'hello world'; + } + + const {pendingResult} = await serverAct(async () => { + // destructure trick to avoid the act scope from awaiting the returned value + return { + pendingResult: ReactServerDOMStaticServer.prerenderToNodeStream( + , + webpackMap, + ), + }; + }); + + resolveGreeting(); + const {prelude} = await pendingResult; + + const response = ReactServerDOMClient.createFromReadableStream( + Readable.toWeb(prelude), + ); + + const {writable: fizzWritable, readable: fizzReadable} = getTestStream(); + + function ClientApp() { + return use(response); + } + + const shellErrors = []; + await serverAct(async () => { + ReactDOMFizzServer.renderToPipeableStream( + React.createElement(ClientApp), + { + onShellError(error) { + shellErrors.push(error.message); + }, + }, + ).pipe(fizzWritable); + }); + + expect(shellErrors).toEqual([]); + + const container = document.createElement('div'); + await readInto(container, fizzReadable); + expect(getMeaningfulChildren(container)).toEqual(
hello world
); + }); }); diff --git a/packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerNode.js b/packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js similarity index 97% rename from packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerNode.js rename to packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js index b2bf9b8ae0b53..36832c47e39ec 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerNode.js +++ b/packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js @@ -13,7 +13,7 @@ import type { RejectedThenable, } from 'shared/ReactTypes'; -import type {ImportMetadata} from './shared/ReactFlightImportMetadata'; +import type {ImportMetadata} from '../shared/ReactFlightImportMetadata'; import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig'; import { @@ -21,7 +21,7 @@ import { CHUNKS, NAME, isAsyncImport, -} from './shared/ReactFlightImportMetadata'; +} from '../shared/ReactFlightImportMetadata'; import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig'; export type SSRModuleMap = { diff --git a/packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js b/packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js similarity index 98% rename from packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js rename to packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js index 754578e8e7b7f..de3afd6c4e8b4 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js +++ b/packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js @@ -16,7 +16,7 @@ import type { import type { ImportMetadata, ImportManifestEntry, -} from './shared/ReactFlightImportMetadata'; +} from '../shared/ReactFlightImportMetadata'; import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig'; import { @@ -24,7 +24,7 @@ import { CHUNKS, NAME, isAsyncImport, -} from './shared/ReactFlightImportMetadata'; +} from '../shared/ReactFlightImportMetadata'; import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig'; diff --git a/packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackBrowser.js b/packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackBrowser.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackBrowser.js rename to packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackBrowser.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer.js b/packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer.js rename to packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackBrowser.js b/packages/react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackBrowser.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackBrowser.js rename to packages/react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackBrowser.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackServer.js b/packages/react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackServer.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackServer.js rename to packages/react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackServer.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMClientBrowser.js b/packages/react-server-dom-webpack/src/client/ReactFlightDOMClientBrowser.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightDOMClientBrowser.js rename to packages/react-server-dom-webpack/src/client/ReactFlightDOMClientBrowser.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMClientEdge.js b/packages/react-server-dom-webpack/src/client/ReactFlightDOMClientEdge.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightDOMClientEdge.js rename to packages/react-server-dom-webpack/src/client/ReactFlightDOMClientEdge.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMClientNode.js b/packages/react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightDOMClientNode.js rename to packages/react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js b/packages/react-server-dom-webpack/src/server/ReactFlightDOMServerBrowser.js similarity index 98% rename from packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js rename to packages/react-server-dom-webpack/src/server/ReactFlightDOMServerBrowser.js index 24b6018f82048..6a6f2936f846b 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js +++ b/packages/react-server-dom-webpack/src/server/ReactFlightDOMServerBrowser.js @@ -35,7 +35,7 @@ export { registerServerReference, registerClientReference, createClientModuleProxy, -} from './ReactFlightWebpackReferences'; +} from '../ReactFlightWebpackReferences'; import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences'; diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js b/packages/react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js similarity index 98% rename from packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js rename to packages/react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js index 24b6018f82048..6a6f2936f846b 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js +++ b/packages/react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js @@ -35,7 +35,7 @@ export { registerServerReference, registerClientReference, createClientModuleProxy, -} from './ReactFlightWebpackReferences'; +} from '../ReactFlightWebpackReferences'; import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences'; diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js b/packages/react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js similarity index 99% rename from packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js rename to packages/react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js index 81f64d2a6a989..73479bdf3ef04 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js +++ b/packages/react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js @@ -46,7 +46,7 @@ export { registerServerReference, registerClientReference, createClientModuleProxy, -} from './ReactFlightWebpackReferences'; +} from '../ReactFlightWebpackReferences'; import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences'; diff --git a/packages/react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler.js b/packages/react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler.js similarity index 95% rename from packages/react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler.js rename to packages/react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler.js index 49c17b168b96e..a0872b61fa475 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler.js +++ b/packages/react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler.js @@ -11,12 +11,12 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer'; import type { ImportMetadata, ImportManifestEntry, -} from './shared/ReactFlightImportMetadata'; +} from '../shared/ReactFlightImportMetadata'; import type { ClientReference, ServerReference, -} from './ReactFlightWebpackReferences'; +} from '../ReactFlightWebpackReferences'; export type {ClientReference, ServerReference}; @@ -34,7 +34,7 @@ export type ClientReferenceKey = string; export { isClientReference, isServerReference, -} from './ReactFlightWebpackReferences'; +} from '../ReactFlightWebpackReferences'; export function getClientReferenceKey( reference: ClientReference, diff --git a/packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.js b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.js new file mode 100644 index 0000000000000..d8373ec551bc0 --- /dev/null +++ b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToReadableStream, + prerender, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerBrowser'; diff --git a/packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.stable.js b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.stable.js new file mode 100644 index 0000000000000..0100b65554aec --- /dev/null +++ b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.stable.js @@ -0,0 +1,19 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToReadableStream, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerBrowser'; diff --git a/packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.js b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.js new file mode 100644 index 0000000000000..9521ba6b68841 --- /dev/null +++ b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToReadableStream, + prerender, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerEdge'; diff --git a/packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.stable.js b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.stable.js new file mode 100644 index 0000000000000..eb887b73a8ae8 --- /dev/null +++ b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.stable.js @@ -0,0 +1,19 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToReadableStream, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerEdge'; diff --git a/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.js b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.js new file mode 100644 index 0000000000000..badc2ed50b691 --- /dev/null +++ b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.js @@ -0,0 +1,21 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + prerenderToNodeStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.stable.js b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.stable.js new file mode 100644 index 0000000000000..0d159704067ea --- /dev/null +++ b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.stable.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.js b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.js new file mode 100644 index 0000000000000..badc2ed50b691 --- /dev/null +++ b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.js @@ -0,0 +1,21 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + prerenderToNodeStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.stable.js b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.stable.js new file mode 100644 index 0000000000000..0d159704067ea --- /dev/null +++ b/packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.stable.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +export { + renderToPipeableStream, + decodeReplyFromBusboy, + decodeReply, + decodeAction, + decodeFormState, + registerServerReference, + registerClientReference, + createClientModuleProxy, + createTemporaryReferenceSet, +} from './ReactFlightDOMServerNode'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-esm.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-esm.js index dc8ead927775a..634b5cd939a7f 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-esm.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-esm.js @@ -10,7 +10,7 @@ import type {Request} from 'react-server/src/ReactFlightServer'; import type {ReactComponentInfo} from 'shared/ReactTypes'; -export * from 'react-server-dom-esm/src/ReactFlightServerConfigESMBundler'; +export * from 'react-server-dom-esm/src/server/ReactFlightServerConfigESMBundler'; export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; export const supportsRequestStorage = false; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-turbopack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-turbopack.js index 256eafd6c41a6..6b4493f49b24e 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-turbopack.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-turbopack.js @@ -10,7 +10,7 @@ import type {Request} from 'react-server/src/ReactFlightServer'; import type {ReactComponentInfo} from 'shared/ReactTypes'; -export * from 'react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler'; +export * from 'react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler'; export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; export const supportsRequestStorage = false; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js index 6715ccbbafe20..c2b55995b6f1f 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js @@ -10,7 +10,7 @@ import type {Request} from 'react-server/src/ReactFlightServer'; import type {ReactComponentInfo} from 'shared/ReactTypes'; -export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; +export * from 'react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler'; export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; export const supportsRequestStorage = false; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-turbopack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-turbopack.js index ffca2eca98dc8..bcaca19284469 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-turbopack.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-turbopack.js @@ -9,7 +9,7 @@ import type {Request} from 'react-server/src/ReactFlightServer'; import type {ReactComponentInfo} from 'shared/ReactTypes'; -export * from 'react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler'; +export * from 'react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler'; export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; // For now, we get this from the global scope, but this will likely move to a module. diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js index fb6d0039f79ed..e16f8cfb2ec57 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js @@ -10,7 +10,7 @@ import type {Request} from 'react-server/src/ReactFlightServer'; import type {ReactComponentInfo} from 'shared/ReactTypes'; -export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; +export * from 'react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler'; export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; // For now, we get this from the global scope, but this will likely move to a module. diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-esm.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-esm.js index a3393bc1c3034..52602b1eb2848 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-esm.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-esm.js @@ -12,7 +12,7 @@ import {AsyncLocalStorage} from 'async_hooks'; import type {Request} from 'react-server/src/ReactFlightServer'; import type {ReactComponentInfo} from 'shared/ReactTypes'; -export * from 'react-server-dom-esm/src/ReactFlightServerConfigESMBundler'; +export * from 'react-server-dom-esm/src/server/ReactFlightServerConfigESMBundler'; export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; export const supportsRequestStorage = true; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-turbopack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-turbopack.js index d3f4258625d77..0205daab10853 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-turbopack.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-turbopack.js @@ -12,7 +12,7 @@ import {AsyncLocalStorage} from 'async_hooks'; import type {Request} from 'react-server/src/ReactFlightServer'; import type {ReactComponentInfo} from 'shared/ReactTypes'; -export * from 'react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler'; +export * from 'react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler'; export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; export const supportsRequestStorage = true; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js index 48ca5af07c278..0cd21ac7257b9 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js @@ -12,7 +12,7 @@ import {AsyncLocalStorage} from 'async_hooks'; import type {Request} from 'react-server/src/ReactFlightServer'; import type {ReactComponentInfo} from 'shared/ReactTypes'; -export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; +export * from 'react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler'; export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; export const supportsRequestStorage = true; diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index d17db8976390e..3484aad53af09 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -392,7 +392,9 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-webpack/server.browser', + entry: + 'react-server-dom-webpack/src/server/react-flight-dom-server.browser', + name: 'react-server-dom-webpack-server.browser', condition: 'react-server', global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, @@ -402,7 +404,8 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-webpack/server.node', + entry: 'react-server-dom-webpack/src/server/react-flight-dom-server.node', + name: 'react-server-dom-webpack-server.node', condition: 'react-server', global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, @@ -412,7 +415,9 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-webpack/server.node.unbundled', + entry: + 'react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled', + name: 'react-server-dom-webpack-server.node.unbundled', condition: 'react-server', global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, @@ -422,7 +427,8 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-webpack/server.edge', + entry: 'react-server-dom-webpack/src/server/react-flight-dom-server.edge', + name: 'react-server-dom-webpack-server.edge', condition: 'react-server', global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, @@ -508,7 +514,9 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-turbopack/server.browser', + entry: + 'react-server-dom-turbopack/src/server/react-flight-dom-server.browser', + name: 'react-server-dom-turbopack-server.browser', condition: 'react-server', global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, @@ -518,7 +526,8 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-turbopack/server.node', + entry: 'react-server-dom-turbopack/src/server/react-flight-dom-server.node', + name: 'react-server-dom-turbopack-server.node', condition: 'react-server', global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, @@ -528,7 +537,9 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-turbopack/server.node.unbundled', + entry: + 'react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled', + name: 'react-server-dom-turbopack-server.node.unbundled', condition: 'react-server', global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, @@ -538,7 +549,8 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-turbopack/server.edge', + entry: 'react-server-dom-turbopack/src/server/react-flight-dom-server.edge', + name: 'react-server-dom-turbopack-server.edge', condition: 'react-server', global: 'ReactServerDOMServer', minifyWithProdErrorCodes: false, @@ -617,7 +629,8 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-server-dom-esm/server.node', + entry: 'react-server-dom-esm/src/server/react-flight-dom-server.node', + name: 'react-server-dom-esm-server.node', condition: 'react-server', minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: false, diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js index b9d6b22f4f019..ae6a1e6e9478e 100644 --- a/scripts/shared/inlinedHostConfigs.js +++ b/scripts/shared/inlinedHostConfigs.js @@ -19,8 +19,8 @@ module.exports = [ 'react-dom/static.node', 'react-dom/test-utils', 'react-dom/unstable_server-external-runtime', - 'react-server-dom-webpack/server.node.unbundled', 'react-server-dom-webpack/client.node.unbundled', + 'react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled', ], paths: [ 'react-dom', @@ -43,9 +43,10 @@ module.exports = [ 'react-server-dom-webpack/client.node.unbundled', 'react-server-dom-webpack/server', 'react-server-dom-webpack/server.node.unbundled', - 'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.node - 'react-server-dom-webpack/src/ReactFlightDOMClientNode.js', // react-server-dom-webpack/client.node - 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerNode.js', + 'react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-webpack/client.node + 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js', + 'react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled', + 'react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-webpack/src/server/react-flight-dom-server.node 'react-devtools', 'react-devtools-core', 'react-devtools-shell', @@ -59,8 +60,8 @@ module.exports = [ { shortName: 'dom-node-webpack', entryPoints: [ - 'react-server-dom-webpack/server.node', 'react-server-dom-webpack/client.node', + 'react-server-dom-webpack/src/server/react-flight-dom-server.node', ], paths: [ 'react-dom', @@ -81,9 +82,10 @@ module.exports = [ 'react-server-dom-webpack/client.node', 'react-server-dom-webpack/server', 'react-server-dom-webpack/server.node', - 'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.node - 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js', - 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer.js', + 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js', + 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js', + 'react-server-dom-webpack/src/server/react-flight-dom-server.node', + 'react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-webpack/src/server/react-flight-dom-server.node 'react-server-dom-webpack/node-register', 'react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js', 'react-devtools', @@ -99,8 +101,8 @@ module.exports = [ { shortName: 'dom-node-turbopack', entryPoints: [ - 'react-server-dom-turbopack/server.node.unbundled', 'react-server-dom-turbopack/client.node.unbundled', + 'react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled', ], paths: [ 'react-dom', @@ -121,9 +123,10 @@ module.exports = [ 'react-server-dom-turbopack/client.node.unbundled', 'react-server-dom-turbopack/server', 'react-server-dom-turbopack/server.node.unbundled', - 'react-server-dom-turbopack/src/ReactFlightDOMServerNode.js', // react-server-dom-turbopack/server.node.unbundled - 'react-server-dom-turbopack/src/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node.unbundled - 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerNode.js', + 'react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node.unbundled + 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode.js', + 'react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled', + 'react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled 'react-server-dom-turbopack/node-register', 'react-server-dom-turbopack/src/ReactFlightTurbopackNodeRegister.js', 'react-devtools', @@ -139,8 +142,8 @@ module.exports = [ { shortName: 'dom-node-turbopack-bundled', entryPoints: [ - 'react-server-dom-turbopack/server.node', 'react-server-dom-turbopack/client.node', + 'react-server-dom-turbopack/src/server/react-flight-dom-server.node', ], paths: [ 'react-dom', @@ -161,10 +164,11 @@ module.exports = [ 'react-server-dom-turbopack/client.node', 'react-server-dom-turbopack/server', 'react-server-dom-turbopack/server.node', - 'react-server-dom-turbopack/src/ReactFlightDOMServerNode.js', // react-server-dom-turbopack/server.node - 'react-server-dom-turbopack/src/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node - 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js', - 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer.js', + 'react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node + 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js', + 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer.js', + 'react-server-dom-turbopack/src/server/react-flight-dom-server.node', + 'react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-turbopack/src/server/react-flight-dom-server.node 'react-server-dom-turbopack/node-register', 'react-server-dom-turbopack/src/ReactFlightTurbopackNodeRegister.js', 'react-devtools', @@ -212,8 +216,8 @@ module.exports = [ 'react-dom/src/server/react-dom-server.browser.js', 'react-dom/static.browser', 'react-dom/unstable_server-external-runtime', - 'react-server-dom-webpack/server.browser', 'react-server-dom-webpack/client.browser', + 'react-server-dom-webpack/src/server/react-flight-dom-server.browser', ], paths: [ 'react-dom', @@ -234,10 +238,11 @@ module.exports = [ 'react-server-dom-webpack/client', 'react-server-dom-webpack/client.browser', 'react-server-dom-webpack/server.browser', - 'react-server-dom-webpack/src/ReactFlightDOMClientBrowser.js', // react-server-dom-webpack/client.browser - 'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/server.browser - 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js', - 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackBrowser.js', + 'react-server-dom-webpack/src/client/ReactFlightDOMClientBrowser.js', // react-server-dom-webpack/client.browser + 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js', + 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackBrowser.js', + 'react-server-dom-webpack/src/server/react-flight-dom-server.browser', + 'react-server-dom-webpack/src/server/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/src/server/react-flight-dom-server.browser 'react-devtools', 'react-devtools-core', 'react-devtools-shell', @@ -264,7 +269,7 @@ module.exports = [ 'react-server-dom-esm', 'react-server-dom-esm/client', 'react-server-dom-esm/client.browser', - 'react-server-dom-esm/src/ReactFlightDOMClientBrowser.js', // react-server-dom-esm/client.browser + 'react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js', // react-server-dom-esm/client.browser 'react-devtools', 'react-devtools-core', 'react-devtools-shell', @@ -278,7 +283,7 @@ module.exports = [ shortName: 'dom-browser-turbopack', entryPoints: [ 'react-server-dom-turbopack/client.browser', - 'react-server-dom-turbopack/server.browser', + 'react-server-dom-turbopack/src/server/react-flight-dom-server.browser', ], paths: [ 'react-dom', @@ -287,17 +292,18 @@ module.exports = [ 'react-dom/server', 'react-dom/server.node', 'react-dom-bindings', + 'react-dom-bindings/src/server/ReactDOMFlightServerHostDispatcher.js', + 'react-dom-bindings/src/server/ReactFlightServerConfigDOM.js', + 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js', 'react-server-dom-turbopack', 'react-server-dom-turbopack/client', 'react-server-dom-turbopack/client.browser', 'react-server-dom-turbopack/server.browser', - 'react-server-dom-turbopack/src/ReactFlightDOMClientBrowser.js', // react-server-dom-turbopack/client.browser - 'react-server-dom-turbopack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-turbopack/server.browser - 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js', - 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackBrowser.js', - 'react-dom-bindings/src/server/ReactDOMFlightServerHostDispatcher.js', - 'react-dom-bindings/src/server/ReactFlightServerConfigDOM.js', - 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js', + 'react-server-dom-turbopack/src/client/ReactFlightDOMClientBrowser.js', // react-server-dom-turbopack/client.browser + 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js', + 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackBrowser.js', + 'react-server-dom-turbopack/src/server/react-flight-dom-server.browser', + 'react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js', // react-server-dom-turbopack/src/server/react-flight-dom-server.browser 'react-devtools', 'react-devtools-core', 'react-devtools-shell', @@ -312,8 +318,8 @@ module.exports = [ entryPoints: [ 'react-dom/src/server/react-dom-server.edge.js', 'react-dom/static.edge', - 'react-server-dom-webpack/server.edge', 'react-server-dom-webpack/client.edge', + 'react-server-dom-webpack/src/server/react-flight-dom-server.edge', ], paths: [ 'react-dom', @@ -333,10 +339,11 @@ module.exports = [ 'react-server-dom-webpack', 'react-server-dom-webpack/client.edge', 'react-server-dom-webpack/server.edge', - 'react-server-dom-webpack/src/ReactFlightDOMClientEdge.js', // react-server-dom-webpack/client.edge - 'react-server-dom-webpack/src/ReactFlightDOMServerEdge.js', // react-server-dom-webpack/server.edge - 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js', - 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer.js', + 'react-server-dom-webpack/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-webpack/client.edge + 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js', + 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js', + 'react-server-dom-webpack/src/server/react-flight-dom-server.edge', + 'react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js', // react-server-dom-webpack/src/server/react-flight-dom-server.edge 'react-devtools', 'react-devtools-core', 'react-devtools-shell', @@ -350,8 +357,8 @@ module.exports = [ { shortName: 'dom-edge-turbopack', entryPoints: [ - 'react-server-dom-turbopack/server.edge', 'react-server-dom-turbopack/client.edge', + 'react-server-dom-turbopack/src/server/react-flight-dom-server.edge', ], paths: [ 'react-dom', @@ -371,10 +378,11 @@ module.exports = [ 'react-server-dom-turbopack', 'react-server-dom-turbopack/client.edge', 'react-server-dom-turbopack/server.edge', - 'react-server-dom-turbopack/src/ReactFlightDOMClientEdge.js', // react-server-dom-turbopack/client.edge - 'react-server-dom-turbopack/src/ReactFlightDOMServerEdge.js', // react-server-dom-turbopack/server.edge - 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js', - 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer.js', + 'react-server-dom-turbopack/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-turbopack/client.edge + 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js', + 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer.js', + 'react-server-dom-turbopack/src/server/react-flight-dom-server.edge', + 'react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js', // react-server-dom-turbopack/src/server/react-flight-dom-server.edge 'react-devtools', 'react-devtools-core', 'react-devtools-shell', @@ -388,8 +396,8 @@ module.exports = [ { shortName: 'dom-node-esm', entryPoints: [ - 'react-server-dom-esm/server.node', 'react-server-dom-esm/client.node', + 'react-server-dom-esm/src/server/react-flight-dom-server.node', ], paths: [ 'react-dom', @@ -411,8 +419,9 @@ module.exports = [ 'react-server-dom-esm/client.node', 'react-server-dom-esm/server', 'react-server-dom-esm/server.node', - 'react-server-dom-esm/src/ReactFlightDOMServerNode.js', // react-server-dom-esm/server.node - 'react-server-dom-esm/src/ReactFlightDOMClientNode.js', // react-server-dom-esm/client.node + 'react-server-dom-esm/src/client/ReactFlightDOMClientNode.js', // react-server-dom-esm/client.node + 'react-server-dom-esm/src/server/react-flight-dom-server.node', + 'react-server-dom-esm/src/server/ReactFlightDOMServerNode.js', // react-server-dom-esm/src/server/react-flight-dom-server.node 'react-devtools', 'react-devtools-core', 'react-devtools-shell',