From 4db2bf32327165feef6fad1272cebccb6344251a Mon Sep 17 00:00:00 2001 From: Josh Story Date: Mon, 10 Apr 2023 11:00:53 -0700 Subject: [PATCH 1/5] Normalize ReactFlightServerConfig and related files Normalize ReactFligthClientConfig and related files --- packages/react-client/src/ReactFlightClient.js | 4 ++-- ...lientHostConfig.js => ReactFlightClientConfig.js} | 0 ...gBrowser.js => ReactFlightClientConfigBrowser.js} | 0 ...oStream.js => ReactFlightClientConfigNoStream.js} | 0 ...tConfigNode.js => ReactFlightClientConfigNode.js} | 0 ...figStream.js => ReactFlightClientConfigStream.js} | 2 +- packages/react-client/src/ReactFlightClientStream.js | 6 +++--- ...g.custom.js => ReactFlightClientConfig.custom.js} | 0 .../src/forks/ReactFlightClientConfig.dom-browser.js | 12 ++++++++++++ ...dom-bun.js => ReactFlightClientConfig.dom-bun.js} | 4 ++-- .../ReactFlightClientConfig.dom-edge-webpack.js | 12 ++++++++++++ .../src/forks/ReactFlightClientConfig.dom-legacy.js | 12 ++++++++++++ .../ReactFlightClientConfig.dom-node-webpack.js | 12 ++++++++++++ .../src/forks/ReactFlightClientConfig.dom-node.js | 12 ++++++++++++ ...relay.js => ReactFlightClientConfig.dom-relay.js} | 4 ++-- ...ay.js => ReactFlightClientConfig.native-relay.js} | 4 ++-- .../forks/ReactFlightClientHostConfig.dom-browser.js | 12 ------------ .../ReactFlightClientHostConfig.dom-edge-webpack.js | 12 ------------ .../forks/ReactFlightClientHostConfig.dom-legacy.js | 12 ------------ .../ReactFlightClientHostConfig.dom-node-webpack.js | 12 ------------ .../forks/ReactFlightClientHostConfig.dom-node.js | 12 ------------ .../src/server/ReactFlightServerConfigNative.js | 10 ++++++++++ ...tConfig.js => ReactFlightClientConfigDOMRelay.js} | 0 .../src/ReactFlightDOMRelayServer.js | 2 +- ...tConfig.js => ReactFlightServerConfigDOMRelay.js} | 0 ...nfig.js => ReactFlightClientConfigNodeBundler.js} | 0 ...g.js => ReactFlightClientConfigWebpackBundler.js} | 0 .../src/ReactFlightDOMClientEdge.js | 2 +- .../src/ReactFlightDOMClientNode.js | 2 +- .../src/ReactFlightDOMServerBrowser.js | 4 ++-- .../src/ReactFlightDOMServerEdge.js | 4 ++-- .../src/ReactFlightDOMServerNode.js | 4 ++-- ...g.js => ReactFlightServerConfigWebpackBundler.js} | 0 ...nfig.js => ReactFlightClientConfigNativeRelay.js} | 0 .../src/ReactFlightNativeRelayServer.js | 2 +- ...nfig.js => ReactFlightServerConfigNativeRelay.js} | 0 packages/react-server/src/ReactFlightReplyServer.js | 4 ++-- ...om.js => ReactFlightServerConfigBundlerCustom.js} | 0 .../src/forks/ReactFlightServerConfig.custom.js | 4 +++- .../src/forks/ReactFlightServerConfig.dom-browser.js | 2 +- .../src/forks/ReactFlightServerConfig.dom-bun.js | 2 +- .../ReactFlightServerConfig.dom-edge-webpack.js | 2 +- .../src/forks/ReactFlightServerConfig.dom-legacy.js | 2 +- .../ReactFlightServerConfig.dom-node-webpack.js | 2 +- .../src/forks/ReactFlightServerConfig.dom-node.js | 2 +- .../src/forks/ReactFlightServerConfig.dom-relay.js | 2 +- .../forks/ReactFlightServerConfig.native-relay.js | 3 ++- scripts/flow/createFlowConfigs.js | 2 +- scripts/jest/setupHostConfigs.js | 9 ++++----- scripts/rollup/forks.js | 6 +++--- 50 files changed, 114 insertions(+), 102 deletions(-) rename packages/react-client/src/{ReactFlightClientHostConfig.js => ReactFlightClientConfig.js} (100%) rename packages/react-client/src/{ReactFlightClientHostConfigBrowser.js => ReactFlightClientConfigBrowser.js} (100%) rename packages/react-client/src/{ReactFlightClientHostConfigNoStream.js => ReactFlightClientConfigNoStream.js} (100%) rename packages/react-client/src/{ReactFlightClientHostConfigNode.js => ReactFlightClientConfigNode.js} (100%) rename packages/react-client/src/{ReactFlightClientHostConfigStream.js => ReactFlightClientConfigStream.js} (89%) rename packages/react-client/src/forks/{ReactFlightClientHostConfig.custom.js => ReactFlightClientConfig.custom.js} (100%) create mode 100644 packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js rename packages/react-client/src/forks/{ReactFlightClientHostConfig.dom-bun.js => ReactFlightClientConfig.dom-bun.js} (83%) create mode 100644 packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js create mode 100644 packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js create mode 100644 packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js create mode 100644 packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js rename packages/react-client/src/forks/{ReactFlightClientHostConfig.dom-relay.js => ReactFlightClientConfig.dom-relay.js} (60%) rename packages/react-client/src/forks/{ReactFlightClientHostConfig.native-relay.js => ReactFlightClientConfig.native-relay.js} (58%) delete mode 100644 packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js delete mode 100644 packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge-webpack.js delete mode 100644 packages/react-client/src/forks/ReactFlightClientHostConfig.dom-legacy.js delete mode 100644 packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js delete mode 100644 packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node.js create mode 100644 packages/react-native-renderer/src/server/ReactFlightServerConfigNative.js rename packages/react-server-dom-relay/src/{ReactFlightDOMRelayClientHostConfig.js => ReactFlightClientConfigDOMRelay.js} (100%) rename packages/react-server-dom-relay/src/{ReactFlightDOMRelayServerHostConfig.js => ReactFlightServerConfigDOMRelay.js} (100%) rename packages/react-server-dom-webpack/src/{ReactFlightClientNodeBundlerConfig.js => ReactFlightClientConfigNodeBundler.js} (100%) rename packages/react-server-dom-webpack/src/{ReactFlightClientWebpackBundlerConfig.js => ReactFlightClientConfigWebpackBundler.js} (100%) rename packages/react-server-dom-webpack/src/{ReactFlightServerWebpackBundlerConfig.js => ReactFlightServerConfigWebpackBundler.js} (100%) rename packages/react-server-native-relay/src/{ReactFlightNativeRelayClientHostConfig.js => ReactFlightClientConfigNativeRelay.js} (100%) rename packages/react-server-native-relay/src/{ReactFlightNativeRelayServerHostConfig.js => ReactFlightServerConfigNativeRelay.js} (100%) rename packages/react-server/src/{ReactFlightServerBundlerConfigCustom.js => ReactFlightServerConfigBundlerCustom.js} (100%) diff --git a/packages/react-client/src/ReactFlightClient.js b/packages/react-client/src/ReactFlightClient.js index 32fb4f1c907db..e14b6a7699951 100644 --- a/packages/react-client/src/ReactFlightClient.js +++ b/packages/react-client/src/ReactFlightClient.js @@ -16,14 +16,14 @@ import type { UninitializedModel, Response, SSRManifest, -} from './ReactFlightClientHostConfig'; +} from './ReactFlightClientConfig'; import { resolveClientReference, preloadModule, requireModule, parseModel, -} from './ReactFlightClientHostConfig'; +} from './ReactFlightClientConfig'; import {knownServerReferences} from './ReactFlightServerReferenceRegistry'; diff --git a/packages/react-client/src/ReactFlightClientHostConfig.js b/packages/react-client/src/ReactFlightClientConfig.js similarity index 100% rename from packages/react-client/src/ReactFlightClientHostConfig.js rename to packages/react-client/src/ReactFlightClientConfig.js diff --git a/packages/react-client/src/ReactFlightClientHostConfigBrowser.js b/packages/react-client/src/ReactFlightClientConfigBrowser.js similarity index 100% rename from packages/react-client/src/ReactFlightClientHostConfigBrowser.js rename to packages/react-client/src/ReactFlightClientConfigBrowser.js diff --git a/packages/react-client/src/ReactFlightClientHostConfigNoStream.js b/packages/react-client/src/ReactFlightClientConfigNoStream.js similarity index 100% rename from packages/react-client/src/ReactFlightClientHostConfigNoStream.js rename to packages/react-client/src/ReactFlightClientConfigNoStream.js diff --git a/packages/react-client/src/ReactFlightClientHostConfigNode.js b/packages/react-client/src/ReactFlightClientConfigNode.js similarity index 100% rename from packages/react-client/src/ReactFlightClientHostConfigNode.js rename to packages/react-client/src/ReactFlightClientConfigNode.js diff --git a/packages/react-client/src/ReactFlightClientHostConfigStream.js b/packages/react-client/src/ReactFlightClientConfigStream.js similarity index 89% rename from packages/react-client/src/ReactFlightClientHostConfigStream.js rename to packages/react-client/src/ReactFlightClientConfigStream.js index 1a06961a1109e..62a8b248d78c7 100644 --- a/packages/react-client/src/ReactFlightClientHostConfigStream.js +++ b/packages/react-client/src/ReactFlightClientConfigStream.js @@ -8,7 +8,7 @@ */ import type {ResponseBase} from './ReactFlightClient'; -import type {StringDecoder} from './ReactFlightClientHostConfig'; +import type {StringDecoder} from './ReactFlightClientConfig'; export type Response = ResponseBase & { _partialRow: string, diff --git a/packages/react-client/src/ReactFlightClientStream.js b/packages/react-client/src/ReactFlightClientStream.js index 56772ec4a42b3..81633e696696d 100644 --- a/packages/react-client/src/ReactFlightClientStream.js +++ b/packages/react-client/src/ReactFlightClientStream.js @@ -8,8 +8,8 @@ */ import type {CallServerCallback} from './ReactFlightClient'; -import type {Response} from './ReactFlightClientHostConfigStream'; -import type {SSRManifest} from './ReactFlightClientHostConfig'; +import type {Response} from './ReactFlightClientConfigStream'; +import type {SSRManifest} from './ReactFlightClientConfig'; import { resolveModule, @@ -26,7 +26,7 @@ import { readFinalStringChunk, supportsBinaryStreams, createStringDecoder, -} from './ReactFlightClientHostConfig'; +} from './ReactFlightClientConfig'; export type {Response}; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.custom.js b/packages/react-client/src/forks/ReactFlightClientConfig.custom.js similarity index 100% rename from packages/react-client/src/forks/ReactFlightClientHostConfig.custom.js rename to packages/react-client/src/forks/ReactFlightClientConfig.custom.js diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js new file mode 100644 index 0000000000000..4abcda77430d1 --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js @@ -0,0 +1,12 @@ +/** + * 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 * from 'react-client/src/ReactFlightClientConfigBrowser'; +export * from 'react-client/src/ReactFlightClientConfigStream'; +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler'; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js similarity index 83% rename from packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js rename to packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js index 28a1f34997f91..fa2084f946ff6 100644 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js @@ -7,8 +7,8 @@ * @flow */ -export * from 'react-client/src/ReactFlightClientHostConfigBrowser'; -export * from 'react-client/src/ReactFlightClientHostConfigStream'; +export * from 'react-client/src/ReactFlightClientConfigBrowser'; +export * from 'react-client/src/ReactFlightClientConfigStream'; export type Response = any; export opaque type SSRManifest = mixed; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js new file mode 100644 index 0000000000000..4abcda77430d1 --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js @@ -0,0 +1,12 @@ +/** + * 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 * from 'react-client/src/ReactFlightClientConfigBrowser'; +export * from 'react-client/src/ReactFlightClientConfigStream'; +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler'; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js new file mode 100644 index 0000000000000..4abcda77430d1 --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js @@ -0,0 +1,12 @@ +/** + * 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 * from 'react-client/src/ReactFlightClientConfigBrowser'; +export * from 'react-client/src/ReactFlightClientConfigStream'; +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler'; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js new file mode 100644 index 0000000000000..a70684ccd226e --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js @@ -0,0 +1,12 @@ +/** + * 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 * from 'react-client/src/ReactFlightClientConfigNode'; +export * from 'react-client/src/ReactFlightClientConfigStream'; +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler'; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js new file mode 100644 index 0000000000000..b2aeaf25dd0a6 --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js @@ -0,0 +1,12 @@ +/** + * 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 * from 'react-client/src/ReactFlightClientConfigNode'; +export * from 'react-client/src/ReactFlightClientConfigStream'; +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler'; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js similarity index 60% rename from packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js rename to packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js index ccde93cb29597..e59ffbe0725b6 100644 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js @@ -7,5 +7,5 @@ * @flow */ -export * from 'react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig'; -export * from '../ReactFlightClientHostConfigNoStream'; +export * from 'react-server-dom-relay/src/ReactFlightClientConfigDOMRelay'; +export * from '../ReactFlightClientConfigNoStream'; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js b/packages/react-client/src/forks/ReactFlightClientConfig.native-relay.js similarity index 58% rename from packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js rename to packages/react-client/src/forks/ReactFlightClientConfig.native-relay.js index 7916d16829d04..b0110b5ffe687 100644 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.native-relay.js @@ -7,5 +7,5 @@ * @flow */ -export * from 'react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig'; -export * from '../ReactFlightClientHostConfigNoStream'; +export * from 'react-server-native-relay/src/ReactFlightClientConfigNativeRelay'; +export * from '../ReactFlightClientConfigNoStream'; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js deleted file mode 100644 index 4aae8141fd56e..0000000000000 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * 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 * from 'react-client/src/ReactFlightClientHostConfigBrowser'; -export * from 'react-client/src/ReactFlightClientHostConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig'; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge-webpack.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge-webpack.js deleted file mode 100644 index 4aae8141fd56e..0000000000000 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge-webpack.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * 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 * from 'react-client/src/ReactFlightClientHostConfigBrowser'; -export * from 'react-client/src/ReactFlightClientHostConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig'; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-legacy.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-legacy.js deleted file mode 100644 index 4aae8141fd56e..0000000000000 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-legacy.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * 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 * from 'react-client/src/ReactFlightClientHostConfigBrowser'; -export * from 'react-client/src/ReactFlightClientHostConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig'; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js deleted file mode 100644 index 8b9b2defedff5..0000000000000 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * 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 * from 'react-client/src/ReactFlightClientHostConfigNode'; -export * from 'react-client/src/ReactFlightClientHostConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig'; diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node.js deleted file mode 100644 index 5c20adb286414..0000000000000 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * 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 * from 'react-client/src/ReactFlightClientHostConfigNode'; -export * from 'react-client/src/ReactFlightClientHostConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightClientNodeBundlerConfig'; diff --git a/packages/react-native-renderer/src/server/ReactFlightServerConfigNative.js b/packages/react-native-renderer/src/server/ReactFlightServerConfigNative.js new file mode 100644 index 0000000000000..cc92e90d8b342 --- /dev/null +++ b/packages/react-native-renderer/src/server/ReactFlightServerConfigNative.js @@ -0,0 +1,10 @@ +/** + * 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 const isPrimaryRenderer = true; diff --git a/packages/react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js b/packages/react-server-dom-relay/src/ReactFlightClientConfigDOMRelay.js similarity index 100% rename from packages/react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js rename to packages/react-server-dom-relay/src/ReactFlightClientConfigDOMRelay.js diff --git a/packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js b/packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js index 7ecd37cca3c69..e5255fbf894a9 100644 --- a/packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js +++ b/packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js @@ -11,7 +11,7 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer'; import type { ClientManifest, Destination, -} from './ReactFlightDOMRelayServerHostConfig'; +} from './ReactFlightServerConfigDOMRelay'; import { createRequest, diff --git a/packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js b/packages/react-server-dom-relay/src/ReactFlightServerConfigDOMRelay.js similarity index 100% rename from packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js rename to packages/react-server-dom-relay/src/ReactFlightServerConfigDOMRelay.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightClientNodeBundlerConfig.js b/packages/react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightClientNodeBundlerConfig.js rename to packages/react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js b/packages/react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js rename to packages/react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler.js diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMClientEdge.js b/packages/react-server-dom-webpack/src/ReactFlightDOMClientEdge.js index 9a68b21f6c63a..3cab54060c5ba 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightDOMClientEdge.js +++ b/packages/react-server-dom-webpack/src/ReactFlightDOMClientEdge.js @@ -11,7 +11,7 @@ import type {Thenable} from 'shared/ReactTypes.js'; import type {Response as FlightResponse} from 'react-client/src/ReactFlightClientStream'; -import type {SSRManifest} from './ReactFlightClientWebpackBundlerConfig'; +import type {SSRManifest} from './ReactFlightClientConfigWebpackBundler'; import { createResponse, diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMClientNode.js b/packages/react-server-dom-webpack/src/ReactFlightDOMClientNode.js index 09502a7bf5479..aff48cf073777 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightDOMClientNode.js +++ b/packages/react-server-dom-webpack/src/ReactFlightDOMClientNode.js @@ -11,7 +11,7 @@ import type {Thenable} from 'shared/ReactTypes.js'; import type {Response} from 'react-client/src/ReactFlightClientStream'; -import type {SSRManifest} from 'react-client/src/ReactFlightClientHostConfig'; +import type {SSRManifest} from 'react-client/src/ReactFlightClientConfig'; import type {Readable} from 'stream'; diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js b/packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js index 5884f18cb30cb..d549c10693c55 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js +++ b/packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js @@ -9,8 +9,8 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer'; import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes'; -import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig'; -import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig'; +import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler'; +import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig'; import { createRequest, diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js b/packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js index 5884f18cb30cb..d549c10693c55 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js +++ b/packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js @@ -9,8 +9,8 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer'; import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes'; -import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig'; -import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig'; +import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler'; +import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig'; import { createRequest, diff --git a/packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js b/packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js index f2653dca98c46..98d4291de9847 100644 --- a/packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js +++ b/packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js @@ -12,8 +12,8 @@ import type { ReactClientValue, } from 'react-server/src/ReactFlightServer'; import type {Destination} from 'react-server/src/ReactServerStreamConfigNode'; -import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig'; -import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig'; +import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler'; +import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig'; import type {Busboy} from 'busboy'; import type {Writable} from 'stream'; import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes'; diff --git a/packages/react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js b/packages/react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler.js similarity index 100% rename from packages/react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js rename to packages/react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler.js diff --git a/packages/react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig.js b/packages/react-server-native-relay/src/ReactFlightClientConfigNativeRelay.js similarity index 100% rename from packages/react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig.js rename to packages/react-server-native-relay/src/ReactFlightClientConfigNativeRelay.js diff --git a/packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js b/packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js index 5e049368f72f2..c3cc85c1cce9f 100644 --- a/packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js +++ b/packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js @@ -11,7 +11,7 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer'; import type { ClientManifest, Destination, -} from './ReactFlightNativeRelayServerHostConfig'; +} from './ReactFlightServerConfigNativeRelay'; import { createRequest, diff --git a/packages/react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig.js b/packages/react-server-native-relay/src/ReactFlightServerConfigNativeRelay.js similarity index 100% rename from packages/react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig.js rename to packages/react-server-native-relay/src/ReactFlightServerConfigNativeRelay.js diff --git a/packages/react-server/src/ReactFlightReplyServer.js b/packages/react-server/src/ReactFlightReplyServer.js index 83318c418df28..7c7dce1e0e9e9 100644 --- a/packages/react-server/src/ReactFlightReplyServer.js +++ b/packages/react-server/src/ReactFlightReplyServer.js @@ -16,13 +16,13 @@ import type { ServerReferenceId, ServerManifest, ClientReference as ServerReference, -} from 'react-client/src/ReactFlightClientHostConfig'; +} from 'react-client/src/ReactFlightClientConfig'; import { resolveServerReference, preloadModule, requireModule, -} from 'react-client/src/ReactFlightClientHostConfig'; +} from 'react-client/src/ReactFlightClientConfig'; export type JSONValue = | number diff --git a/packages/react-server/src/ReactFlightServerBundlerConfigCustom.js b/packages/react-server/src/ReactFlightServerConfigBundlerCustom.js similarity index 100% rename from packages/react-server/src/ReactFlightServerBundlerConfigCustom.js rename to packages/react-server/src/ReactFlightServerConfigBundlerCustom.js diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.custom.js b/packages/react-server/src/forks/ReactFlightServerConfig.custom.js index f85cfb5f78b25..28977b2357cc6 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.custom.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.custom.js @@ -8,4 +8,6 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from '../ReactFlightServerBundlerConfigCustom'; +export * from '../ReactFlightServerConfigBundlerCustom'; + +export const isPrimaryRenderer = false; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js index 99c541a937d63..4a166f6518ac1 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js @@ -8,4 +8,4 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js index f85cfb5f78b25..8cc2ba0d6c9f0 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js @@ -8,4 +8,4 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from '../ReactFlightServerBundlerConfigCustom'; +export * from '../ReactFlightServerConfigBundlerCustom'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js index 99c541a937d63..4a166f6518ac1 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js @@ -8,4 +8,4 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js index 99c541a937d63..4a166f6518ac1 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js @@ -8,4 +8,4 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js index 99c541a937d63..4a166f6518ac1 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js @@ -8,4 +8,4 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js index 99c541a937d63..4a166f6518ac1 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js @@ -8,4 +8,4 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js index a6ad653f3a7a1..3a3b72672fe5f 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig'; +export * from 'react-server-dom-relay/src/ReactFlightServerConfigDOMRelay'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js b/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js index ab64c4324654f..1eacc4516fe1d 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js @@ -7,4 +7,5 @@ * @flow */ -export * from 'react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig'; +export * from 'react-server-native-relay/src/ReactFlightServerConfigNativeRelay'; +export * from 'react-native-renderer/src/server/ReactFlightServerConfigNative'; diff --git a/scripts/flow/createFlowConfigs.js b/scripts/flow/createFlowConfigs.js index 4a657ee2e6568..29cdde34e2f18 100644 --- a/scripts/flow/createFlowConfigs.js +++ b/scripts/flow/createFlowConfigs.js @@ -55,7 +55,7 @@ module.name_mapper='ReactFiberHostConfig$$' -> 'forks/ReactFiberHostConfig.${ren module.name_mapper='ReactServerStreamConfig$$' -> 'forks/ReactServerStreamConfig.${serverRenderer}' module.name_mapper='ReactServerFormatConfig$$' -> 'forks/ReactServerFormatConfig.${serverRenderer}' module.name_mapper='ReactFlightServerConfig$$' -> 'forks/ReactFlightServerConfig.${serverRenderer}' -module.name_mapper='ReactFlightClientHostConfig$$' -> 'forks/ReactFlightClientHostConfig.${serverRenderer}' +module.name_mapper='ReactFlightClientConfig$$' -> 'forks/ReactFlightClientConfig.${serverRenderer}' module.name_mapper='react-devtools-feature-flags' -> 'react-devtools-shared/src/config/DevToolsFeatureFlags.default' `.trim(), ) diff --git a/scripts/jest/setupHostConfigs.js b/scripts/jest/setupHostConfigs.js index 14c62ca4b4d92..e78fc3ce34d39 100644 --- a/scripts/jest/setupHostConfigs.js +++ b/scripts/jest/setupHostConfigs.js @@ -81,7 +81,7 @@ jest.mock('react-server/flight', () => { return config => { jest.mock(shimServerStreamConfigPath, () => config); jest.mock(shimServerFormatConfigPath, () => config); - jest.mock('react-server/src/ReactFlightServerBundlerConfigCustom', () => ({ + jest.mock('react-server/src/ReactFlightServerConfigBundlerCustom', () => ({ isClientReference: config.isClientReference, isServerReference: config.isServerReference, getClientReferenceKey: config.getClientReferenceKey, @@ -95,18 +95,17 @@ jest.mock('react-server/flight', () => { return jest.requireActual('react-server/flight'); }; }); -const shimFlightClientHostConfigPath = - 'react-client/src/ReactFlightClientHostConfig'; +const shimFlightClientConfigPath = 'react-client/src/ReactFlightClientConfig'; jest.mock('react-client/flight', () => { return config => { - jest.mock(shimFlightClientHostConfigPath, () => config); + jest.mock(shimFlightClientConfigPath, () => config); return jest.requireActual('react-client/flight'); }; }); const configPaths = [ 'react-reconciler/src/ReactFiberHostConfig', - 'react-client/src/ReactFlightClientHostConfig', + 'react-client/src/ReactFlightClientConfig', 'react-server/src/ReactServerStreamConfig', 'react-server/src/ReactServerFormatConfig', 'react-server/src/ReactFlightServerConfig', diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js index 21217ec50a377..55d4409fe957c 100644 --- a/scripts/rollup/forks.js +++ b/scripts/rollup/forks.js @@ -355,7 +355,7 @@ const forks = Object.freeze({ ); }, - './packages/react-client/src/ReactFlightClientHostConfig.js': ( + './packages/react-client/src/ReactFlightClientConfig.js': ( bundleType, entry, dependencies, @@ -373,11 +373,11 @@ const forks = Object.freeze({ if (!rendererInfo.isServerSupported) { return null; } - return `./packages/react-client/src/forks/ReactFlightClientHostConfig.${rendererInfo.shortName}.js`; + return `./packages/react-client/src/forks/ReactFlightClientConfig.${rendererInfo.shortName}.js`; } } throw new Error( - 'Expected ReactFlightClientHostConfig to always be replaced with a shim, but ' + + 'Expected ReactFlightClientConfig to always be replaced with a shim, but ' + `found no mention of "${entry}" entry point in ./scripts/shared/inlinedHostConfigs.js. ` + 'Did you mean to add it there to associate it with a specific renderer?' ); From c403a0e55db7a3edc10fef07be8a4d78e0074c2b Mon Sep 17 00:00:00 2001 From: Josh Story Date: Fri, 7 Apr 2023 13:44:55 -0700 Subject: [PATCH 2/5] Implements wiring for Flight to have it's own "HostConfig" separate from Fizz. Historically the ServerFormatConfigs were supposed to be generic enough to be used by Fizz and Flight. However with the addition of features like Float the configs have evolved to be more specific to the renderer. We may want to get back to a place where there is a pure FormatConfig which can be shared but for now we are embracing the fact that these runtimes need very different things and DCE cannot adequately remove the unused stuff for Fizz when pulling this dep into Flight so we are going to fork the configs and just maintain separate ones. At first the Flight config will be almost empty but once Float support in Flight lands it will have a more complex implementation Additionally this commit normalizes the component files which make up FlightServerConfig and FlightClientConfig. Now each file that participates starts with ReactFlightServerConfig... and ReactFlightClientConfig... --- .../forks/ReactFlightClientConfig.dom-browser.js | 1 + .../src/forks/ReactFlightClientConfig.dom-bun.js | 1 + .../ReactFlightClientConfig.dom-edge-webpack.js | 1 + .../src/forks/ReactFlightClientConfig.dom-legacy.js | 1 + .../ReactFlightClientConfig.dom-node-webpack.js | 1 + .../src/forks/ReactFlightClientConfig.dom-node.js | 1 + .../src/forks/ReactFlightClientConfig.dom-relay.js | 1 + .../src/server/ReactFlightServerConfigDOM.js | 12 ++++++++++++ .../src/shared/ReactFlightClientConfigDOM.js | 13 +++++++++++++ packages/react-server/src/ReactFlightNewContext.js | 2 +- .../forks/ReactFlightServerConfig.dom-browser.js | 1 + .../src/forks/ReactFlightServerConfig.dom-bun.js | 1 + .../ReactFlightServerConfig.dom-edge-webpack.js | 1 + .../src/forks/ReactFlightServerConfig.dom-legacy.js | 1 + .../ReactFlightServerConfig.dom-node-webpack.js | 1 + .../src/forks/ReactFlightServerConfig.dom-node.js | 1 + .../src/forks/ReactFlightServerConfig.dom-relay.js | 1 + 17 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js create mode 100644 packages/react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js index 4abcda77430d1..8de1c06df33fc 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js @@ -10,3 +10,4 @@ export * from 'react-client/src/ReactFlightClientConfigBrowser'; export * from 'react-client/src/ReactFlightClientConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler'; +export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js index fa2084f946ff6..a1c0a72c129b1 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js @@ -9,6 +9,7 @@ export * from 'react-client/src/ReactFlightClientConfigBrowser'; export * from 'react-client/src/ReactFlightClientConfigStream'; +export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; export type Response = any; export opaque type SSRManifest = mixed; 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 4abcda77430d1..8de1c06df33fc 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js @@ -10,3 +10,4 @@ export * from 'react-client/src/ReactFlightClientConfigBrowser'; export * from 'react-client/src/ReactFlightClientConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler'; +export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js index 4abcda77430d1..8de1c06df33fc 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js @@ -10,3 +10,4 @@ export * from 'react-client/src/ReactFlightClientConfigBrowser'; export * from 'react-client/src/ReactFlightClientConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler'; +export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; 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 a70684ccd226e..dba506435584e 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js @@ -10,3 +10,4 @@ export * from 'react-client/src/ReactFlightClientConfigNode'; export * from 'react-client/src/ReactFlightClientConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler'; +export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js index b2aeaf25dd0a6..a8aaffa969c4a 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js @@ -10,3 +10,4 @@ export * from 'react-client/src/ReactFlightClientConfigNode'; export * from 'react-client/src/ReactFlightClientConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler'; +export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js index e59ffbe0725b6..17540fb203718 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js @@ -9,3 +9,4 @@ export * from 'react-server-dom-relay/src/ReactFlightClientConfigDOMRelay'; export * from '../ReactFlightClientConfigNoStream'; +export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; diff --git a/packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js b/packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js new file mode 100644 index 0000000000000..e2daf606c8ebd --- /dev/null +++ b/packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js @@ -0,0 +1,12 @@ +/** + * 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 + */ + +// Used to distinguish these contexts from ones used in other renderers. +// E.g. this can be used to distinguish legacy renderers from this modern one. +export const isPrimaryRenderer = true; diff --git a/packages/react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js b/packages/react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js new file mode 100644 index 0000000000000..d92d7d50ea060 --- /dev/null +++ b/packages/react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js @@ -0,0 +1,13 @@ +/** + * 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 + */ + +// This client file is in the shared folder because it applies to both SSR and browser contexts. +// It is the configuraiton of the FlightClient behavior which can run in either environment. + +// In a future update this is where we will implement `dispatchDirective` such as for Float methods diff --git a/packages/react-server/src/ReactFlightNewContext.js b/packages/react-server/src/ReactFlightNewContext.js index 1775110f13dc2..6412e7c2c7e8c 100644 --- a/packages/react-server/src/ReactFlightNewContext.js +++ b/packages/react-server/src/ReactFlightNewContext.js @@ -13,7 +13,7 @@ import type { } from 'shared/ReactTypes'; import {REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED} from 'shared/ReactSymbols'; -import {isPrimaryRenderer} from './ReactServerFormatConfig'; +import {isPrimaryRenderer} from './ReactFlightServerConfig'; let rendererSigil; if (__DEV__) { diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js index 4a166f6518ac1..5304ae8c21af8 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js @@ -9,3 +9,4 @@ export * from '../ReactFlightServerConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; +export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js index 8cc2ba0d6c9f0..3778ad89ee89c 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js @@ -9,3 +9,4 @@ export * from '../ReactFlightServerConfigStream'; export * from '../ReactFlightServerConfigBundlerCustom'; +export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js index 4a166f6518ac1..5304ae8c21af8 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js @@ -9,3 +9,4 @@ export * from '../ReactFlightServerConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; +export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js index 4a166f6518ac1..5304ae8c21af8 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js @@ -9,3 +9,4 @@ export * from '../ReactFlightServerConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; +export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js index 4a166f6518ac1..5304ae8c21af8 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js @@ -9,3 +9,4 @@ export * from '../ReactFlightServerConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; +export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js index 4a166f6518ac1..5304ae8c21af8 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js @@ -9,3 +9,4 @@ export * from '../ReactFlightServerConfigStream'; export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler'; +export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js index 3a3b72672fe5f..13963e1a286c2 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js @@ -8,3 +8,4 @@ */ export * from 'react-server-dom-relay/src/ReactFlightServerConfigDOMRelay'; +export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; From e8c48d509afebb96e55f91f22bd34331d710ae94 Mon Sep 17 00:00:00 2001 From: Josh Story Date: Mon, 10 Apr 2023 09:11:16 -0700 Subject: [PATCH 3/5] Rename ReactServerFormatConfig to ReactFizzConfig --- ...OMServerFormatConfig.js => ReactFizzConfigDOM.js} | 0 ...cyFormatConfig.js => ReactFizzConfigDOMLegacy.js} | 12 ++++++------ .../src/server/ReactDOMFizzServerBrowser.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzServerBun.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzServerEdge.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzServerNode.js | 4 ++-- .../src/server/ReactDOMFizzStaticBrowser.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzStaticEdge.js | 4 ++-- .../react-dom/src/server/ReactDOMFizzStaticNode.js | 4 ++-- .../react-dom/src/server/ReactDOMLegacyServerImpl.js | 4 ++-- .../src/server/ReactDOMLegacyServerNodeStream.js | 2 +- ...erverFormatConfig.js => ReactFizzConfigNative.js} | 0 .../react-server-dom-relay/src/ReactDOMServerFB.js | 4 ++-- ...ReactServerFormatConfig.js => ReactFizzConfig.js} | 0 packages/react-server/src/ReactFizzHooks.js | 4 ++-- packages/react-server/src/ReactFizzNewContext.js | 2 +- packages/react-server/src/ReactFizzServer.js | 4 ++-- ...matConfig.custom.js => ReactFizzConfig.custom.js} | 0 ...ode-webpack.js => ReactFizzConfig.dom-browser.js} | 2 +- ...fig.dom-browser.js => ReactFizzConfig.dom-bun.js} | 2 +- ...om-bun.js => ReactFizzConfig.dom-edge-webpack.js} | 2 +- ...edge-webpack.js => ReactFizzConfig.dom-legacy.js} | 2 +- .../src/forks/ReactFizzConfig.dom-node-webpack.js | 10 ++++++++++ .../src/forks/ReactFizzConfig.dom-node.js | 10 ++++++++++ .../src/forks/ReactFizzConfig.dom-relay.js | 10 ++++++++++ .../src/forks/ReactFizzConfig.native-relay.js | 10 ++++++++++ .../src/forks/ReactServerFormatConfig.dom-legacy.js | 10 ---------- .../src/forks/ReactServerFormatConfig.dom-node.js | 10 ---------- .../src/forks/ReactServerFormatConfig.dom-relay.js | 10 ---------- .../forks/ReactServerFormatConfig.native-relay.js | 10 ---------- scripts/flow/createFlowConfigs.js | 2 +- scripts/jest/setupHostConfigs.js | 8 ++++---- scripts/rollup/forks.js | 6 +++--- 33 files changed, 82 insertions(+), 82 deletions(-) rename packages/react-dom-bindings/src/server/{ReactDOMServerFormatConfig.js => ReactFizzConfigDOM.js} (100%) rename packages/react-dom-bindings/src/server/{ReactDOMServerLegacyFormatConfig.js => ReactFizzConfigDOMLegacy.js} (96%) rename packages/react-native-renderer/src/server/{ReactNativeServerFormatConfig.js => ReactFizzConfigNative.js} (100%) rename packages/react-server/src/{ReactServerFormatConfig.js => ReactFizzConfig.js} (100%) rename packages/react-server/src/forks/{ReactServerFormatConfig.custom.js => ReactFizzConfig.custom.js} (100%) rename packages/react-server/src/forks/{ReactServerFormatConfig.dom-node-webpack.js => ReactFizzConfig.dom-browser.js} (73%) rename packages/react-server/src/forks/{ReactServerFormatConfig.dom-browser.js => ReactFizzConfig.dom-bun.js} (73%) rename packages/react-server/src/forks/{ReactServerFormatConfig.dom-bun.js => ReactFizzConfig.dom-edge-webpack.js} (73%) rename packages/react-server/src/forks/{ReactServerFormatConfig.dom-edge-webpack.js => ReactFizzConfig.dom-legacy.js} (73%) create mode 100644 packages/react-server/src/forks/ReactFizzConfig.dom-node-webpack.js create mode 100644 packages/react-server/src/forks/ReactFizzConfig.dom-node.js create mode 100644 packages/react-server/src/forks/ReactFizzConfig.dom-relay.js create mode 100644 packages/react-server/src/forks/ReactFizzConfig.native-relay.js delete mode 100644 packages/react-server/src/forks/ReactServerFormatConfig.dom-legacy.js delete mode 100644 packages/react-server/src/forks/ReactServerFormatConfig.dom-node.js delete mode 100644 packages/react-server/src/forks/ReactServerFormatConfig.dom-relay.js delete mode 100644 packages/react-server/src/forks/ReactServerFormatConfig.native-relay.js diff --git a/packages/react-dom-bindings/src/server/ReactDOMServerFormatConfig.js b/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js similarity index 100% rename from packages/react-dom-bindings/src/server/ReactDOMServerFormatConfig.js rename to packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js diff --git a/packages/react-dom-bindings/src/server/ReactDOMServerLegacyFormatConfig.js b/packages/react-dom-bindings/src/server/ReactFizzConfigDOMLegacy.js similarity index 96% rename from packages/react-dom-bindings/src/server/ReactDOMServerLegacyFormatConfig.js rename to packages/react-dom-bindings/src/server/ReactFizzConfigDOMLegacy.js index 5ca51fbcbbac0..1707b4d2c13e3 100644 --- a/packages/react-dom-bindings/src/server/ReactDOMServerLegacyFormatConfig.js +++ b/packages/react-dom-bindings/src/server/ReactFizzConfigDOMLegacy.js @@ -12,7 +12,7 @@ import type { FormatContext, StreamingFormat, InstructionState, -} from './ReactDOMServerFormatConfig'; +} from './ReactFizzConfigDOM'; import { createResponseState as createResponseStateImpl, @@ -23,7 +23,7 @@ import { writeEndCompletedSuspenseBoundary as writeEndCompletedSuspenseBoundaryImpl, writeEndClientRenderedSuspenseBoundary as writeEndClientRenderedSuspenseBoundaryImpl, HTML_MODE, -} from './ReactDOMServerFormatConfig'; +} from './ReactFizzConfigDOM'; import type { Destination, @@ -34,7 +34,7 @@ import type { export const isPrimaryRenderer = false; export type ResponseState = { - // Keep this in sync with ReactDOMServerFormatConfig + // Keep this in sync with ReactFizzConfigDOM bootstrapChunks: Array, placeholderPrefix: PrecomputedChunk, segmentPrefix: PrecomputedChunk, @@ -71,7 +71,7 @@ export function createResponseState( externalRuntimeConfig, ); return { - // Keep this in sync with ReactDOMServerFormatConfig + // Keep this in sync with ReactFizzConfigDOM bootstrapChunks: responseState.bootstrapChunks, placeholderPrefix: responseState.placeholderPrefix, segmentPrefix: responseState.segmentPrefix, @@ -109,7 +109,7 @@ export type { BoundaryResources, FormatContext, SuspenseBoundaryID, -} from './ReactDOMServerFormatConfig'; +} from './ReactFizzConfigDOM'; export { getChildFormatContext, @@ -139,7 +139,7 @@ export { setCurrentlyRenderingBoundaryResourcesTarget, prepareToRender, cleanupAfterRender, -} from './ReactDOMServerFormatConfig'; +} from './ReactFizzConfigDOM'; import {stringToChunk} from 'react-server/src/ReactServerStreamConfig'; diff --git a/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js index a6c27a28ffde3..2c4080b61234d 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js @@ -8,7 +8,7 @@ */ import type {ReactNodeList} from 'shared/ReactTypes'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import ReactVersion from 'shared/ReactVersion'; @@ -22,7 +22,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; type Options = { identifierPrefix?: string, diff --git a/packages/react-dom/src/server/ReactDOMFizzServerBun.js b/packages/react-dom/src/server/ReactDOMFizzServerBun.js index 4187903875da7..686c839296ff7 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerBun.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerBun.js @@ -8,7 +8,7 @@ */ import type {ReactNodeList} from 'shared/ReactTypes'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import ReactVersion from 'shared/ReactVersion'; @@ -22,7 +22,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; type Options = { identifierPrefix?: string, diff --git a/packages/react-dom/src/server/ReactDOMFizzServerEdge.js b/packages/react-dom/src/server/ReactDOMFizzServerEdge.js index a6c27a28ffde3..2c4080b61234d 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerEdge.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerEdge.js @@ -8,7 +8,7 @@ */ import type {ReactNodeList} from 'shared/ReactTypes'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import ReactVersion from 'shared/ReactVersion'; @@ -22,7 +22,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; type Options = { identifierPrefix?: string, diff --git a/packages/react-dom/src/server/ReactDOMFizzServerNode.js b/packages/react-dom/src/server/ReactDOMFizzServerNode.js index 7fa6d6a9cc0b4..566f181feda91 100644 --- a/packages/react-dom/src/server/ReactDOMFizzServerNode.js +++ b/packages/react-dom/src/server/ReactDOMFizzServerNode.js @@ -10,7 +10,7 @@ import type {Request} from 'react-server/src/ReactFizzServer'; import type {ReactNodeList} from 'shared/ReactTypes'; import type {Writable} from 'stream'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import type {Destination} from 'react-server/src/ReactServerStreamConfigNode'; import ReactVersion from 'shared/ReactVersion'; @@ -25,7 +25,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; function createDrainHandler(destination: Destination, request: Request) { return () => startFlowing(request, destination); diff --git a/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js b/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js index e9af36547d8b1..b568e1bec4a89 100644 --- a/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js +++ b/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js @@ -8,7 +8,7 @@ */ import type {ReactNodeList} from 'shared/ReactTypes'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import ReactVersion from 'shared/ReactVersion'; @@ -22,7 +22,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; type Options = { identifierPrefix?: string, diff --git a/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js b/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js index e9af36547d8b1..b568e1bec4a89 100644 --- a/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js +++ b/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js @@ -8,7 +8,7 @@ */ import type {ReactNodeList} from 'shared/ReactTypes'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import ReactVersion from 'shared/ReactVersion'; @@ -22,7 +22,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; type Options = { identifierPrefix?: string, diff --git a/packages/react-dom/src/server/ReactDOMFizzStaticNode.js b/packages/react-dom/src/server/ReactDOMFizzStaticNode.js index beccc2e7b5feb..f9291cb5648db 100644 --- a/packages/react-dom/src/server/ReactDOMFizzStaticNode.js +++ b/packages/react-dom/src/server/ReactDOMFizzStaticNode.js @@ -8,7 +8,7 @@ */ import type {ReactNodeList} from 'shared/ReactTypes'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import {Writable, Readable} from 'stream'; @@ -24,7 +24,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; type Options = { identifierPrefix?: string, diff --git a/packages/react-dom/src/server/ReactDOMLegacyServerImpl.js b/packages/react-dom/src/server/ReactDOMLegacyServerImpl.js index 2d9fed4a556f1..fe6e8f9a54b4d 100644 --- a/packages/react-dom/src/server/ReactDOMLegacyServerImpl.js +++ b/packages/react-dom/src/server/ReactDOMLegacyServerImpl.js @@ -10,7 +10,7 @@ import ReactVersion from 'shared/ReactVersion'; import type {ReactNodeList} from 'shared/ReactTypes'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import { createRequest, @@ -22,7 +22,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerLegacyFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOMLegacy'; type ServerOptions = { identifierPrefix?: string, diff --git a/packages/react-dom/src/server/ReactDOMLegacyServerNodeStream.js b/packages/react-dom/src/server/ReactDOMLegacyServerNodeStream.js index 90af0a2c633e7..8b493b0bda3ef 100644 --- a/packages/react-dom/src/server/ReactDOMLegacyServerNodeStream.js +++ b/packages/react-dom/src/server/ReactDOMLegacyServerNodeStream.js @@ -21,7 +21,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-dom-bindings/src/server/ReactDOMServerLegacyFormatConfig'; +} from 'react-dom-bindings/src/server/ReactFizzConfigDOMLegacy'; import {Readable} from 'stream'; diff --git a/packages/react-native-renderer/src/server/ReactNativeServerFormatConfig.js b/packages/react-native-renderer/src/server/ReactFizzConfigNative.js similarity index 100% rename from packages/react-native-renderer/src/server/ReactNativeServerFormatConfig.js rename to packages/react-native-renderer/src/server/ReactFizzConfigNative.js diff --git a/packages/react-server-dom-relay/src/ReactDOMServerFB.js b/packages/react-server-dom-relay/src/ReactDOMServerFB.js index 34f8862127ce0..5944cb00bee7d 100644 --- a/packages/react-server-dom-relay/src/ReactDOMServerFB.js +++ b/packages/react-server-dom-relay/src/ReactDOMServerFB.js @@ -12,7 +12,7 @@ import type {ReactNodeList} from 'shared/ReactTypes'; import type {Request} from 'react-server/src/ReactFizzServer'; import type {Destination} from 'react-server/src/ReactServerStreamConfig'; -import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; import { createRequest, @@ -25,7 +25,7 @@ import { import { createResponseState, createRootFormatContext, -} from 'react-server/src/ReactServerFormatConfig'; +} from 'react-server/src/ReactFizzConfig'; type Options = { identifierPrefix?: string, diff --git a/packages/react-server/src/ReactServerFormatConfig.js b/packages/react-server/src/ReactFizzConfig.js similarity index 100% rename from packages/react-server/src/ReactServerFormatConfig.js rename to packages/react-server/src/ReactFizzConfig.js diff --git a/packages/react-server/src/ReactFizzHooks.js b/packages/react-server/src/ReactFizzHooks.js index 78d6c0f84f70c..a389c092618ed 100644 --- a/packages/react-server/src/ReactFizzHooks.js +++ b/packages/react-server/src/ReactFizzHooks.js @@ -19,7 +19,7 @@ import type { Usable, } from 'shared/ReactTypes'; -import type {ResponseState} from './ReactServerFormatConfig'; +import type {ResponseState} from './ReactFizzConfig'; import type {Task} from './ReactFizzServer'; import type {ThenableState} from './ReactFizzThenable'; @@ -27,7 +27,7 @@ import {readContext as readContextImpl} from './ReactFizzNewContext'; import {getTreeId} from './ReactFizzTreeContext'; import {createThenableState, trackUsedThenable} from './ReactFizzThenable'; -import {makeId} from './ReactServerFormatConfig'; +import {makeId} from './ReactFizzConfig'; import { enableCache, diff --git a/packages/react-server/src/ReactFizzNewContext.js b/packages/react-server/src/ReactFizzNewContext.js index 298b9005ab395..a2107b573e152 100644 --- a/packages/react-server/src/ReactFizzNewContext.js +++ b/packages/react-server/src/ReactFizzNewContext.js @@ -10,7 +10,7 @@ import type {ReactContext} from 'shared/ReactTypes'; import {REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED} from 'shared/ReactSymbols'; -import {isPrimaryRenderer} from './ReactServerFormatConfig'; +import {isPrimaryRenderer} from './ReactFizzConfig'; let rendererSigil; if (__DEV__) { diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js index 3bd4f1d02d9d0..eab8c6c50e366 100644 --- a/packages/react-server/src/ReactFizzServer.js +++ b/packages/react-server/src/ReactFizzServer.js @@ -27,7 +27,7 @@ import type { FormatContext, Resources, BoundaryResources, -} from './ReactServerFormatConfig'; +} from './ReactFizzConfig'; import type {ContextSnapshot} from './ReactFizzNewContext'; import type {ComponentStackNode} from './ReactFizzComponentStack'; import type {TreeContext} from './ReactFizzTreeContext'; @@ -76,7 +76,7 @@ import { setCurrentlyRenderingBoundaryResourcesTarget, createResources, createBoundaryResources, -} from './ReactServerFormatConfig'; +} from './ReactFizzConfig'; import { constructClassInstance, mountClassInstance, diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.custom.js b/packages/react-server/src/forks/ReactFizzConfig.custom.js similarity index 100% rename from packages/react-server/src/forks/ReactServerFormatConfig.custom.js rename to packages/react-server/src/forks/ReactFizzConfig.custom.js diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-node-webpack.js b/packages/react-server/src/forks/ReactFizzConfig.dom-browser.js similarity index 73% rename from packages/react-server/src/forks/ReactServerFormatConfig.dom-node-webpack.js rename to packages/react-server/src/forks/ReactFizzConfig.dom-browser.js index 485793a6893ee..f2cf57ab5942f 100644 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-node-webpack.js +++ b/packages/react-server/src/forks/ReactFizzConfig.dom-browser.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +export * from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js b/packages/react-server/src/forks/ReactFizzConfig.dom-bun.js similarity index 73% rename from packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js rename to packages/react-server/src/forks/ReactFizzConfig.dom-bun.js index 485793a6893ee..f2cf57ab5942f 100644 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js +++ b/packages/react-server/src/forks/ReactFizzConfig.dom-bun.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +export * from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-bun.js b/packages/react-server/src/forks/ReactFizzConfig.dom-edge-webpack.js similarity index 73% rename from packages/react-server/src/forks/ReactServerFormatConfig.dom-bun.js rename to packages/react-server/src/forks/ReactFizzConfig.dom-edge-webpack.js index 485793a6893ee..f2cf57ab5942f 100644 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-bun.js +++ b/packages/react-server/src/forks/ReactFizzConfig.dom-edge-webpack.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +export * from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-edge-webpack.js b/packages/react-server/src/forks/ReactFizzConfig.dom-legacy.js similarity index 73% rename from packages/react-server/src/forks/ReactServerFormatConfig.dom-edge-webpack.js rename to packages/react-server/src/forks/ReactFizzConfig.dom-legacy.js index 485793a6893ee..4760bb843ea89 100644 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-edge-webpack.js +++ b/packages/react-server/src/forks/ReactFizzConfig.dom-legacy.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; +export * from 'react-dom-bindings/src/server/ReactFizzConfigDOMLegacy'; diff --git a/packages/react-server/src/forks/ReactFizzConfig.dom-node-webpack.js b/packages/react-server/src/forks/ReactFizzConfig.dom-node-webpack.js new file mode 100644 index 0000000000000..f2cf57ab5942f --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.dom-node-webpack.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFizzConfig.dom-node.js b/packages/react-server/src/forks/ReactFizzConfig.dom-node.js new file mode 100644 index 0000000000000..f2cf57ab5942f --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.dom-node.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFizzConfig.dom-relay.js b/packages/react-server/src/forks/ReactFizzConfig.dom-relay.js new file mode 100644 index 0000000000000..f2cf57ab5942f --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.dom-relay.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFizzConfig.native-relay.js b/packages/react-server/src/forks/ReactFizzConfig.native-relay.js new file mode 100644 index 0000000000000..c4981f9edf140 --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.native-relay.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-native-renderer/src/server/ReactFizzConfigNative'; diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-legacy.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-legacy.js deleted file mode 100644 index 7fe33c0b99572..0000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-legacy.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-dom-bindings/src/server/ReactDOMServerLegacyFormatConfig'; diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-node.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-node.js deleted file mode 100644 index 485793a6893ee..0000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-node.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-relay.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-relay.js deleted file mode 100644 index 485793a6893ee..0000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-relay.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig'; diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.native-relay.js b/packages/react-server/src/forks/ReactServerFormatConfig.native-relay.js deleted file mode 100644 index c02082f497a7b..0000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.native-relay.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-native-renderer/src/server/ReactNativeServerFormatConfig'; diff --git a/scripts/flow/createFlowConfigs.js b/scripts/flow/createFlowConfigs.js index 29cdde34e2f18..0193f323dc1f9 100644 --- a/scripts/flow/createFlowConfigs.js +++ b/scripts/flow/createFlowConfigs.js @@ -53,7 +53,7 @@ function writeConfig(renderer, rendererInfo, isServerSupported) { ` module.name_mapper='ReactFiberHostConfig$$' -> 'forks/ReactFiberHostConfig.${renderer}' module.name_mapper='ReactServerStreamConfig$$' -> 'forks/ReactServerStreamConfig.${serverRenderer}' -module.name_mapper='ReactServerFormatConfig$$' -> 'forks/ReactServerFormatConfig.${serverRenderer}' +module.name_mapper='ReactFizzConfig$$' -> 'forks/ReactFizzConfig.${serverRenderer}' module.name_mapper='ReactFlightServerConfig$$' -> 'forks/ReactFlightServerConfig.${serverRenderer}' module.name_mapper='ReactFlightClientConfig$$' -> 'forks/ReactFlightClientConfig.${serverRenderer}' module.name_mapper='react-devtools-feature-flags' -> 'react-devtools-shared/src/config/DevToolsFeatureFlags.default' diff --git a/scripts/jest/setupHostConfigs.js b/scripts/jest/setupHostConfigs.js index e78fc3ce34d39..ae19851df93e7 100644 --- a/scripts/jest/setupHostConfigs.js +++ b/scripts/jest/setupHostConfigs.js @@ -68,19 +68,19 @@ jest.mock('react-reconciler', () => { }; }); const shimServerStreamConfigPath = 'react-server/src/ReactServerStreamConfig'; -const shimServerFormatConfigPath = 'react-server/src/ReactServerFormatConfig'; +const shimServerConfigPath = 'react-server/src/ReactFizzConfig'; const shimFlightServerConfigPath = 'react-server/src/ReactFlightServerConfig'; jest.mock('react-server', () => { return config => { jest.mock(shimServerStreamConfigPath, () => config); - jest.mock(shimServerFormatConfigPath, () => config); + jest.mock(shimServerConfigPath, () => config); return jest.requireActual('react-server'); }; }); jest.mock('react-server/flight', () => { return config => { jest.mock(shimServerStreamConfigPath, () => config); - jest.mock(shimServerFormatConfigPath, () => config); + jest.mock(shimServerConfigPath, () => config); jest.mock('react-server/src/ReactFlightServerConfigBundlerCustom', () => ({ isClientReference: config.isClientReference, isServerReference: config.isServerReference, @@ -107,7 +107,7 @@ const configPaths = [ 'react-reconciler/src/ReactFiberHostConfig', 'react-client/src/ReactFlightClientConfig', 'react-server/src/ReactServerStreamConfig', - 'react-server/src/ReactServerFormatConfig', + 'react-server/src/ReactFizzConfig', 'react-server/src/ReactFlightServerConfig', ]; diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js index 55d4409fe957c..5f6c984604266 100644 --- a/scripts/rollup/forks.js +++ b/scripts/rollup/forks.js @@ -299,7 +299,7 @@ const forks = Object.freeze({ ); }, - './packages/react-server/src/ReactServerFormatConfig.js': ( + './packages/react-server/src/ReactFizzConfig.js': ( bundleType, entry, dependencies, @@ -317,11 +317,11 @@ const forks = Object.freeze({ if (!rendererInfo.isServerSupported) { return null; } - return `./packages/react-server/src/forks/ReactServerFormatConfig.${rendererInfo.shortName}.js`; + return `./packages/react-server/src/forks/ReactFizzConfig.${rendererInfo.shortName}.js`; } } throw new Error( - 'Expected ReactServerFormatConfig to always be replaced with a shim, but ' + + 'Expected ReactFizzConfig to always be replaced with a shim, but ' + `found no mention of "${entry}" entry point in ./scripts/shared/inlinedHostConfigs.js. ` + 'Did you mean to add it there to associate it with a specific renderer?' ); From 001d9bcbdc1a4c74e4fd79cfc4e0a03e043a17a1 Mon Sep 17 00:00:00 2001 From: Josh Story Date: Mon, 10 Apr 2023 10:23:51 -0700 Subject: [PATCH 4/5] Rename HostConfig files to FiberConfig to clarify they are configs for Fiber and not Fizz/Fligh. This better conforms to the naming used in Flight and now Fizz of `ReactFlightServerConfig` and `ReactFizzConfig` --- ...eactARTHostConfig.js => ReactFiberConfigART.js} | 14 +++++++------- .../src/client/ReactDOMComponentTree.js | 4 ++-- ...eactDOMHostConfig.js => ReactFiberConfigDOM.js} | 2 +- .../src/events/ReactDOMEventListener.js | 2 +- .../src/events/ReactDOMEventReplaying.js | 2 +- .../react-dom-bindings/src/events/getListener.js | 2 +- .../src/events/plugins/ChangeEventPlugin.js | 2 +- .../ReactDOMFizzInstructionSetShared.js | 2 +- packages/react-dom/src/client/ReactDOM.js | 2 +- packages/react-dom/src/client/ReactDOMLegacy.js | 4 ++-- packages/react-dom/src/client/ReactDOMRoot.js | 2 +- packages/react-native-renderer/src/ReactFabric.js | 2 +- .../src/ReactFabricComponentTree.js | 4 ++-- .../src/ReactFabricEventEmitter.js | 2 +- ...bricHostConfig.js => ReactFiberConfigFabric.js} | 14 +++++++------- ...tiveHostConfig.js => ReactFiberConfigNative.js} | 14 +++++++------- .../src/ReactNativeFiberHostComponent.js | 2 +- packages/react-reconciler/README.md | 14 +++++++------- packages/react-reconciler/src/ReactFiber.js | 4 ++-- packages/react-reconciler/src/ReactFiberAct.js | 2 +- .../react-reconciler/src/ReactFiberBeginWork.js | 4 ++-- .../react-reconciler/src/ReactFiberCommitWork.js | 4 ++-- .../react-reconciler/src/ReactFiberCompleteWork.js | 4 ++-- ...ReactFiberHostConfig.js => ReactFiberConfig.js} | 0 ...ation.js => ReactFiberConfigWithNoHydration.js} | 0 ...asks.js => ReactFiberConfigWithNoMicrotasks.js} | 0 ...tation.js => ReactFiberConfigWithNoMutation.js} | 0 ...nce.js => ReactFiberConfigWithNoPersistence.js} | 0 ...urces.js => ReactFiberConfigWithNoResources.js} | 0 ...NoScopes.js => ReactFiberConfigWithNoScopes.js} | 0 ...tons.js => ReactFiberConfigWithNoSingletons.js} | 0 ...s.js => ReactFiberConfigWithNoTestSelectors.js} | 0 .../react-reconciler/src/ReactFiberHostContext.js | 4 ++-- .../react-reconciler/src/ReactFiberHotReloading.js | 4 ++-- .../src/ReactFiberHydrationContext.js | 4 ++-- .../react-reconciler/src/ReactFiberNewContext.js | 2 +- .../react-reconciler/src/ReactFiberReconciler.js | 4 ++-- packages/react-reconciler/src/ReactFiberRoot.js | 4 ++-- .../src/ReactFiberRootScheduler.js | 2 +- packages/react-reconciler/src/ReactFiberScope.js | 2 +- .../src/ReactFiberSuspenseComponent.js | 4 ++-- .../react-reconciler/src/ReactFiberTransition.js | 2 +- .../src/ReactFiberTreeReflection.js | 2 +- .../react-reconciler/src/ReactFiberWorkLoop.js | 2 +- .../react-reconciler/src/ReactInternalTypes.js | 2 +- .../react-reconciler/src/ReactMutableSource.js | 2 +- .../react-reconciler/src/ReactPostPaintCallback.js | 2 +- .../react-reconciler/src/ReactTestSelectors.js | 4 ++-- ...erHostConfig.art.js => ReactFiberConfig.art.js} | 2 +- ...Config.custom.js => ReactFiberConfig.custom.js} | 0 .../src/forks/ReactFiberConfig.dom-browser.js | 10 ++++++++++ .../src/forks/ReactFiberConfig.dom-bun.js | 10 ++++++++++ .../src/forks/ReactFiberConfig.dom-edge-webpack.js | 10 ++++++++++ .../src/forks/ReactFiberConfig.dom-legacy.js | 10 ++++++++++ .../src/forks/ReactFiberConfig.dom-node-webpack.js | 10 ++++++++++ .../src/forks/ReactFiberConfig.dom-node.js | 10 ++++++++++ .../src/forks/ReactFiberConfig.dom-relay.js | 10 ++++++++++ ...ig.dom-legacy.js => ReactFiberConfig.fabric.js} | 2 +- ...browser.js => ReactFiberConfig.native-relay.js} | 2 +- ...onfig.dom-bun.js => ReactFiberConfig.native.js} | 2 +- ...om-edge-webpack.js => ReactFiberConfig.test.js} | 2 +- .../forks/ReactFiberHostConfig.dom-node-webpack.js | 10 ---------- .../src/forks/ReactFiberHostConfig.dom-node.js | 10 ---------- .../src/forks/ReactFiberHostConfig.dom-relay.js | 10 ---------- .../src/forks/ReactFiberHostConfig.fabric.js | 10 ---------- .../src/forks/ReactFiberHostConfig.native-relay.js | 10 ---------- .../src/forks/ReactFiberHostConfig.native.js | 10 ---------- .../src/forks/ReactFiberHostConfig.test.js | 10 ---------- packages/react-refresh/src/ReactFreshRuntime.js | 2 +- ...stHostConfig.js => ReactFiberConfigTestHost.js} | 12 ++++++------ .../react-test-renderer/src/ReactTestRenderer.js | 4 ++-- scripts/flow/createFlowConfigs.js | 2 +- scripts/jest/setupHostConfigs.js | 4 ++-- scripts/rollup/forks.js | 6 +++--- 74 files changed, 167 insertions(+), 167 deletions(-) rename packages/react-art/src/{ReactARTHostConfig.js => ReactFiberConfigART.js} (95%) rename packages/react-dom-bindings/src/client/{ReactDOMHostConfig.js => ReactFiberConfigDOM.js} (99%) rename packages/react-native-renderer/src/{ReactFabricHostConfig.js => ReactFiberConfigFabric.js} (96%) rename packages/react-native-renderer/src/{ReactNativeHostConfig.js => ReactFiberConfigNative.js} (96%) rename packages/react-reconciler/src/{ReactFiberHostConfig.js => ReactFiberConfig.js} (100%) rename packages/react-reconciler/src/{ReactFiberHostConfigWithNoHydration.js => ReactFiberConfigWithNoHydration.js} (100%) rename packages/react-reconciler/src/{ReactFiberHostConfigWithNoMicrotasks.js => ReactFiberConfigWithNoMicrotasks.js} (100%) rename packages/react-reconciler/src/{ReactFiberHostConfigWithNoMutation.js => ReactFiberConfigWithNoMutation.js} (100%) rename packages/react-reconciler/src/{ReactFiberHostConfigWithNoPersistence.js => ReactFiberConfigWithNoPersistence.js} (100%) rename packages/react-reconciler/src/{ReactFiberHostConfigWithNoResources.js => ReactFiberConfigWithNoResources.js} (100%) rename packages/react-reconciler/src/{ReactFiberHostConfigWithNoScopes.js => ReactFiberConfigWithNoScopes.js} (100%) rename packages/react-reconciler/src/{ReactFiberHostConfigWithNoSingletons.js => ReactFiberConfigWithNoSingletons.js} (100%) rename packages/react-reconciler/src/{ReactFiberHostConfigWithNoTestSelectors.js => ReactFiberConfigWithNoTestSelectors.js} (100%) rename packages/react-reconciler/src/forks/{ReactFiberHostConfig.art.js => ReactFiberConfig.art.js} (80%) rename packages/react-reconciler/src/forks/{ReactFiberHostConfig.custom.js => ReactFiberConfig.custom.js} (100%) create mode 100644 packages/react-reconciler/src/forks/ReactFiberConfig.dom-browser.js create mode 100644 packages/react-reconciler/src/forks/ReactFiberConfig.dom-bun.js create mode 100644 packages/react-reconciler/src/forks/ReactFiberConfig.dom-edge-webpack.js create mode 100644 packages/react-reconciler/src/forks/ReactFiberConfig.dom-legacy.js create mode 100644 packages/react-reconciler/src/forks/ReactFiberConfig.dom-node-webpack.js create mode 100644 packages/react-reconciler/src/forks/ReactFiberConfig.dom-node.js create mode 100644 packages/react-reconciler/src/forks/ReactFiberConfig.dom-relay.js rename packages/react-reconciler/src/forks/{ReactFiberHostConfig.dom-legacy.js => ReactFiberConfig.fabric.js} (76%) rename packages/react-reconciler/src/forks/{ReactFiberHostConfig.dom-browser.js => ReactFiberConfig.native-relay.js} (76%) rename packages/react-reconciler/src/forks/{ReactFiberHostConfig.dom-bun.js => ReactFiberConfig.native.js} (76%) rename packages/react-reconciler/src/forks/{ReactFiberHostConfig.dom-edge-webpack.js => ReactFiberConfig.test.js} (76%) delete mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node-webpack.js delete mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node.js delete mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-relay.js delete mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.fabric.js delete mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.native-relay.js delete mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.native.js delete mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js rename packages/react-test-renderer/src/{ReactTestHostConfig.js => ReactFiberConfigTestHost.js} (94%) diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactFiberConfigART.js similarity index 95% rename from packages/react-art/src/ReactARTHostConfig.js rename to packages/react-art/src/ReactFiberConfigART.js index 97a6b421b9f0f..591072cec84e8 100644 --- a/packages/react-art/src/ReactARTHostConfig.js +++ b/packages/react-art/src/ReactFiberConfigART.js @@ -238,13 +238,13 @@ function applyTextProps(instance, props, prevProps = {}) { } } -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoScopes'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoTestSelectors'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMicrotasks'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoResources'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoSingletons'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoPersistence'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoHydration'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoScopes'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoTestSelectors'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoMicrotasks'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoResources'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoSingletons'; export function appendInitialChild(parentInstance, child) { if (typeof child === 'string') { diff --git a/packages/react-dom-bindings/src/client/ReactDOMComponentTree.js b/packages/react-dom-bindings/src/client/ReactDOMComponentTree.js index 3f8044ac9fb82..839f346c9d88f 100644 --- a/packages/react-dom-bindings/src/client/ReactDOMComponentTree.js +++ b/packages/react-dom-bindings/src/client/ReactDOMComponentTree.js @@ -21,7 +21,7 @@ import type { Props, HoistableRoot, RootResources, -} from './ReactDOMHostConfig'; +} from './ReactFiberConfigDOM'; import { HostComponent, @@ -32,7 +32,7 @@ import { SuspenseComponent, } from 'react-reconciler/src/ReactWorkTags'; -import {getParentSuspenseInstance} from './ReactDOMHostConfig'; +import {getParentSuspenseInstance} from './ReactFiberConfigDOM'; import { enableScopeAPI, diff --git a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js b/packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js similarity index 99% rename from packages/react-dom-bindings/src/client/ReactDOMHostConfig.js rename to packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js index 48b1f41b85fc7..8dd5252609d54 100644 --- a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js +++ b/packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js @@ -179,7 +179,7 @@ const STYLE = 'style'; let eventsEnabled: ?boolean = null; let selectionInformation: null | SelectionInformation = null; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoPersistence'; function getOwnerDocumentFromRootContainer( rootContainerElement: Element | Document | DocumentFragment, diff --git a/packages/react-dom-bindings/src/events/ReactDOMEventListener.js b/packages/react-dom-bindings/src/events/ReactDOMEventListener.js index d10e8fccfbece..70cec7fa0e608 100644 --- a/packages/react-dom-bindings/src/events/ReactDOMEventListener.js +++ b/packages/react-dom-bindings/src/events/ReactDOMEventListener.js @@ -10,7 +10,7 @@ import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities'; import type {AnyNativeEvent} from '../events/PluginModuleType'; import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes'; -import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig'; +import type {Container, SuspenseInstance} from '../client/ReactFiberConfigDOM'; import type {DOMEventName} from '../events/DOMEventNames'; import { diff --git a/packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js b/packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js index 48c9884c42878..59fc3a8a61811 100644 --- a/packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js +++ b/packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js @@ -8,7 +8,7 @@ */ import type {AnyNativeEvent} from '../events/PluginModuleType'; -import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig'; +import type {Container, SuspenseInstance} from '../client/ReactFiberConfigDOM'; import type {DOMEventName} from '../events/DOMEventNames'; import type {EventSystemFlags} from './EventSystemFlags'; import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes'; diff --git a/packages/react-dom-bindings/src/events/getListener.js b/packages/react-dom-bindings/src/events/getListener.js index 2cdb8cfdfbee7..68ab23e219475 100644 --- a/packages/react-dom-bindings/src/events/getListener.js +++ b/packages/react-dom-bindings/src/events/getListener.js @@ -7,7 +7,7 @@ */ import type {Fiber} from 'react-reconciler/src/ReactInternalTypes'; -import type {Props} from '../client/ReactDOMHostConfig'; +import type {Props} from '../client/ReactFiberConfigDOM'; import {getFiberCurrentPropsFromNode} from '../client/ReactDOMComponentTree'; diff --git a/packages/react-dom-bindings/src/events/plugins/ChangeEventPlugin.js b/packages/react-dom-bindings/src/events/plugins/ChangeEventPlugin.js index baa33f1a7c5c6..4a69f20df9b86 100644 --- a/packages/react-dom-bindings/src/events/plugins/ChangeEventPlugin.js +++ b/packages/react-dom-bindings/src/events/plugins/ChangeEventPlugin.js @@ -6,7 +6,7 @@ * * @flow */ -import type {TextInstance, Instance} from '../../client/ReactDOMHostConfig'; +import type {TextInstance, Instance} from '../../client/ReactFiberConfigDOM'; import type {AnyNativeEvent} from '../PluginModuleType'; import type {DOMEventName} from '../DOMEventNames'; import type {DispatchQueue} from '../DOMPluginEventSystem'; diff --git a/packages/react-dom-bindings/src/server/fizz-instruction-set/ReactDOMFizzInstructionSetShared.js b/packages/react-dom-bindings/src/server/fizz-instruction-set/ReactDOMFizzInstructionSetShared.js index e439a87a96140..6058eddaad7eb 100644 --- a/packages/react-dom-bindings/src/server/fizz-instruction-set/ReactDOMFizzInstructionSetShared.js +++ b/packages/react-dom-bindings/src/server/fizz-instruction-set/ReactDOMFizzInstructionSetShared.js @@ -63,7 +63,7 @@ export function completeBoundary(suspenseBoundaryID, contentID, errorDigest) { if (!errorDigest) { // Clear all the existing children. This is complicated because // there can be embedded Suspense boundaries in the fallback. - // This is similar to clearSuspenseBoundary in ReactDOMHostConfig. + // This is similar to clearSuspenseBoundary in ReactFiberConfigDOM. // TODO: We could avoid this if we never emitted suspense boundaries in fallback trees. // They never hydrate anyway. However, currently we support incrementally loading the fallback. const parentInstance = suspenseNode.parentNode; diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index ef5d3234190ec..d6ef4261246de 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -11,7 +11,7 @@ import type {ReactNodeList} from 'shared/ReactTypes'; import type { Container, PublicInstance, -} from 'react-dom-bindings/src/client/ReactDOMHostConfig'; +} from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; import type { RootType, HydrateRootOptions, diff --git a/packages/react-dom/src/client/ReactDOMLegacy.js b/packages/react-dom/src/client/ReactDOMLegacy.js index 1973e97ada52a..b8b1fc43239a9 100644 --- a/packages/react-dom/src/client/ReactDOMLegacy.js +++ b/packages/react-dom/src/client/ReactDOMLegacy.js @@ -10,11 +10,11 @@ import type { Container, PublicInstance, -} from 'react-dom-bindings/src/client/ReactDOMHostConfig'; +} from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes'; import type {ReactNodeList} from 'shared/ReactTypes'; -import {clearContainer} from 'react-dom-bindings/src/client/ReactDOMHostConfig'; +import {clearContainer} from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; import { getInstanceFromNode, isContainerMarkedAsRoot, diff --git a/packages/react-dom/src/client/ReactDOMRoot.js b/packages/react-dom/src/client/ReactDOMRoot.js index 96d32f8622204..b0f53ccdf06f8 100644 --- a/packages/react-dom/src/client/ReactDOMRoot.js +++ b/packages/react-dom/src/client/ReactDOMRoot.js @@ -15,7 +15,7 @@ import type { import ReactDOMSharedInternals from '../ReactDOMSharedInternals'; const {Dispatcher} = ReactDOMSharedInternals; -import {ReactDOMClientDispatcher} from 'react-dom-bindings/src/client/ReactDOMHostConfig'; +import {ReactDOMClientDispatcher} from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; import {queueExplicitHydrationTarget} from 'react-dom-bindings/src/events/ReactDOMEventReplaying'; import {REACT_ELEMENT_TYPE} from 'shared/ReactSymbols'; import { diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js index d918779140dd7..36be493520a2d 100644 --- a/packages/react-native-renderer/src/ReactFabric.js +++ b/packages/react-native-renderer/src/ReactFabric.js @@ -40,7 +40,7 @@ import { sendAccessibilityEvent, getNodeFromInternalInstanceHandle, } from './ReactNativePublicCompat'; -import {getPublicInstanceFromInternalInstanceHandle} from './ReactFabricHostConfig'; +import {getPublicInstanceFromInternalInstanceHandle} from './ReactFiberConfigFabric'; // $FlowFixMe[missing-local-annot] function onRecoverableError(error) { diff --git a/packages/react-native-renderer/src/ReactFabricComponentTree.js b/packages/react-native-renderer/src/ReactFabricComponentTree.js index c295c42ed102b..f36e742a45aba 100644 --- a/packages/react-native-renderer/src/ReactFabricComponentTree.js +++ b/packages/react-native-renderer/src/ReactFabricComponentTree.js @@ -12,9 +12,9 @@ import type { Instance, Props, TextInstance, -} from './ReactFabricHostConfig'; +} from './ReactFiberConfigFabric'; import type {Fiber} from 'react-reconciler/src/ReactInternalTypes'; -import {getPublicInstance} from './ReactFabricHostConfig'; +import {getPublicInstance} from './ReactFiberConfigFabric'; // `node` is typed incorrectly here. The proper type should be `PublicInstance`. // This is ok in DOM because they types are interchangeable, but in React Native diff --git a/packages/react-native-renderer/src/ReactFabricEventEmitter.js b/packages/react-native-renderer/src/ReactFabricEventEmitter.js index b7d545aa114f8..a0b8eb98b4867 100644 --- a/packages/react-native-renderer/src/ReactFabricEventEmitter.js +++ b/packages/react-native-renderer/src/ReactFabricEventEmitter.js @@ -29,7 +29,7 @@ import getListener from './ReactNativeGetListener'; import {runEventsInBatch} from './legacy-events/EventBatching'; import {RawEventEmitter} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface'; -import {getPublicInstance} from './ReactFabricHostConfig'; +import {getPublicInstance} from './ReactFiberConfigFabric'; export {getListener, registrationNameModules as registrationNames}; diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFiberConfigFabric.js similarity index 96% rename from packages/react-native-renderer/src/ReactFabricHostConfig.js rename to packages/react-native-renderer/src/ReactFiberConfigFabric.js index 72109ca7c3ec1..03ab9b6febe39 100644 --- a/packages/react-native-renderer/src/ReactFabricHostConfig.js +++ b/packages/react-native-renderer/src/ReactFiberConfigFabric.js @@ -108,13 +108,13 @@ if (registerEventHandler) { registerEventHandler(dispatchEvent); } -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMutation'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoScopes'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoTestSelectors'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMicrotasks'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoResources'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoSingletons'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoMutation'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoHydration'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoScopes'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoTestSelectors'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoMicrotasks'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoResources'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoSingletons'; export function appendInitialChild( parentInstance: Instance, diff --git a/packages/react-native-renderer/src/ReactNativeHostConfig.js b/packages/react-native-renderer/src/ReactFiberConfigNative.js similarity index 96% rename from packages/react-native-renderer/src/ReactNativeHostConfig.js rename to packages/react-native-renderer/src/ReactFiberConfigNative.js index aeed0c01c069c..b218a1f77c234 100644 --- a/packages/react-native-renderer/src/ReactNativeHostConfig.js +++ b/packages/react-native-renderer/src/ReactFiberConfigNative.js @@ -84,13 +84,13 @@ function recursivelyUncacheFiberNode(node: Instance | TextInstance) { } } -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoScopes'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoTestSelectors'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMicrotasks'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoResources'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoSingletons'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoPersistence'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoHydration'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoScopes'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoTestSelectors'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoMicrotasks'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoResources'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoSingletons'; export function appendInitialChild( parentInstance: Instance, diff --git a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js index 3db5948c4eb0d..8294e0e6f07cd 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js +++ b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js @@ -16,7 +16,7 @@ import type { INativeMethods, ViewConfig, } from './ReactNativeTypes'; -import type {Instance} from './ReactNativeHostConfig'; +import type {Instance} from './ReactFiberConfigNative'; // Modules provided by RN: import { diff --git a/packages/react-reconciler/README.md b/packages/react-reconciler/README.md index 2aeb36fbd6caf..546e44258378f 100644 --- a/packages/react-reconciler/README.md +++ b/packages/react-reconciler/README.md @@ -51,15 +51,15 @@ const HostConfig = { * **[Building a simple custom renderer to DOM](https://medium.com/@agent_hunt/hello-world-custom-react-renderer-9a95b7cd04bc)** * **[Building a simple custom renderer to native](https://medium.com/@agent_hunt/introduction-to-react-native-renderers-aka-react-native-is-the-java-and-react-native-renderers-are-828a0022f433)** -The full list of supported methods [can be found here](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). For their signatures, we recommend looking at specific examples below. +The full list of supported methods [can be found here](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js). For their signatures, we recommend looking at specific examples below. The React repository includes several renderers. Each of them has its own host config. The examples in the React repository are declared a bit differently than a third-party renderer would be. In particular, the `HostConfig` object mentioned above is never explicitly declared, and instead is a *module* in our code. However, its exports correspond directly to properties on a `HostConfig` object you'd need to declare in your code: -* [React ART](https://github.com/facebook/react/blob/main/packages/react-art/src/ReactART.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-art/src/ReactARTHostConfig.js) -* [React DOM](https://github.com/facebook/react/blob/main/packages/react-dom/src/client/ReactDOM.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js) -* [React Native](https://github.com/facebook/react/blob/main/packages/react-native-renderer/src/ReactNativeRenderer.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-native-renderer/src/ReactNativeHostConfig.js) +* [React ART](https://github.com/facebook/react/blob/main/packages/react-art/src/ReactART.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-art/src/ReactFiberConfigART.js) +* [React DOM](https://github.com/facebook/react/blob/main/packages/react-dom/src/client/ReactDOM.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js) +* [React Native](https://github.com/facebook/react/blob/main/packages/react-native-renderer/src/ReactNativeRenderer.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-native-renderer/src/ReactFiberConfigNative.js) If these links break please file an issue and we’ll fix them. They intentionally link to the latest versions since the API is still evolving. If you have more questions please file an issue and we’ll try to help! @@ -240,7 +240,7 @@ The constant you return depends on which event, if any, is being handled right n * **Other events / No active event:** In all other cases, return `DefaultEventPriority`. This tells React that this event is considered background work, and interactive events will be prioritized over it. -You can consult the `getCurrentEventPriority()` implementation in `ReactDOMHostConfig.js` for a reference implementation. +You can consult the `getCurrentEventPriority()` implementation in `ReactFiberConfigDOM.js` for a reference implementation. ### Mutation Methods @@ -328,10 +328,10 @@ This method should mutate the `container` root node and remove all children from ### Persistence Methods -If you use the persistent mode instead of the mutation mode, you would still need the "Core Methods". However, instead of the Mutation Methods above you will implement a different set of methods that performs cloning nodes and replacing them at the root level. You can find a list of them in the "Persistence" section [listed in this file](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). File an issue if you need help. +If you use the persistent mode instead of the mutation mode, you would still need the "Core Methods". However, instead of the Mutation Methods above you will implement a different set of methods that performs cloning nodes and replacing them at the root level. You can find a list of them in the "Persistence" section [listed in this file](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js). File an issue if you need help. ### Hydration Methods You can optionally implement hydration to "attach" to the existing tree during the initial render instead of creating it from scratch. For example, the DOM renderer uses this to attach to an HTML markup. -To support hydration, you need to declare `supportsHydration: true` and then implement the methods in the "Hydration" section [listed in this file](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). File an issue if you need help. +To support hydration, you need to declare `supportsHydration: true` and then implement the methods in the "Hydration" section [listed in this file](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js). File an issue if you need help. diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index e362e984ce16d..7eefefa1c4d14 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -14,7 +14,7 @@ import type {RootTag} from './ReactRootTags'; import type {WorkTag} from './ReactWorkTags'; import type {TypeOfMode} from './ReactTypeOfMode'; import type {Lanes} from './ReactFiberLane'; -import type {SuspenseInstance} from './ReactFiberHostConfig'; +import type {SuspenseInstance} from './ReactFiberConfig'; import type { OffscreenProps, OffscreenInstance, @@ -26,7 +26,7 @@ import { supportsSingletons, isHostHoistableType, isHostSingletonType, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import { createRootStrictEffectsByDefault, enableCache, diff --git a/packages/react-reconciler/src/ReactFiberAct.js b/packages/react-reconciler/src/ReactFiberAct.js index 57848f03a1e6a..117a7fc05196b 100644 --- a/packages/react-reconciler/src/ReactFiberAct.js +++ b/packages/react-reconciler/src/ReactFiberAct.js @@ -11,7 +11,7 @@ import type {Fiber} from './ReactFiber'; import ReactSharedInternals from 'shared/ReactSharedInternals'; -import {warnsIfNotActing} from './ReactFiberHostConfig'; +import {warnsIfNotActing} from './ReactFiberConfig'; const {ReactCurrentActQueue} = ReactSharedInternals; diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 5a53ea848b62c..7b5b2f72b1e0c 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -168,8 +168,8 @@ import { isPrimaryRenderer, getResource, createHoistableInstance, -} from './ReactFiberHostConfig'; -import type {SuspenseInstance} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; +import type {SuspenseInstance} from './ReactFiberConfig'; import {shouldError, shouldSuspend} from './ReactFiberReconciler'; import { pushHostContext, diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index 4234732bc7a72..3aca03988f6cd 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -15,7 +15,7 @@ import type { ChildSet, UpdatePayload, HoistableRoot, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import type {Fiber, FiberRoot} from './ReactInternalTypes'; import type {Lanes} from './ReactFiberLane'; import {NoTimestamp, SyncLane} from './ReactFiberLane'; @@ -162,7 +162,7 @@ import { prepareToCommitHoistables, suspendInstance, suspendResource, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import { captureCommitPhaseError, resolveRetryWakeable, diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index a057cc29b6e7b..ba5f92944e029 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -18,7 +18,7 @@ import type { Container, ChildSet, Resource, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import type { SuspenseState, SuspenseListRenderState, @@ -115,7 +115,7 @@ import { mayResourceSuspendCommit, preloadInstance, preloadResource, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import { getRootHostContainer, popHostContext, diff --git a/packages/react-reconciler/src/ReactFiberHostConfig.js b/packages/react-reconciler/src/ReactFiberConfig.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfig.js rename to packages/react-reconciler/src/ReactFiberConfig.js diff --git a/packages/react-reconciler/src/ReactFiberHostConfigWithNoHydration.js b/packages/react-reconciler/src/ReactFiberConfigWithNoHydration.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfigWithNoHydration.js rename to packages/react-reconciler/src/ReactFiberConfigWithNoHydration.js diff --git a/packages/react-reconciler/src/ReactFiberHostConfigWithNoMicrotasks.js b/packages/react-reconciler/src/ReactFiberConfigWithNoMicrotasks.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfigWithNoMicrotasks.js rename to packages/react-reconciler/src/ReactFiberConfigWithNoMicrotasks.js diff --git a/packages/react-reconciler/src/ReactFiberHostConfigWithNoMutation.js b/packages/react-reconciler/src/ReactFiberConfigWithNoMutation.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfigWithNoMutation.js rename to packages/react-reconciler/src/ReactFiberConfigWithNoMutation.js diff --git a/packages/react-reconciler/src/ReactFiberHostConfigWithNoPersistence.js b/packages/react-reconciler/src/ReactFiberConfigWithNoPersistence.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfigWithNoPersistence.js rename to packages/react-reconciler/src/ReactFiberConfigWithNoPersistence.js diff --git a/packages/react-reconciler/src/ReactFiberHostConfigWithNoResources.js b/packages/react-reconciler/src/ReactFiberConfigWithNoResources.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfigWithNoResources.js rename to packages/react-reconciler/src/ReactFiberConfigWithNoResources.js diff --git a/packages/react-reconciler/src/ReactFiberHostConfigWithNoScopes.js b/packages/react-reconciler/src/ReactFiberConfigWithNoScopes.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfigWithNoScopes.js rename to packages/react-reconciler/src/ReactFiberConfigWithNoScopes.js diff --git a/packages/react-reconciler/src/ReactFiberHostConfigWithNoSingletons.js b/packages/react-reconciler/src/ReactFiberConfigWithNoSingletons.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfigWithNoSingletons.js rename to packages/react-reconciler/src/ReactFiberConfigWithNoSingletons.js diff --git a/packages/react-reconciler/src/ReactFiberHostConfigWithNoTestSelectors.js b/packages/react-reconciler/src/ReactFiberConfigWithNoTestSelectors.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberHostConfigWithNoTestSelectors.js rename to packages/react-reconciler/src/ReactFiberConfigWithNoTestSelectors.js diff --git a/packages/react-reconciler/src/ReactFiberHostContext.js b/packages/react-reconciler/src/ReactFiberHostContext.js index 539dedbbd1c8b..c5733b24543d2 100644 --- a/packages/react-reconciler/src/ReactFiberHostContext.js +++ b/packages/react-reconciler/src/ReactFiberHostContext.js @@ -9,9 +9,9 @@ import type {Fiber} from './ReactInternalTypes'; import type {StackCursor} from './ReactFiberStack'; -import type {Container, HostContext} from './ReactFiberHostConfig'; +import type {Container, HostContext} from './ReactFiberConfig'; -import {getChildHostContext, getRootHostContext} from './ReactFiberHostConfig'; +import {getChildHostContext, getRootHostContext} from './ReactFiberConfig'; import {createCursor, push, pop} from './ReactFiberStack'; const contextStackCursor: StackCursor = createCursor(null); diff --git a/packages/react-reconciler/src/ReactFiberHotReloading.js b/packages/react-reconciler/src/ReactFiberHotReloading.js index e4b1561896c31..ffb3ae8a0ee1b 100644 --- a/packages/react-reconciler/src/ReactFiberHotReloading.js +++ b/packages/react-reconciler/src/ReactFiberHotReloading.js @@ -11,7 +11,7 @@ import type {ReactElement} from 'shared/ReactElementType'; import type {Fiber, FiberRoot} from './ReactInternalTypes'; -import type {Instance} from './ReactFiberHostConfig'; +import type {Instance} from './ReactFiberConfig'; import type {ReactNodeList} from 'shared/ReactTypes'; import {enableHostSingletons, enableFloat} from 'shared/ReactFeatureFlags'; @@ -41,7 +41,7 @@ import { REACT_MEMO_TYPE, REACT_LAZY_TYPE, } from 'shared/ReactSymbols'; -import {supportsSingletons} from './ReactFiberHostConfig'; +import {supportsSingletons} from './ReactFiberConfig'; export type Family = { current: any, diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js index 351fa122929c7..a7b0cfdbf2b64 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js @@ -16,7 +16,7 @@ import type { SuspenseInstance, Container, HostContext, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import type {SuspenseState} from './ReactFiberSuspenseComponent'; import type {TreeContext} from './ReactFiberTreeContext'; import type {CapturedValue} from './ReactCapturedValue'; @@ -81,7 +81,7 @@ import { canHydrateSuspenseInstance, isHydratableType, isHydratableText, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import {OffscreenLane} from './ReactFiberLane'; import { getSuspendedTreeContext, diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js index 9987d8fd6ad3a..003022a9c6265 100644 --- a/packages/react-reconciler/src/ReactFiberNewContext.js +++ b/packages/react-reconciler/src/ReactFiberNewContext.js @@ -17,7 +17,7 @@ import type {StackCursor} from './ReactFiberStack'; import type {Lanes} from './ReactFiberLane'; import type {SharedQueue} from './ReactFiberClassUpdateQueue'; -import {isPrimaryRenderer} from './ReactFiberHostConfig'; +import {isPrimaryRenderer} from './ReactFiberConfig'; import {createCursor, push, pop} from './ReactFiberStack'; import { ContextProvider, diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index 2b69b09edbff4..5ac1ecaa4ea74 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -20,7 +20,7 @@ import type { Container, PublicInstance, RendererInspectionConfig, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import type {ReactNodeList} from 'shared/ReactTypes'; import type {Lane} from './ReactFiberLane'; import type {SuspenseState} from './ReactFiberSuspenseComponent'; @@ -41,7 +41,7 @@ import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFrom import isArray from 'shared/isArray'; import {enableSchedulingProfiler} from 'shared/ReactFeatureFlags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; -import {getPublicInstance} from './ReactFiberHostConfig'; +import {getPublicInstance} from './ReactFiberConfig'; import { findCurrentUnmaskedContext, processChildContext, diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js index 2733d0ccf3515..35daaf7c10dc4 100644 --- a/packages/react-reconciler/src/ReactFiberRoot.js +++ b/packages/react-reconciler/src/ReactFiberRoot.js @@ -15,9 +15,9 @@ import type { } from './ReactInternalTypes'; import type {RootTag} from './ReactRootTags'; import type {Cache} from './ReactFiberCacheComponent'; -import type {Container} from './ReactFiberHostConfig'; +import type {Container} from './ReactFiberConfig'; -import {noTimeout, supportsHydration} from './ReactFiberHostConfig'; +import {noTimeout, supportsHydration} from './ReactFiberConfig'; import {createHostRootFiber} from './ReactFiber'; import { NoLane, diff --git a/packages/react-reconciler/src/ReactFiberRootScheduler.js b/packages/react-reconciler/src/ReactFiberRootScheduler.js index be14c4695089c..0e972d8f012cf 100644 --- a/packages/react-reconciler/src/ReactFiberRootScheduler.js +++ b/packages/react-reconciler/src/ReactFiberRootScheduler.js @@ -49,7 +49,7 @@ import { IdleEventPriority, lanesToEventPriority, } from './ReactEventPriorities'; -import {supportsMicrotasks, scheduleMicrotask} from './ReactFiberHostConfig'; +import {supportsMicrotasks, scheduleMicrotask} from './ReactFiberConfig'; import ReactSharedInternals from 'shared/ReactSharedInternals'; const {ReactCurrentActQueue} = ReactSharedInternals; diff --git a/packages/react-reconciler/src/ReactFiberScope.js b/packages/react-reconciler/src/ReactFiberScope.js index c663f4a1c537f..a95518aacb31c 100644 --- a/packages/react-reconciler/src/ReactFiberScope.js +++ b/packages/react-reconciler/src/ReactFiberScope.js @@ -18,7 +18,7 @@ import { getPublicInstance, getInstanceFromNode, getInstanceFromScope, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import {isFiberSuspenseAndTimedOut} from './ReactFiberTreeReflection'; import {HostComponent, ScopeComponent, ContextProvider} from './ReactWorkTags'; diff --git a/packages/react-reconciler/src/ReactFiberSuspenseComponent.js b/packages/react-reconciler/src/ReactFiberSuspenseComponent.js index e248ad0719bd7..1f558a44903e2 100644 --- a/packages/react-reconciler/src/ReactFiberSuspenseComponent.js +++ b/packages/react-reconciler/src/ReactFiberSuspenseComponent.js @@ -9,7 +9,7 @@ import type {ReactNodeList, Wakeable} from 'shared/ReactTypes'; import type {Fiber} from './ReactInternalTypes'; -import type {SuspenseInstance} from './ReactFiberHostConfig'; +import type {SuspenseInstance} from './ReactFiberConfig'; import type {Lane} from './ReactFiberLane'; import type {TreeContext} from './ReactFiberTreeContext'; @@ -18,7 +18,7 @@ import {NoFlags, DidCapture} from './ReactFiberFlags'; import { isSuspenseInstancePending, isSuspenseInstanceFallback, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; export type SuspenseProps = { children?: ReactNodeList, diff --git a/packages/react-reconciler/src/ReactFiberTransition.js b/packages/react-reconciler/src/ReactFiberTransition.js index 05cb89991ed7e..a148375a6708e 100644 --- a/packages/react-reconciler/src/ReactFiberTransition.js +++ b/packages/react-reconciler/src/ReactFiberTransition.js @@ -13,7 +13,7 @@ import type {Cache, SpawnedCachePool} from './ReactFiberCacheComponent'; import type {Transition} from './ReactFiberTracingMarkerComponent'; import {enableCache, enableTransitionTracing} from 'shared/ReactFeatureFlags'; -import {isPrimaryRenderer} from './ReactFiberHostConfig'; +import {isPrimaryRenderer} from './ReactFiberConfig'; import {createCursor, push, pop} from './ReactFiberStack'; import { getWorkInProgressRoot, diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js index 6be4e0b2c0807..8828017eee8d3 100644 --- a/packages/react-reconciler/src/ReactFiberTreeReflection.js +++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js @@ -8,7 +8,7 @@ */ import type {Fiber} from './ReactInternalTypes'; -import type {Container, SuspenseInstance} from './ReactFiberHostConfig'; +import type {Container, SuspenseInstance} from './ReactFiberConfig'; import type {SuspenseState} from './ReactFiberSuspenseComponent'; import {get as getInstance} from 'shared/ReactInstanceMap'; diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.js b/packages/react-reconciler/src/ReactFiberWorkLoop.js index 1715eab466c9d..d3e7bfb0c6b42 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.js @@ -77,7 +77,7 @@ import { startSuspendingCommit, waitForCommitToBeReady, preloadInstance, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import { createWorkInProgress, diff --git a/packages/react-reconciler/src/ReactInternalTypes.js b/packages/react-reconciler/src/ReactInternalTypes.js index ae1e75bfe9467..c7264083172f0 100644 --- a/packages/react-reconciler/src/ReactInternalTypes.js +++ b/packages/react-reconciler/src/ReactInternalTypes.js @@ -29,7 +29,7 @@ import type { TimeoutHandle, NoTimeout, SuspenseInstance, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; import type {Cache} from './ReactFiberCacheComponent'; import type { TracingMarkerInstance, diff --git a/packages/react-reconciler/src/ReactMutableSource.js b/packages/react-reconciler/src/ReactMutableSource.js index 218e2171a9c15..b5f1bd197b786 100644 --- a/packages/react-reconciler/src/ReactMutableSource.js +++ b/packages/react-reconciler/src/ReactMutableSource.js @@ -10,7 +10,7 @@ import type {MutableSource, MutableSourceVersion} from 'shared/ReactTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import {isPrimaryRenderer} from './ReactFiberHostConfig'; +import {isPrimaryRenderer} from './ReactFiberConfig'; // Work in progress version numbers only apply to a single render, // and should be reset before starting a new render. diff --git a/packages/react-reconciler/src/ReactPostPaintCallback.js b/packages/react-reconciler/src/ReactPostPaintCallback.js index 419f4514e30f3..76c56e90c3f08 100644 --- a/packages/react-reconciler/src/ReactPostPaintCallback.js +++ b/packages/react-reconciler/src/ReactPostPaintCallback.js @@ -6,7 +6,7 @@ * * @flow */ -import {requestPostPaintCallback} from './ReactFiberHostConfig'; +import {requestPostPaintCallback} from './ReactFiberConfig'; let postPaintCallbackScheduled = false; let callbacks: Array void)> = []; diff --git a/packages/react-reconciler/src/ReactTestSelectors.js b/packages/react-reconciler/src/ReactTestSelectors.js index 0e83c65eb1dbc..34f0529f8cdeb 100644 --- a/packages/react-reconciler/src/ReactTestSelectors.js +++ b/packages/react-reconciler/src/ReactTestSelectors.js @@ -8,7 +8,7 @@ */ import type {Fiber} from 'react-reconciler/src/ReactInternalTypes'; -import type {Instance} from './ReactFiberHostConfig'; +import type {Instance} from './ReactFiberConfig'; import { HostComponent, @@ -27,7 +27,7 @@ import { setFocusIfFocusable, setupIntersectionObserver, supportsTestSelectors, -} from './ReactFiberHostConfig'; +} from './ReactFiberConfig'; let COMPONENT_TYPE: symbol | number = 0b000; let HAS_PSEUDO_CLASS_TYPE: symbol | number = 0b001; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js b/packages/react-reconciler/src/forks/ReactFiberConfig.art.js similarity index 80% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.art.js index da28b3729db7f..867ca996ec5af 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.art.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-art/src/ReactARTHostConfig'; +export * from 'react-art/src/ReactFiberConfigART'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js b/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js similarity index 100% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.custom.js diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.dom-browser.js b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-browser.js new file mode 100644 index 0000000000000..4932b1a787bb9 --- /dev/null +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-browser.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.dom-bun.js b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-bun.js new file mode 100644 index 0000000000000..4932b1a787bb9 --- /dev/null +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-bun.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.dom-edge-webpack.js b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-edge-webpack.js new file mode 100644 index 0000000000000..4932b1a787bb9 --- /dev/null +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-edge-webpack.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.dom-legacy.js b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-legacy.js new file mode 100644 index 0000000000000..4932b1a787bb9 --- /dev/null +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-legacy.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.dom-node-webpack.js b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-node-webpack.js new file mode 100644 index 0000000000000..4932b1a787bb9 --- /dev/null +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-node-webpack.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.dom-node.js b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-node.js new file mode 100644 index 0000000000000..4932b1a787bb9 --- /dev/null +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-node.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.dom-relay.js b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-relay.js new file mode 100644 index 0000000000000..4932b1a787bb9 --- /dev/null +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-relay.js @@ -0,0 +1,10 @@ +/** + * 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 * from 'react-dom-bindings/src/client/ReactFiberConfigDOM'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-legacy.js b/packages/react-reconciler/src/forks/ReactFiberConfig.fabric.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-legacy.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.fabric.js index aae45be9aae50..f1787a68e845b 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-legacy.js +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.fabric.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-dom-bindings/src/client/ReactDOMHostConfig'; +export * from 'react-native-renderer/src/ReactFiberConfigFabric'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-browser.js b/packages/react-reconciler/src/forks/ReactFiberConfig.native-relay.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-browser.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.native-relay.js index aae45be9aae50..f1787a68e845b 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-browser.js +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.native-relay.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-dom-bindings/src/client/ReactDOMHostConfig'; +export * from 'react-native-renderer/src/ReactFiberConfigFabric'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-bun.js b/packages/react-reconciler/src/forks/ReactFiberConfig.native.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-bun.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.native.js index aae45be9aae50..3f8a28688b716 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-bun.js +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.native.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-dom-bindings/src/client/ReactDOMHostConfig'; +export * from 'react-native-renderer/src/ReactFiberConfigNative'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge-webpack.js b/packages/react-reconciler/src/forks/ReactFiberConfig.test.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge-webpack.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.test.js index aae45be9aae50..85020417c2c7d 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge-webpack.js +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.test.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-dom-bindings/src/client/ReactDOMHostConfig'; +export * from 'react-test-renderer/src/ReactFiberConfigTestHost'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node-webpack.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node-webpack.js deleted file mode 100644 index aae45be9aae50..0000000000000 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node-webpack.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-dom-bindings/src/client/ReactDOMHostConfig'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node.js deleted file mode 100644 index aae45be9aae50..0000000000000 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-dom-bindings/src/client/ReactDOMHostConfig'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-relay.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-relay.js deleted file mode 100644 index aae45be9aae50..0000000000000 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-relay.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-dom-bindings/src/client/ReactDOMHostConfig'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.fabric.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.fabric.js deleted file mode 100644 index ff3aa4d230c6b..0000000000000 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.fabric.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-native-renderer/src/ReactFabricHostConfig'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.native-relay.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.native-relay.js deleted file mode 100644 index ff3aa4d230c6b..0000000000000 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.native-relay.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-native-renderer/src/ReactFabricHostConfig'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.native.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.native.js deleted file mode 100644 index ac4c2512bf4eb..0000000000000 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.native.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-native-renderer/src/ReactNativeHostConfig'; diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js deleted file mode 100644 index d2d908ef542b5..0000000000000 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 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 * from 'react-test-renderer/src/ReactTestHostConfig'; diff --git a/packages/react-refresh/src/ReactFreshRuntime.js b/packages/react-refresh/src/ReactFreshRuntime.js index c9706041ce1ff..83650e1badc39 100644 --- a/packages/react-refresh/src/ReactFreshRuntime.js +++ b/packages/react-refresh/src/ReactFreshRuntime.js @@ -7,7 +7,7 @@ * @flow */ -import type {Instance} from 'react-reconciler/src/ReactFiberHostConfig'; +import type {Instance} from 'react-reconciler/src/ReactFiberConfig'; import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes'; import type { Family, diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactFiberConfigTestHost.js similarity index 94% rename from packages/react-test-renderer/src/ReactTestHostConfig.js rename to packages/react-test-renderer/src/ReactFiberConfigTestHost.js index e306f9e1a0b03..2d6c087c81f9c 100644 --- a/packages/react-test-renderer/src/ReactTestHostConfig.js +++ b/packages/react-test-renderer/src/ReactFiberConfigTestHost.js @@ -42,12 +42,12 @@ export type EventResponder = any; export type RendererInspectionConfig = $ReadOnly<{}>; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoTestSelectors'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMicrotasks'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoResources'; -export * from 'react-reconciler/src/ReactFiberHostConfigWithNoSingletons'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoPersistence'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoHydration'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoTestSelectors'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoMicrotasks'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoResources'; +export * from 'react-reconciler/src/ReactFiberConfigWithNoSingletons'; const NO_CONTEXT = {}; const UPDATE_SIGNAL = {}; diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index 2080c287a86f5..26e6d154f32fc 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -12,7 +12,7 @@ import type { PublicInstance, Instance, TextInstance, -} from './ReactTestHostConfig'; +} from './ReactFiberConfigTestHost'; import * as React from 'react'; import * as Scheduler from 'scheduler/unstable_mock'; @@ -50,7 +50,7 @@ import getComponentNameFromType from 'shared/getComponentNameFromType'; import ReactVersion from 'shared/ReactVersion'; import {checkPropStringCoercion} from 'shared/CheckStringCoercion'; -import {getPublicInstance} from './ReactTestHostConfig'; +import {getPublicInstance} from './ReactFiberConfigTestHost'; import {ConcurrentRoot, LegacyRoot} from 'react-reconciler/src/ReactRootTags'; import {allowConcurrentByDefault} from 'shared/ReactFeatureFlags'; diff --git a/scripts/flow/createFlowConfigs.js b/scripts/flow/createFlowConfigs.js index 0193f323dc1f9..4b832be83cb42 100644 --- a/scripts/flow/createFlowConfigs.js +++ b/scripts/flow/createFlowConfigs.js @@ -51,7 +51,7 @@ function writeConfig(renderer, rendererInfo, isServerSupported) { .replace( '%REACT_RENDERER_FLOW_OPTIONS%', ` -module.name_mapper='ReactFiberHostConfig$$' -> 'forks/ReactFiberHostConfig.${renderer}' +module.name_mapper='ReactFiberConfig$$' -> 'forks/ReactFiberConfig.${renderer}' module.name_mapper='ReactServerStreamConfig$$' -> 'forks/ReactServerStreamConfig.${serverRenderer}' module.name_mapper='ReactFizzConfig$$' -> 'forks/ReactFizzConfig.${serverRenderer}' module.name_mapper='ReactFlightServerConfig$$' -> 'forks/ReactFlightServerConfig.${serverRenderer}' diff --git a/scripts/jest/setupHostConfigs.js b/scripts/jest/setupHostConfigs.js index ae19851df93e7..2ed0fe91a8828 100644 --- a/scripts/jest/setupHostConfigs.js +++ b/scripts/jest/setupHostConfigs.js @@ -60,7 +60,7 @@ jest.mock('react/react.shared-subset', () => { // When testing the custom renderer code path through `react-reconciler`, // turn the export into a function, and use the argument as host config. -const shimHostConfigPath = 'react-reconciler/src/ReactFiberHostConfig'; +const shimHostConfigPath = 'react-reconciler/src/ReactFiberConfig'; jest.mock('react-reconciler', () => { return config => { jest.mock(shimHostConfigPath, () => config); @@ -104,7 +104,7 @@ jest.mock('react-client/flight', () => { }); const configPaths = [ - 'react-reconciler/src/ReactFiberHostConfig', + 'react-reconciler/src/ReactFiberConfig', 'react-client/src/ReactFlightClientConfig', 'react-server/src/ReactServerStreamConfig', 'react-server/src/ReactFizzConfig', diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js index 5f6c984604266..d51e784f68378 100644 --- a/scripts/rollup/forks.js +++ b/scripts/rollup/forks.js @@ -246,7 +246,7 @@ const forks = Object.freeze({ } }, - './packages/react-reconciler/src/ReactFiberHostConfig.js': ( + './packages/react-reconciler/src/ReactFiberConfig.js': ( bundleType, entry, dependencies, @@ -261,11 +261,11 @@ const forks = Object.freeze({ // eslint-disable-next-line no-for-of-loops/no-for-of-loops for (let rendererInfo of inlinedHostConfigs) { if (rendererInfo.entryPoints.indexOf(entry) !== -1) { - return `./packages/react-reconciler/src/forks/ReactFiberHostConfig.${rendererInfo.shortName}.js`; + return `./packages/react-reconciler/src/forks/ReactFiberConfig.${rendererInfo.shortName}.js`; } } throw new Error( - 'Expected ReactFiberHostConfig to always be replaced with a shim, but ' + + 'Expected ReactFiberConfig to always be replaced with a shim, but ' + `found no mention of "${entry}" entry point in ./scripts/shared/inlinedHostConfigs.js. ` + 'Did you mean to add it there to associate it with a specific renderer?' ); From e9d300c9851318fbe6ed90a52d522e39b85e5291 Mon Sep 17 00:00:00 2001 From: Josh Story Date: Mon, 10 Apr 2023 10:39:04 -0700 Subject: [PATCH 5/5] We have moved away from HostConfig since the name does not fully describe the configs we customize per runtime like FlightClient, FlightServer, Fizz, and Fiber. This commit generalizes $$$hostconfig to $$$config --- .../forks/ReactFlightClientConfig.custom.js | 20 +- .../src/forks/ReactFiberConfig.custom.js | 262 +++++++++--------- .../ReactFlightServerConfigBundlerCustom.js | 14 +- .../src/forks/ReactFizzConfig.custom.js | 69 +++-- .../forks/ReactServerStreamConfig.custom.js | 28 +- scripts/rollup/wrappers.js | 6 +- 6 files changed, 196 insertions(+), 203 deletions(-) diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.custom.js b/packages/react-client/src/forks/ReactFlightClientConfig.custom.js index 30810a69ebeb0..4990e84e7cb09 100644 --- a/packages/react-client/src/forks/ReactFlightClientConfig.custom.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.custom.js @@ -23,7 +23,7 @@ // So `$$$config` looks like a global variable, but it's // really an argument to a top-level wrapping function. -declare var $$$hostConfig: any; +declare var $$$config: any; export type Response = any; export opaque type SSRManifest = mixed; @@ -31,19 +31,19 @@ export opaque type ServerManifest = mixed; export opaque type ServerReferenceId = string; export opaque type ClientReferenceMetadata = mixed; export opaque type ClientReference = mixed; // eslint-disable-line no-unused-vars -export const resolveClientReference = $$$hostConfig.resolveClientReference; -export const resolveServerReference = $$$hostConfig.resolveServerReference; -export const preloadModule = $$$hostConfig.preloadModule; -export const requireModule = $$$hostConfig.requireModule; +export const resolveClientReference = $$$config.resolveClientReference; +export const resolveServerReference = $$$config.resolveServerReference; +export const preloadModule = $$$config.preloadModule; +export const requireModule = $$$config.requireModule; export opaque type Source = mixed; export type UninitializedModel = string; -export const parseModel = $$$hostConfig.parseModel; +export const parseModel = $$$config.parseModel; export opaque type StringDecoder = mixed; // eslint-disable-line no-undef -export const supportsBinaryStreams = $$$hostConfig.supportsBinaryStreams; -export const createStringDecoder = $$$hostConfig.createStringDecoder; -export const readPartialStringChunk = $$$hostConfig.readPartialStringChunk; -export const readFinalStringChunk = $$$hostConfig.readFinalStringChunk; +export const supportsBinaryStreams = $$$config.supportsBinaryStreams; +export const createStringDecoder = $$$config.createStringDecoder; +export const readPartialStringChunk = $$$config.readPartialStringChunk; +export const readFinalStringChunk = $$$config.readFinalStringChunk; diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js b/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js index 995da3a931243..e791f63d7ec4a 100644 --- a/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js @@ -23,7 +23,7 @@ // So `$$$config` looks like a global variable, but it's // really an argument to a top-level wrapping function. -declare var $$$hostConfig: any; +declare var $$$config: any; export opaque type Type = mixed; // eslint-disable-line no-undef export opaque type Props = mixed; // eslint-disable-line no-undef export opaque type Container = mixed; // eslint-disable-line no-undef @@ -40,168 +40,163 @@ export opaque type NoTimeout = mixed; // eslint-disable-line no-undef export opaque type RendererInspectionConfig = mixed; // eslint-disable-line no-undef export type EventResponder = any; -export const getPublicInstance = $$$hostConfig.getPublicInstance; -export const getRootHostContext = $$$hostConfig.getRootHostContext; -export const getChildHostContext = $$$hostConfig.getChildHostContext; -export const prepareForCommit = $$$hostConfig.prepareForCommit; -export const resetAfterCommit = $$$hostConfig.resetAfterCommit; -export const createInstance = $$$hostConfig.createInstance; -export const appendInitialChild = $$$hostConfig.appendInitialChild; -export const finalizeInitialChildren = $$$hostConfig.finalizeInitialChildren; -export const prepareUpdate = $$$hostConfig.prepareUpdate; -export const shouldSetTextContent = $$$hostConfig.shouldSetTextContent; -export const createTextInstance = $$$hostConfig.createTextInstance; -export const scheduleTimeout = $$$hostConfig.scheduleTimeout; -export const cancelTimeout = $$$hostConfig.cancelTimeout; -export const noTimeout = $$$hostConfig.noTimeout; -export const isPrimaryRenderer = $$$hostConfig.isPrimaryRenderer; -export const warnsIfNotActing = $$$hostConfig.warnsIfNotActing; -export const supportsMutation = $$$hostConfig.supportsMutation; -export const supportsPersistence = $$$hostConfig.supportsPersistence; -export const supportsHydration = $$$hostConfig.supportsHydration; -export const getInstanceFromNode = $$$hostConfig.getInstanceFromNode; -export const beforeActiveInstanceBlur = $$$hostConfig.beforeActiveInstanceBlur; -export const afterActiveInstanceBlur = $$$hostConfig.afterActiveInstanceBlur; -export const preparePortalMount = $$$hostConfig.preparePortalMount; -export const prepareScopeUpdate = $$$hostConfig.prepareScopeUpdate; -export const getInstanceFromScope = $$$hostConfig.getInstanceFromScope; -export const getCurrentEventPriority = $$$hostConfig.getCurrentEventPriority; -export const detachDeletedInstance = $$$hostConfig.detachDeletedInstance; -export const requestPostPaintCallback = $$$hostConfig.requestPostPaintCallback; -export const maySuspendCommit = $$$hostConfig.maySuspendCommit; -export const preloadInstance = $$$hostConfig.preloadInstance; -export const startSuspendingCommit = $$$hostConfig.startSuspendingCommit; -export const suspendInstance = $$$hostConfig.suspendInstance; -export const waitForCommitToBeReady = $$$hostConfig.waitForCommitToBeReady; -export const prepareRendererToRender = $$$hostConfig.prepareRendererToRender; -export const resetRendererAfterRender = $$$hostConfig.resetRendererAfterRender; +export const getPublicInstance = $$$config.getPublicInstance; +export const getRootHostContext = $$$config.getRootHostContext; +export const getChildHostContext = $$$config.getChildHostContext; +export const prepareForCommit = $$$config.prepareForCommit; +export const resetAfterCommit = $$$config.resetAfterCommit; +export const createInstance = $$$config.createInstance; +export const appendInitialChild = $$$config.appendInitialChild; +export const finalizeInitialChildren = $$$config.finalizeInitialChildren; +export const prepareUpdate = $$$config.prepareUpdate; +export const shouldSetTextContent = $$$config.shouldSetTextContent; +export const createTextInstance = $$$config.createTextInstance; +export const scheduleTimeout = $$$config.scheduleTimeout; +export const cancelTimeout = $$$config.cancelTimeout; +export const noTimeout = $$$config.noTimeout; +export const isPrimaryRenderer = $$$config.isPrimaryRenderer; +export const warnsIfNotActing = $$$config.warnsIfNotActing; +export const supportsMutation = $$$config.supportsMutation; +export const supportsPersistence = $$$config.supportsPersistence; +export const supportsHydration = $$$config.supportsHydration; +export const getInstanceFromNode = $$$config.getInstanceFromNode; +export const beforeActiveInstanceBlur = $$$config.beforeActiveInstanceBlur; +export const afterActiveInstanceBlur = $$$config.afterActiveInstanceBlur; +export const preparePortalMount = $$$config.preparePortalMount; +export const prepareScopeUpdate = $$$config.prepareScopeUpdate; +export const getInstanceFromScope = $$$config.getInstanceFromScope; +export const getCurrentEventPriority = $$$config.getCurrentEventPriority; +export const detachDeletedInstance = $$$config.detachDeletedInstance; +export const requestPostPaintCallback = $$$config.requestPostPaintCallback; +export const maySuspendCommit = $$$config.maySuspendCommit; +export const preloadInstance = $$$config.preloadInstance; +export const startSuspendingCommit = $$$config.startSuspendingCommit; +export const suspendInstance = $$$config.suspendInstance; +export const waitForCommitToBeReady = $$$config.waitForCommitToBeReady; +export const prepareRendererToRender = $$$config.prepareRendererToRender; +export const resetRendererAfterRender = $$$config.resetRendererAfterRender; // ------------------- // Microtasks // (optional) // ------------------- -export const supportsMicrotasks = $$$hostConfig.supportsMicrotasks; -export const scheduleMicrotask = $$$hostConfig.scheduleMicrotask; +export const supportsMicrotasks = $$$config.supportsMicrotasks; +export const scheduleMicrotask = $$$config.scheduleMicrotask; // ------------------- // Test selectors // (optional) // ------------------- -export const supportsTestSelectors = $$$hostConfig.supportsTestSelectors; -export const findFiberRoot = $$$hostConfig.findFiberRoot; -export const getBoundingRect = $$$hostConfig.getBoundingRect; -export const getTextContent = $$$hostConfig.getTextContent; -export const isHiddenSubtree = $$$hostConfig.isHiddenSubtree; -export const matchAccessibilityRole = $$$hostConfig.matchAccessibilityRole; -export const setFocusIfFocusable = $$$hostConfig.setFocusIfFocusable; -export const setupIntersectionObserver = - $$$hostConfig.setupIntersectionObserver; +export const supportsTestSelectors = $$$config.supportsTestSelectors; +export const findFiberRoot = $$$config.findFiberRoot; +export const getBoundingRect = $$$config.getBoundingRect; +export const getTextContent = $$$config.getTextContent; +export const isHiddenSubtree = $$$config.isHiddenSubtree; +export const matchAccessibilityRole = $$$config.matchAccessibilityRole; +export const setFocusIfFocusable = $$$config.setFocusIfFocusable; +export const setupIntersectionObserver = $$$config.setupIntersectionObserver; // ------------------- // Mutation // (optional) // ------------------- -export const appendChild = $$$hostConfig.appendChild; -export const appendChildToContainer = $$$hostConfig.appendChildToContainer; -export const commitTextUpdate = $$$hostConfig.commitTextUpdate; -export const commitMount = $$$hostConfig.commitMount; -export const commitUpdate = $$$hostConfig.commitUpdate; -export const insertBefore = $$$hostConfig.insertBefore; -export const insertInContainerBefore = $$$hostConfig.insertInContainerBefore; -export const removeChild = $$$hostConfig.removeChild; -export const removeChildFromContainer = $$$hostConfig.removeChildFromContainer; -export const resetTextContent = $$$hostConfig.resetTextContent; -export const hideInstance = $$$hostConfig.hideInstance; -export const hideTextInstance = $$$hostConfig.hideTextInstance; -export const unhideInstance = $$$hostConfig.unhideInstance; -export const unhideTextInstance = $$$hostConfig.unhideTextInstance; -export const clearContainer = $$$hostConfig.clearContainer; +export const appendChild = $$$config.appendChild; +export const appendChildToContainer = $$$config.appendChildToContainer; +export const commitTextUpdate = $$$config.commitTextUpdate; +export const commitMount = $$$config.commitMount; +export const commitUpdate = $$$config.commitUpdate; +export const insertBefore = $$$config.insertBefore; +export const insertInContainerBefore = $$$config.insertInContainerBefore; +export const removeChild = $$$config.removeChild; +export const removeChildFromContainer = $$$config.removeChildFromContainer; +export const resetTextContent = $$$config.resetTextContent; +export const hideInstance = $$$config.hideInstance; +export const hideTextInstance = $$$config.hideTextInstance; +export const unhideInstance = $$$config.unhideInstance; +export const unhideTextInstance = $$$config.unhideTextInstance; +export const clearContainer = $$$config.clearContainer; // ------------------- // Persistence // (optional) // ------------------- -export const cloneInstance = $$$hostConfig.cloneInstance; -export const createContainerChildSet = $$$hostConfig.createContainerChildSet; +export const cloneInstance = $$$config.cloneInstance; +export const createContainerChildSet = $$$config.createContainerChildSet; export const appendChildToContainerChildSet = - $$$hostConfig.appendChildToContainerChildSet; -export const finalizeContainerChildren = - $$$hostConfig.finalizeContainerChildren; -export const replaceContainerChildren = $$$hostConfig.replaceContainerChildren; -export const cloneHiddenInstance = $$$hostConfig.cloneHiddenInstance; -export const cloneHiddenTextInstance = $$$hostConfig.cloneHiddenTextInstance; + $$$config.appendChildToContainerChildSet; +export const finalizeContainerChildren = $$$config.finalizeContainerChildren; +export const replaceContainerChildren = $$$config.replaceContainerChildren; +export const cloneHiddenInstance = $$$config.cloneHiddenInstance; +export const cloneHiddenTextInstance = $$$config.cloneHiddenTextInstance; // ------------------- // Hydration // (optional) // ------------------- -export const isHydratableType = $$$hostConfig.isHydratableType; -export const isHydratableText = $$$hostConfig.isHydratableText; -export const isSuspenseInstancePending = - $$$hostConfig.isSuspenseInstancePending; -export const isSuspenseInstanceFallback = - $$$hostConfig.isSuspenseInstanceFallback; +export const isHydratableType = $$$config.isHydratableType; +export const isHydratableText = $$$config.isHydratableText; +export const isSuspenseInstancePending = $$$config.isSuspenseInstancePending; +export const isSuspenseInstanceFallback = $$$config.isSuspenseInstanceFallback; export const getSuspenseInstanceFallbackErrorDetails = - $$$hostConfig.getSuspenseInstanceFallbackErrorDetails; + $$$config.getSuspenseInstanceFallbackErrorDetails; export const registerSuspenseInstanceRetry = - $$$hostConfig.registerSuspenseInstanceRetry; -export const getNextHydratableSibling = $$$hostConfig.getNextHydratableSibling; -export const getFirstHydratableChild = $$$hostConfig.getFirstHydratableChild; + $$$config.registerSuspenseInstanceRetry; +export const getNextHydratableSibling = $$$config.getNextHydratableSibling; +export const getFirstHydratableChild = $$$config.getFirstHydratableChild; export const getFirstHydratableChildWithinContainer = - $$$hostConfig.getFirstHydratableChildWithinContainer; + $$$config.getFirstHydratableChildWithinContainer; export const getFirstHydratableChildWithinSuspenseInstance = - $$$hostConfig.getFirstHydratableChildWithinSuspenseInstance; + $$$config.getFirstHydratableChildWithinSuspenseInstance; export const shouldSkipHydratableForInstance = - $$$hostConfig.shouldSkipHydratableForInstance; + $$$config.shouldSkipHydratableForInstance; export const shouldSkipHydratableForTextInstance = - $$$hostConfig.shouldSkipHydratableForTextInstance; + $$$config.shouldSkipHydratableForTextInstance; export const shouldSkipHydratableForSuspenseInstance = - $$$hostConfig.shouldSkipHydratableForSuspenseInstance; -export const canHydrateInstance = $$$hostConfig.canHydrateInstance; -export const canHydrateTextInstance = $$$hostConfig.canHydrateTextInstance; -export const canHydrateSuspenseInstance = - $$$hostConfig.canHydrateSuspenseInstance; -export const hydrateInstance = $$$hostConfig.hydrateInstance; -export const hydrateTextInstance = $$$hostConfig.hydrateTextInstance; -export const hydrateSuspenseInstance = $$$hostConfig.hydrateSuspenseInstance; + $$$config.shouldSkipHydratableForSuspenseInstance; +export const canHydrateInstance = $$$config.canHydrateInstance; +export const canHydrateTextInstance = $$$config.canHydrateTextInstance; +export const canHydrateSuspenseInstance = $$$config.canHydrateSuspenseInstance; +export const hydrateInstance = $$$config.hydrateInstance; +export const hydrateTextInstance = $$$config.hydrateTextInstance; +export const hydrateSuspenseInstance = $$$config.hydrateSuspenseInstance; export const getNextHydratableInstanceAfterSuspenseInstance = - $$$hostConfig.getNextHydratableInstanceAfterSuspenseInstance; -export const commitHydratedContainer = $$$hostConfig.commitHydratedContainer; + $$$config.getNextHydratableInstanceAfterSuspenseInstance; +export const commitHydratedContainer = $$$config.commitHydratedContainer; export const commitHydratedSuspenseInstance = - $$$hostConfig.commitHydratedSuspenseInstance; -export const clearSuspenseBoundary = $$$hostConfig.clearSuspenseBoundary; + $$$config.commitHydratedSuspenseInstance; +export const clearSuspenseBoundary = $$$config.clearSuspenseBoundary; export const clearSuspenseBoundaryFromContainer = - $$$hostConfig.clearSuspenseBoundaryFromContainer; + $$$config.clearSuspenseBoundaryFromContainer; export const shouldDeleteUnhydratedTailInstances = - $$$hostConfig.shouldDeleteUnhydratedTailInstances; + $$$config.shouldDeleteUnhydratedTailInstances; export const didNotMatchHydratedContainerTextInstance = - $$$hostConfig.didNotMatchHydratedContainerTextInstance; + $$$config.didNotMatchHydratedContainerTextInstance; export const didNotMatchHydratedTextInstance = - $$$hostConfig.didNotMatchHydratedTextInstance; + $$$config.didNotMatchHydratedTextInstance; export const didNotHydrateInstanceWithinContainer = - $$$hostConfig.didNotHydrateInstanceWithinContainer; + $$$config.didNotHydrateInstanceWithinContainer; export const didNotHydrateInstanceWithinSuspenseInstance = - $$$hostConfig.didNotHydrateInstanceWithinSuspenseInstance; -export const didNotHydrateInstance = $$$hostConfig.didNotHydrateInstance; + $$$config.didNotHydrateInstanceWithinSuspenseInstance; +export const didNotHydrateInstance = $$$config.didNotHydrateInstance; export const didNotFindHydratableInstanceWithinContainer = - $$$hostConfig.didNotFindHydratableInstanceWithinContainer; + $$$config.didNotFindHydratableInstanceWithinContainer; export const didNotFindHydratableTextInstanceWithinContainer = - $$$hostConfig.didNotFindHydratableTextInstanceWithinContainer; + $$$config.didNotFindHydratableTextInstanceWithinContainer; export const didNotFindHydratableSuspenseInstanceWithinContainer = - $$$hostConfig.didNotFindHydratableSuspenseInstanceWithinContainer; + $$$config.didNotFindHydratableSuspenseInstanceWithinContainer; export const didNotFindHydratableInstanceWithinSuspenseInstance = - $$$hostConfig.didNotFindHydratableInstanceWithinSuspenseInstance; + $$$config.didNotFindHydratableInstanceWithinSuspenseInstance; export const didNotFindHydratableTextInstanceWithinSuspenseInstance = - $$$hostConfig.didNotFindHydratableTextInstanceWithinSuspenseInstance; + $$$config.didNotFindHydratableTextInstanceWithinSuspenseInstance; export const didNotFindHydratableSuspenseInstanceWithinSuspenseInstance = - $$$hostConfig.didNotFindHydratableSuspenseInstanceWithinSuspenseInstance; + $$$config.didNotFindHydratableSuspenseInstanceWithinSuspenseInstance; export const didNotFindHydratableInstance = - $$$hostConfig.didNotFindHydratableInstance; + $$$config.didNotFindHydratableInstance; export const didNotFindHydratableTextInstance = - $$$hostConfig.didNotFindHydratableTextInstance; + $$$config.didNotFindHydratableTextInstance; export const didNotFindHydratableSuspenseInstance = - $$$hostConfig.didNotFindHydratableSuspenseInstance; -export const errorHydratingContainer = $$$hostConfig.errorHydratingContainer; + $$$config.didNotFindHydratableSuspenseInstance; +export const errorHydratingContainer = $$$config.errorHydratingContainer; // ------------------- // Resources @@ -209,29 +204,28 @@ export const errorHydratingContainer = $$$hostConfig.errorHydratingContainer; // ------------------- export type HoistableRoot = mixed; export type Resource = mixed; // eslint-disable-line no-undef -export const supportsResources = $$$hostConfig.supportsResources; -export const isHostHoistableType = $$$hostConfig.isHostHoistableType; -export const getHoistableRoot = $$$hostConfig.getHoistableRoot; -export const getResource = $$$hostConfig.getResource; -export const acquireResource = $$$hostConfig.acquireResource; -export const releaseResource = $$$hostConfig.releaseResource; -export const hydrateHoistable = $$$hostConfig.hydrateHoistable; -export const mountHoistable = $$$hostConfig.mountHoistable; -export const unmountHoistable = $$$hostConfig.unmountHoistable; -export const createHoistableInstance = $$$hostConfig.createHoistableInstance; -export const prepareToCommitHoistables = - $$$hostConfig.prepareToCommitHoistables; -export const mayResourceSuspendCommit = $$$hostConfig.mayResourceSuspendCommit; -export const preloadResource = $$$hostConfig.preloadResource; -export const suspendResource = $$$hostConfig.suspendResource; +export const supportsResources = $$$config.supportsResources; +export const isHostHoistableType = $$$config.isHostHoistableType; +export const getHoistableRoot = $$$config.getHoistableRoot; +export const getResource = $$$config.getResource; +export const acquireResource = $$$config.acquireResource; +export const releaseResource = $$$config.releaseResource; +export const hydrateHoistable = $$$config.hydrateHoistable; +export const mountHoistable = $$$config.mountHoistable; +export const unmountHoistable = $$$config.unmountHoistable; +export const createHoistableInstance = $$$config.createHoistableInstance; +export const prepareToCommitHoistables = $$$config.prepareToCommitHoistables; +export const mayResourceSuspendCommit = $$$config.mayResourceSuspendCommit; +export const preloadResource = $$$config.preloadResource; +export const suspendResource = $$$config.suspendResource; // ------------------- // Singletons // (optional) // ------------------- -export const supportsSingletons = $$$hostConfig.supportsSingletons; -export const resolveSingletonInstance = $$$hostConfig.resolveSingletonInstance; -export const clearSingleton = $$$hostConfig.clearSingleton; -export const acquireSingletonInstance = $$$hostConfig.acquireSingletonInstance; -export const releaseSingletonInstance = $$$hostConfig.releaseSingletonInstance; -export const isHostSingletonType = $$$hostConfig.isHostSingletonType; +export const supportsSingletons = $$$config.supportsSingletons; +export const resolveSingletonInstance = $$$config.resolveSingletonInstance; +export const clearSingleton = $$$config.clearSingleton; +export const acquireSingletonInstance = $$$config.acquireSingletonInstance; +export const releaseSingletonInstance = $$$config.releaseSingletonInstance; +export const isHostSingletonType = $$$config.isHostSingletonType; diff --git a/packages/react-server/src/ReactFlightServerConfigBundlerCustom.js b/packages/react-server/src/ReactFlightServerConfigBundlerCustom.js index b8254bb51d3cd..e11c154d05f32 100644 --- a/packages/react-server/src/ReactFlightServerConfigBundlerCustom.js +++ b/packages/react-server/src/ReactFlightServerConfigBundlerCustom.js @@ -7,7 +7,7 @@ * @flow */ -declare var $$$hostConfig: any; +declare var $$$config: any; export opaque type ClientManifest = mixed; export opaque type ClientReference = mixed; // eslint-disable-line no-unused-vars @@ -15,11 +15,11 @@ export opaque type ServerReference = mixed; // eslint-disable-line no-unused- export opaque type ClientReferenceMetadata: any = mixed; export opaque type ServerReferenceId: any = mixed; export opaque type ClientReferenceKey: any = mixed; -export const isClientReference = $$$hostConfig.isClientReference; -export const isServerReference = $$$hostConfig.isServerReference; -export const getClientReferenceKey = $$$hostConfig.getClientReferenceKey; +export const isClientReference = $$$config.isClientReference; +export const isServerReference = $$$config.isServerReference; +export const getClientReferenceKey = $$$config.getClientReferenceKey; export const resolveClientReferenceMetadata = - $$$hostConfig.resolveClientReferenceMetadata; -export const getServerReferenceId = $$$hostConfig.getServerReferenceId; + $$$config.resolveClientReferenceMetadata; +export const getServerReferenceId = $$$config.getServerReferenceId; export const getServerReferenceBoundArguments = - $$$hostConfig.getServerReferenceBoundArguments; + $$$config.getServerReferenceBoundArguments; diff --git a/packages/react-server/src/forks/ReactFizzConfig.custom.js b/packages/react-server/src/forks/ReactFizzConfig.custom.js index 33f6c5aa65ddb..f761eb392f3c0 100644 --- a/packages/react-server/src/forks/ReactFizzConfig.custom.js +++ b/packages/react-server/src/forks/ReactFizzConfig.custom.js @@ -23,7 +23,7 @@ // So `$$$config` looks like a global variable, but it's // really an argument to a top-level wrapping function. -declare var $$$hostConfig: any; +declare var $$$config: any; export opaque type Destination = mixed; // eslint-disable-line no-undef export opaque type ResponseState = mixed; export opaque type Resources = mixed; @@ -33,54 +33,53 @@ export opaque type SuspenseBoundaryID = mixed; export const isPrimaryRenderer = false; -export const getChildFormatContext = $$$hostConfig.getChildFormatContext; +export const getChildFormatContext = $$$config.getChildFormatContext; export const UNINITIALIZED_SUSPENSE_BOUNDARY_ID = - $$$hostConfig.UNINITIALIZED_SUSPENSE_BOUNDARY_ID; -export const assignSuspenseBoundaryID = $$$hostConfig.assignSuspenseBoundaryID; -export const makeId = $$$hostConfig.makeId; -export const pushTextInstance = $$$hostConfig.pushTextInstance; -export const pushStartInstance = $$$hostConfig.pushStartInstance; -export const pushEndInstance = $$$hostConfig.pushEndInstance; + $$$config.UNINITIALIZED_SUSPENSE_BOUNDARY_ID; +export const assignSuspenseBoundaryID = $$$config.assignSuspenseBoundaryID; +export const makeId = $$$config.makeId; +export const pushTextInstance = $$$config.pushTextInstance; +export const pushStartInstance = $$$config.pushStartInstance; +export const pushEndInstance = $$$config.pushEndInstance; export const pushStartCompletedSuspenseBoundary = - $$$hostConfig.pushStartCompletedSuspenseBoundary; + $$$config.pushStartCompletedSuspenseBoundary; export const pushEndCompletedSuspenseBoundary = - $$$hostConfig.pushEndCompletedSuspenseBoundary; -export const pushSegmentFinale = $$$hostConfig.pushSegmentFinale; -export const writeCompletedRoot = $$$hostConfig.writeCompletedRoot; -export const writePlaceholder = $$$hostConfig.writePlaceholder; + $$$config.pushEndCompletedSuspenseBoundary; +export const pushSegmentFinale = $$$config.pushSegmentFinale; +export const writeCompletedRoot = $$$config.writeCompletedRoot; +export const writePlaceholder = $$$config.writePlaceholder; export const writeStartCompletedSuspenseBoundary = - $$$hostConfig.writeStartCompletedSuspenseBoundary; + $$$config.writeStartCompletedSuspenseBoundary; export const writeStartPendingSuspenseBoundary = - $$$hostConfig.writeStartPendingSuspenseBoundary; + $$$config.writeStartPendingSuspenseBoundary; export const writeStartClientRenderedSuspenseBoundary = - $$$hostConfig.writeStartClientRenderedSuspenseBoundary; + $$$config.writeStartClientRenderedSuspenseBoundary; export const writeEndCompletedSuspenseBoundary = - $$$hostConfig.writeEndCompletedSuspenseBoundary; + $$$config.writeEndCompletedSuspenseBoundary; export const writeEndPendingSuspenseBoundary = - $$$hostConfig.writeEndPendingSuspenseBoundary; + $$$config.writeEndPendingSuspenseBoundary; export const writeEndClientRenderedSuspenseBoundary = - $$$hostConfig.writeEndClientRenderedSuspenseBoundary; -export const writeStartSegment = $$$hostConfig.writeStartSegment; -export const writeEndSegment = $$$hostConfig.writeEndSegment; + $$$config.writeEndClientRenderedSuspenseBoundary; +export const writeStartSegment = $$$config.writeStartSegment; +export const writeEndSegment = $$$config.writeEndSegment; export const writeCompletedSegmentInstruction = - $$$hostConfig.writeCompletedSegmentInstruction; + $$$config.writeCompletedSegmentInstruction; export const writeCompletedBoundaryInstruction = - $$$hostConfig.writeCompletedBoundaryInstruction; + $$$config.writeCompletedBoundaryInstruction; export const writeClientRenderBoundaryInstruction = - $$$hostConfig.writeClientRenderBoundaryInstruction; -export const prepareToRender = $$$hostConfig.prepareToRender; -export const cleanupAfterRender = $$$hostConfig.cleanupAfterRender; + $$$config.writeClientRenderBoundaryInstruction; +export const prepareToRender = $$$config.prepareToRender; +export const cleanupAfterRender = $$$config.cleanupAfterRender; // ------------------------- // Resources // ------------------------- -export const writePreamble = $$$hostConfig.writePreamble; -export const writeHoistables = $$$hostConfig.writeHoistables; -export const writePostamble = $$$hostConfig.writePostamble; -export const hoistResources = $$$hostConfig.hoistResources; -export const createResources = $$$hostConfig.createResources; -export const createBoundaryResources = $$$hostConfig.createBoundaryResources; +export const writePreamble = $$$config.writePreamble; +export const writeHoistables = $$$config.writeHoistables; +export const writePostamble = $$$config.writePostamble; +export const hoistResources = $$$config.hoistResources; +export const createResources = $$$config.createResources; +export const createBoundaryResources = $$$config.createBoundaryResources; export const setCurrentlyRenderingBoundaryResourcesTarget = - $$$hostConfig.setCurrentlyRenderingBoundaryResourcesTarget; -export const writeResourcesForBoundary = - $$$hostConfig.writeResourcesForBoundary; + $$$config.setCurrentlyRenderingBoundaryResourcesTarget; +export const writeResourcesForBoundary = $$$config.writeResourcesForBoundary; diff --git a/packages/react-server/src/forks/ReactServerStreamConfig.custom.js b/packages/react-server/src/forks/ReactServerStreamConfig.custom.js index 0e7bafab961aa..ed00afa434e7e 100644 --- a/packages/react-server/src/forks/ReactServerStreamConfig.custom.js +++ b/packages/react-server/src/forks/ReactServerStreamConfig.custom.js @@ -23,22 +23,22 @@ // So `$$$config` looks like a global variable, but it's // really an argument to a top-level wrapping function. -declare var $$$hostConfig: any; +declare var $$$config: any; export opaque type Destination = mixed; // eslint-disable-line no-undef export opaque type PrecomputedChunk = mixed; // eslint-disable-line no-undef export opaque type Chunk = mixed; // eslint-disable-line no-undef -export const scheduleWork = $$$hostConfig.scheduleWork; -export const beginWriting = $$$hostConfig.beginWriting; -export const writeChunk = $$$hostConfig.writeChunk; -export const writeChunkAndReturn = $$$hostConfig.writeChunkAndReturn; -export const completeWriting = $$$hostConfig.completeWriting; -export const flushBuffered = $$$hostConfig.flushBuffered; -export const supportsRequestStorage = $$$hostConfig.supportsRequestStorage; -export const requestStorage = $$$hostConfig.requestStorage; -export const close = $$$hostConfig.close; -export const closeWithError = $$$hostConfig.closeWithError; -export const stringToChunk = $$$hostConfig.stringToChunk; -export const stringToPrecomputedChunk = $$$hostConfig.stringToPrecomputedChunk; -export const clonePrecomputedChunk = $$$hostConfig.clonePrecomputedChunk; +export const scheduleWork = $$$config.scheduleWork; +export const beginWriting = $$$config.beginWriting; +export const writeChunk = $$$config.writeChunk; +export const writeChunkAndReturn = $$$config.writeChunkAndReturn; +export const completeWriting = $$$config.completeWriting; +export const flushBuffered = $$$config.flushBuffered; +export const supportsRequestStorage = $$$config.supportsRequestStorage; +export const requestStorage = $$$config.requestStorage; +export const close = $$$config.close; +export const closeWithError = $$$config.closeWithError; +export const stringToChunk = $$$config.stringToChunk; +export const stringToPrecomputedChunk = $$$config.stringToPrecomputedChunk; +export const clonePrecomputedChunk = $$$config.clonePrecomputedChunk; diff --git a/scripts/rollup/wrappers.js b/scripts/rollup/wrappers.js index d9b0a60c12cfa..237e49c912519 100644 --- a/scripts/rollup/wrappers.js +++ b/scripts/rollup/wrappers.js @@ -349,7 +349,7 @@ ${license} 'use strict'; if (process.env.NODE_ENV !== "production") { - module.exports = function $$$reconciler($$$hostConfig) { + module.exports = function $$$reconciler($$$config) { var exports = {}; ${source} return exports; @@ -368,7 +368,7 @@ ${source} * ${license} */ -module.exports = function $$$reconciler($$$hostConfig) { +module.exports = function $$$reconciler($$$config) { var exports = {}; ${source} @@ -387,7 +387,7 @@ Object.defineProperty(module.exports, "__esModule", { value: true }); * ${license} */ -module.exports = function $$$reconciler($$$hostConfig) { +module.exports = function $$$reconciler($$$config) { var exports = {}; ${source} return exports;