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 97a6b421b9f0..591072cec84e 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-client/src/ReactFlightClient.js b/packages/react-client/src/ReactFlightClient.js index 32fb4f1c907d..e14b6a769995 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 1a06961a1109..62a8b248d78c 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 56772ec4a42b..81633e696696 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 65% rename from packages/react-client/src/forks/ReactFlightClientHostConfig.custom.js rename to packages/react-client/src/forks/ReactFlightClientConfig.custom.js index 30810a69ebeb..4990e84e7cb0 100644 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.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-client/src/forks/ReactFlightClientConfig.dom-browser.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js new file mode 100644 index 000000000000..8de1c06df33f --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.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 + */ + +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/ReactFlightClientHostConfig.dom-bun.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js similarity index 76% rename from packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js rename to packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js index 28a1f34997f9..a1c0a72c129b 100644 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js @@ -7,8 +7,9 @@ * @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 * 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 new file mode 100644 index 000000000000..8de1c06df33f --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.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 + */ + +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 new file mode 100644 index 000000000000..8de1c06df33f --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.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 + */ + +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 new file mode 100644 index 000000000000..dba506435584 --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.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 + */ + +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 new file mode 100644 index 000000000000..a8aaffa969c4 --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-node.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 + */ + +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/ReactFlightClientHostConfig.native-relay.js b/packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js similarity index 50% rename from packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js rename to packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js index 7916d16829d0..17540fb20371 100644 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js +++ b/packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js @@ -7,5 +7,6 @@ * @flow */ -export * from 'react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig'; -export * from '../ReactFlightClientHostConfigNoStream'; +export * from 'react-server-dom-relay/src/ReactFlightClientConfigDOMRelay'; +export * from '../ReactFlightClientConfigNoStream'; +export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM'; diff --git a/packages/react-client/src/forks/ReactFlightClientConfig.native-relay.js b/packages/react-client/src/forks/ReactFlightClientConfig.native-relay.js new file mode 100644 index 000000000000..b0110b5ffe68 --- /dev/null +++ b/packages/react-client/src/forks/ReactFlightClientConfig.native-relay.js @@ -0,0 +1,11 @@ +/** + * 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-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 4aae8141fd56..000000000000 --- 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 4aae8141fd56..000000000000 --- 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 4aae8141fd56..000000000000 --- 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 8b9b2defedff..000000000000 --- 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 5c20adb28641..000000000000 --- 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-dom-bindings/src/client/ReactDOMComponentTree.js b/packages/react-dom-bindings/src/client/ReactDOMComponentTree.js index 3f8044ac9fb8..839f346c9d88 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 48b1f41b85fc..8dd5252609d5 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 d10e8fccfbec..70cec7fa0e60 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 48c9884c4287..59fc3a8a6181 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 2cdb8cfdfbee..68ab23e21947 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 baa33f1a7c5c..4a69f20df9b8 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/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 5ca51fbcbbac..1707b4d2c13e 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-client/src/forks/ReactFlightClientHostConfig.dom-relay.js b/packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js similarity index 51% rename from packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js rename to packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js index ccde93cb2959..e2daf606c8eb 100644 --- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js +++ b/packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js @@ -7,5 +7,6 @@ * @flow */ -export * from 'react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig'; -export * from '../ReactFlightClientHostConfigNoStream'; +// 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/server/fizz-instruction-set/ReactDOMFizzInstructionSetShared.js b/packages/react-dom-bindings/src/server/fizz-instruction-set/ReactDOMFizzInstructionSetShared.js index e439a87a9614..6058eddaad7e 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-bindings/src/shared/ReactFlightClientConfigDOM.js b/packages/react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js new file mode 100644 index 000000000000..d92d7d50ea06 --- /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-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index ef5d3234190e..d6ef4261246d 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 1973e97ada52..b8b1fc43239a 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 96d32f862220..b0f53ccdf06f 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-dom/src/server/ReactDOMFizzServerBrowser.js b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js index a6c27a28ffde..2c4080b61234 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 4187903875da..686c839296ff 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 a6c27a28ffde..2c4080b61234 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 7fa6d6a9cc0b..566f181feda9 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 e9af36547d8b..b568e1bec4a8 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 e9af36547d8b..b568e1bec4a8 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 beccc2e7b5fe..f9291cb5648d 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 2d9fed4a556f..fe6e8f9a54b4 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 90af0a2c633e..8b493b0bda3e 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/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js index d918779140dd..36be493520a2 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 c295c42ed102..f36e742a45ab 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 b7d545aa114f..a0b8eb98b486 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 72109ca7c3ec..03ab9b6febe3 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 aeed0c01c069..b218a1f77c23 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 3db5948c4eb0..8294e0e6f07c 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-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-reconciler/src/forks/ReactFiberHostConfig.art.js b/packages/react-native-renderer/src/server/ReactFlightServerConfigNative.js similarity index 80% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js rename to packages/react-native-renderer/src/server/ReactFlightServerConfigNative.js index da28b3729db7..cc92e90d8b34 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.art.js +++ b/packages/react-native-renderer/src/server/ReactFlightServerConfigNative.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-art/src/ReactARTHostConfig'; +export const isPrimaryRenderer = true; diff --git a/packages/react-reconciler/README.md b/packages/react-reconciler/README.md index 2aeb36fbd6ca..546e44258378 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 e362e984ce16..7eefefa1c4d1 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 57848f03a1e6..117a7fc05196 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 5a53ea848b62..7b5b2f72b1e0 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 4234732bc7a7..3aca03988f6c 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 a057cc29b6e7..ba5f92944e02 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 539dedbbd1c8..c5733b24543d 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 e4b1561896c3..ffb3ae8a0ee1 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 351fa122929c..a7b0cfdbf2b6 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 9987d8fd6ad3..003022a9c626 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 2b69b09edbff..5ac1ecaa4ea7 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 2733d0ccf351..35daaf7c10dc 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 be14c4695089..0e972d8f012c 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 c663f4a1c537..a95518aacb31 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 e248ad0719bd..1f558a44903e 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 05cb89991ed7..a148375a6708 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 6be4e0b2c080..8828017eee8d 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 1715eab466c9..d3e7bfb0c6b4 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 ae1e75bfe946..c7264083172f 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 218e2171a9c1..b5f1bd197b78 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 419f4514e30f..76c56e90c3f0 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 0e83c65eb1db..34f0529f8cde 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.test.js b/packages/react-reconciler/src/forks/ReactFiberConfig.art.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.art.js index d2d908ef542b..867ca996ec5a 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.test.js +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.art.js @@ -7,4 +7,4 @@ * @flow */ -export * from 'react-test-renderer/src/ReactTestHostConfig'; +export * from 'react-art/src/ReactFiberConfigART'; diff --git a/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js b/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js new file mode 100644 index 000000000000..e791f63d7ec4 --- /dev/null +++ b/packages/react-reconciler/src/forks/ReactFiberConfig.custom.js @@ -0,0 +1,231 @@ +/** + * 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 is a host config that's used for the `react-reconciler` package on npm. +// It is only used by third-party renderers. +// +// Its API lets you pass the host config as an argument. +// However, inside the `react-reconciler` we treat host config as a module. +// This file is a shim between two worlds. +// +// It works because the `react-reconciler` bundle is wrapped in something like: +// +// module.exports = function ($$$config) { +// /* reconciler code */ +// } +// +// So `$$$config` looks like a global variable, but it's +// really an argument to a top-level wrapping function. + +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 +export opaque type Instance = mixed; // eslint-disable-line no-undef +export opaque type TextInstance = mixed; // eslint-disable-line no-undef +export opaque type SuspenseInstance = mixed; // eslint-disable-line no-undef +export opaque type HydratableInstance = mixed; // eslint-disable-line no-undef +export opaque type PublicInstance = mixed; // eslint-disable-line no-undef +export opaque type HostContext = mixed; // eslint-disable-line no-undef +export opaque type UpdatePayload = mixed; // eslint-disable-line no-undef +export opaque type ChildSet = mixed; // eslint-disable-line no-undef +export opaque type TimeoutHandle = mixed; // eslint-disable-line no-undef +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 = $$$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 = $$$config.supportsMicrotasks; +export const scheduleMicrotask = $$$config.scheduleMicrotask; + +// ------------------- +// Test selectors +// (optional) +// ------------------- +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 = $$$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 = $$$config.cloneInstance; +export const createContainerChildSet = $$$config.createContainerChildSet; +export const appendChildToContainerChildSet = + $$$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 = $$$config.isHydratableType; +export const isHydratableText = $$$config.isHydratableText; +export const isSuspenseInstancePending = $$$config.isSuspenseInstancePending; +export const isSuspenseInstanceFallback = $$$config.isSuspenseInstanceFallback; +export const getSuspenseInstanceFallbackErrorDetails = + $$$config.getSuspenseInstanceFallbackErrorDetails; +export const registerSuspenseInstanceRetry = + $$$config.registerSuspenseInstanceRetry; +export const getNextHydratableSibling = $$$config.getNextHydratableSibling; +export const getFirstHydratableChild = $$$config.getFirstHydratableChild; +export const getFirstHydratableChildWithinContainer = + $$$config.getFirstHydratableChildWithinContainer; +export const getFirstHydratableChildWithinSuspenseInstance = + $$$config.getFirstHydratableChildWithinSuspenseInstance; +export const shouldSkipHydratableForInstance = + $$$config.shouldSkipHydratableForInstance; +export const shouldSkipHydratableForTextInstance = + $$$config.shouldSkipHydratableForTextInstance; +export const shouldSkipHydratableForSuspenseInstance = + $$$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 = + $$$config.getNextHydratableInstanceAfterSuspenseInstance; +export const commitHydratedContainer = $$$config.commitHydratedContainer; +export const commitHydratedSuspenseInstance = + $$$config.commitHydratedSuspenseInstance; +export const clearSuspenseBoundary = $$$config.clearSuspenseBoundary; +export const clearSuspenseBoundaryFromContainer = + $$$config.clearSuspenseBoundaryFromContainer; +export const shouldDeleteUnhydratedTailInstances = + $$$config.shouldDeleteUnhydratedTailInstances; +export const didNotMatchHydratedContainerTextInstance = + $$$config.didNotMatchHydratedContainerTextInstance; +export const didNotMatchHydratedTextInstance = + $$$config.didNotMatchHydratedTextInstance; +export const didNotHydrateInstanceWithinContainer = + $$$config.didNotHydrateInstanceWithinContainer; +export const didNotHydrateInstanceWithinSuspenseInstance = + $$$config.didNotHydrateInstanceWithinSuspenseInstance; +export const didNotHydrateInstance = $$$config.didNotHydrateInstance; +export const didNotFindHydratableInstanceWithinContainer = + $$$config.didNotFindHydratableInstanceWithinContainer; +export const didNotFindHydratableTextInstanceWithinContainer = + $$$config.didNotFindHydratableTextInstanceWithinContainer; +export const didNotFindHydratableSuspenseInstanceWithinContainer = + $$$config.didNotFindHydratableSuspenseInstanceWithinContainer; +export const didNotFindHydratableInstanceWithinSuspenseInstance = + $$$config.didNotFindHydratableInstanceWithinSuspenseInstance; +export const didNotFindHydratableTextInstanceWithinSuspenseInstance = + $$$config.didNotFindHydratableTextInstanceWithinSuspenseInstance; +export const didNotFindHydratableSuspenseInstanceWithinSuspenseInstance = + $$$config.didNotFindHydratableSuspenseInstanceWithinSuspenseInstance; +export const didNotFindHydratableInstance = + $$$config.didNotFindHydratableInstance; +export const didNotFindHydratableTextInstance = + $$$config.didNotFindHydratableTextInstance; +export const didNotFindHydratableSuspenseInstance = + $$$config.didNotFindHydratableSuspenseInstance; +export const errorHydratingContainer = $$$config.errorHydratingContainer; + +// ------------------- +// Resources +// (optional) +// ------------------- +export type HoistableRoot = mixed; +export type Resource = mixed; // eslint-disable-line no-undef +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 = $$$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-reconciler/src/forks/ReactFiberConfig.dom-browser.js b/packages/react-reconciler/src/forks/ReactFiberConfig.dom-browser.js new file mode 100644 index 000000000000..4932b1a787bb --- /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 000000000000..4932b1a787bb --- /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 000000000000..4932b1a787bb --- /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 000000000000..4932b1a787bb --- /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 000000000000..4932b1a787bb --- /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 000000000000..4932b1a787bb --- /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 000000000000..4932b1a787bb --- /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-browser.js b/packages/react-reconciler/src/forks/ReactFiberConfig.fabric.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-browser.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.fabric.js index aae45be9aae5..f1787a68e845 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-browser.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-edge-webpack.js b/packages/react-reconciler/src/forks/ReactFiberConfig.native-relay.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge-webpack.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.native-relay.js index aae45be9aae5..f1787a68e845 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge-webpack.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-legacy.js b/packages/react-reconciler/src/forks/ReactFiberConfig.native.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-legacy.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.native.js index aae45be9aae5..3f8a28688b71 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-legacy.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-bun.js b/packages/react-reconciler/src/forks/ReactFiberConfig.test.js similarity index 76% rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-bun.js rename to packages/react-reconciler/src/forks/ReactFiberConfig.test.js index aae45be9aae5..85020417c2c7 100644 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-bun.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.custom.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js deleted file mode 100644 index 995da3a93124..000000000000 --- a/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js +++ /dev/null @@ -1,237 +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 - */ - -// This is a host config that's used for the `react-reconciler` package on npm. -// It is only used by third-party renderers. -// -// Its API lets you pass the host config as an argument. -// However, inside the `react-reconciler` we treat host config as a module. -// This file is a shim between two worlds. -// -// It works because the `react-reconciler` bundle is wrapped in something like: -// -// module.exports = function ($$$config) { -// /* reconciler code */ -// } -// -// So `$$$config` looks like a global variable, but it's -// really an argument to a top-level wrapping function. - -declare var $$$hostConfig: 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 -export opaque type Instance = mixed; // eslint-disable-line no-undef -export opaque type TextInstance = mixed; // eslint-disable-line no-undef -export opaque type SuspenseInstance = mixed; // eslint-disable-line no-undef -export opaque type HydratableInstance = mixed; // eslint-disable-line no-undef -export opaque type PublicInstance = mixed; // eslint-disable-line no-undef -export opaque type HostContext = mixed; // eslint-disable-line no-undef -export opaque type UpdatePayload = mixed; // eslint-disable-line no-undef -export opaque type ChildSet = mixed; // eslint-disable-line no-undef -export opaque type TimeoutHandle = mixed; // eslint-disable-line no-undef -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; - -// ------------------- -// Microtasks -// (optional) -// ------------------- -export const supportsMicrotasks = $$$hostConfig.supportsMicrotasks; -export const scheduleMicrotask = $$$hostConfig.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; - -// ------------------- -// 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; - -// ------------------- -// Persistence -// (optional) -// ------------------- -export const cloneInstance = $$$hostConfig.cloneInstance; -export const createContainerChildSet = $$$hostConfig.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; - -// ------------------- -// Hydration -// (optional) -// ------------------- -export const isHydratableType = $$$hostConfig.isHydratableType; -export const isHydratableText = $$$hostConfig.isHydratableText; -export const isSuspenseInstancePending = - $$$hostConfig.isSuspenseInstancePending; -export const isSuspenseInstanceFallback = - $$$hostConfig.isSuspenseInstanceFallback; -export const getSuspenseInstanceFallbackErrorDetails = - $$$hostConfig.getSuspenseInstanceFallbackErrorDetails; -export const registerSuspenseInstanceRetry = - $$$hostConfig.registerSuspenseInstanceRetry; -export const getNextHydratableSibling = $$$hostConfig.getNextHydratableSibling; -export const getFirstHydratableChild = $$$hostConfig.getFirstHydratableChild; -export const getFirstHydratableChildWithinContainer = - $$$hostConfig.getFirstHydratableChildWithinContainer; -export const getFirstHydratableChildWithinSuspenseInstance = - $$$hostConfig.getFirstHydratableChildWithinSuspenseInstance; -export const shouldSkipHydratableForInstance = - $$$hostConfig.shouldSkipHydratableForInstance; -export const shouldSkipHydratableForTextInstance = - $$$hostConfig.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; -export const getNextHydratableInstanceAfterSuspenseInstance = - $$$hostConfig.getNextHydratableInstanceAfterSuspenseInstance; -export const commitHydratedContainer = $$$hostConfig.commitHydratedContainer; -export const commitHydratedSuspenseInstance = - $$$hostConfig.commitHydratedSuspenseInstance; -export const clearSuspenseBoundary = $$$hostConfig.clearSuspenseBoundary; -export const clearSuspenseBoundaryFromContainer = - $$$hostConfig.clearSuspenseBoundaryFromContainer; -export const shouldDeleteUnhydratedTailInstances = - $$$hostConfig.shouldDeleteUnhydratedTailInstances; -export const didNotMatchHydratedContainerTextInstance = - $$$hostConfig.didNotMatchHydratedContainerTextInstance; -export const didNotMatchHydratedTextInstance = - $$$hostConfig.didNotMatchHydratedTextInstance; -export const didNotHydrateInstanceWithinContainer = - $$$hostConfig.didNotHydrateInstanceWithinContainer; -export const didNotHydrateInstanceWithinSuspenseInstance = - $$$hostConfig.didNotHydrateInstanceWithinSuspenseInstance; -export const didNotHydrateInstance = $$$hostConfig.didNotHydrateInstance; -export const didNotFindHydratableInstanceWithinContainer = - $$$hostConfig.didNotFindHydratableInstanceWithinContainer; -export const didNotFindHydratableTextInstanceWithinContainer = - $$$hostConfig.didNotFindHydratableTextInstanceWithinContainer; -export const didNotFindHydratableSuspenseInstanceWithinContainer = - $$$hostConfig.didNotFindHydratableSuspenseInstanceWithinContainer; -export const didNotFindHydratableInstanceWithinSuspenseInstance = - $$$hostConfig.didNotFindHydratableInstanceWithinSuspenseInstance; -export const didNotFindHydratableTextInstanceWithinSuspenseInstance = - $$$hostConfig.didNotFindHydratableTextInstanceWithinSuspenseInstance; -export const didNotFindHydratableSuspenseInstanceWithinSuspenseInstance = - $$$hostConfig.didNotFindHydratableSuspenseInstanceWithinSuspenseInstance; -export const didNotFindHydratableInstance = - $$$hostConfig.didNotFindHydratableInstance; -export const didNotFindHydratableTextInstance = - $$$hostConfig.didNotFindHydratableTextInstance; -export const didNotFindHydratableSuspenseInstance = - $$$hostConfig.didNotFindHydratableSuspenseInstance; -export const errorHydratingContainer = $$$hostConfig.errorHydratingContainer; - -// ------------------- -// Resources -// (optional) -// ------------------- -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; - -// ------------------- -// 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; 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 aae45be9aae5..000000000000 --- 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 aae45be9aae5..000000000000 --- 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 aae45be9aae5..000000000000 --- 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 ff3aa4d230c6..000000000000 --- 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 ff3aa4d230c6..000000000000 --- 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 ac4c2512bf4e..000000000000 --- 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-refresh/src/ReactFreshRuntime.js b/packages/react-refresh/src/ReactFreshRuntime.js index c9706041ce1f..83650e1badc3 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-server-dom-relay/src/ReactDOMServerFB.js b/packages/react-server-dom-relay/src/ReactDOMServerFB.js index 34f8862127ce..5944cb00bee7 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-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 7ecd37cca3c6..e5255fbf894a 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 9a68b21f6c63..3cab54060c5b 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 09502a7bf547..aff48cf07377 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 5884f18cb30c..d549c10693c5 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 5884f18cb30c..d549c10693c5 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 f2653dca98c4..98d4291de984 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 5e049368f72f..c3cc85c1cce9 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/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 78d6c0f84f70..a389c092618e 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 298b9005ab39..a2107b573e15 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 3bd4f1d02d9d..eab8c6c50e36 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/ReactFlightNewContext.js b/packages/react-server/src/ReactFlightNewContext.js index 1775110f13dc..6412e7c2c7e8 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/ReactFlightReplyServer.js b/packages/react-server/src/ReactFlightReplyServer.js index 83318c418df2..7c7dce1e0e9e 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 62% rename from packages/react-server/src/ReactFlightServerBundlerConfigCustom.js rename to packages/react-server/src/ReactFlightServerConfigBundlerCustom.js index b8254bb51d3c..e11c154d05f3 100644 --- a/packages/react-server/src/ReactFlightServerBundlerConfigCustom.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 new file mode 100644 index 000000000000..f761eb392f3c --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.custom.js @@ -0,0 +1,85 @@ +/** + * 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 is a host config that's used for the `react-server` package on npm. +// It is only used by third-party renderers. +// +// Its API lets you pass the host config as an argument. +// However, inside the `react-server` we treat host config as a module. +// This file is a shim between two worlds. +// +// It works because the `react-server` bundle is wrapped in something like: +// +// module.exports = function ($$$config) { +// /* renderer code */ +// } +// +// So `$$$config` looks like a global variable, but it's +// really an argument to a top-level wrapping function. + +declare var $$$config: any; +export opaque type Destination = mixed; // eslint-disable-line no-undef +export opaque type ResponseState = mixed; +export opaque type Resources = mixed; +export opaque type BoundaryResources = mixed; +export opaque type FormatContext = mixed; +export opaque type SuspenseBoundaryID = mixed; + +export const isPrimaryRenderer = false; + +export const getChildFormatContext = $$$config.getChildFormatContext; +export const UNINITIALIZED_SUSPENSE_BOUNDARY_ID = + $$$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 = + $$$config.pushStartCompletedSuspenseBoundary; +export const pushEndCompletedSuspenseBoundary = + $$$config.pushEndCompletedSuspenseBoundary; +export const pushSegmentFinale = $$$config.pushSegmentFinale; +export const writeCompletedRoot = $$$config.writeCompletedRoot; +export const writePlaceholder = $$$config.writePlaceholder; +export const writeStartCompletedSuspenseBoundary = + $$$config.writeStartCompletedSuspenseBoundary; +export const writeStartPendingSuspenseBoundary = + $$$config.writeStartPendingSuspenseBoundary; +export const writeStartClientRenderedSuspenseBoundary = + $$$config.writeStartClientRenderedSuspenseBoundary; +export const writeEndCompletedSuspenseBoundary = + $$$config.writeEndCompletedSuspenseBoundary; +export const writeEndPendingSuspenseBoundary = + $$$config.writeEndPendingSuspenseBoundary; +export const writeEndClientRenderedSuspenseBoundary = + $$$config.writeEndClientRenderedSuspenseBoundary; +export const writeStartSegment = $$$config.writeStartSegment; +export const writeEndSegment = $$$config.writeEndSegment; +export const writeCompletedSegmentInstruction = + $$$config.writeCompletedSegmentInstruction; +export const writeCompletedBoundaryInstruction = + $$$config.writeCompletedBoundaryInstruction; +export const writeClientRenderBoundaryInstruction = + $$$config.writeClientRenderBoundaryInstruction; +export const prepareToRender = $$$config.prepareToRender; +export const cleanupAfterRender = $$$config.cleanupAfterRender; + +// ------------------------- +// Resources +// ------------------------- +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 = + $$$config.setCurrentlyRenderingBoundaryResourcesTarget; +export const writeResourcesForBoundary = $$$config.writeResourcesForBoundary; diff --git a/packages/react-server/src/forks/ReactFizzConfig.dom-browser.js b/packages/react-server/src/forks/ReactFizzConfig.dom-browser.js new file mode 100644 index 000000000000..f2cf57ab5942 --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.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/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFizzConfig.dom-bun.js b/packages/react-server/src/forks/ReactFizzConfig.dom-bun.js new file mode 100644 index 000000000000..f2cf57ab5942 --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.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/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFizzConfig.dom-edge-webpack.js b/packages/react-server/src/forks/ReactFizzConfig.dom-edge-webpack.js new file mode 100644 index 000000000000..f2cf57ab5942 --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.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/server/ReactFizzConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFizzConfig.dom-legacy.js b/packages/react-server/src/forks/ReactFizzConfig.dom-legacy.js new file mode 100644 index 000000000000..4760bb843ea8 --- /dev/null +++ b/packages/react-server/src/forks/ReactFizzConfig.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/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 000000000000..f2cf57ab5942 --- /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 000000000000..f2cf57ab5942 --- /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 000000000000..f2cf57ab5942 --- /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 000000000000..c4981f9edf14 --- /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/ReactFlightServerConfig.custom.js b/packages/react-server/src/forks/ReactFlightServerConfig.custom.js index f85cfb5f78b2..28977b2357cc 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 99c541a937d6..5304ae8c21af 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js @@ -8,4 +8,5 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +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 f85cfb5f78b2..3778ad89ee89 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js @@ -8,4 +8,5 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from '../ReactFlightServerBundlerConfigCustom'; +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 99c541a937d6..5304ae8c21af 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,5 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +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 99c541a937d6..5304ae8c21af 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js @@ -8,4 +8,5 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +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 99c541a937d6..5304ae8c21af 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,5 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +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 99c541a937d6..5304ae8c21af 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js @@ -8,4 +8,5 @@ */ export * from '../ReactFlightServerConfigStream'; -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig'; +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 a6ad653f3a7a..13963e1a286c 100644 --- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js +++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js @@ -7,4 +7,5 @@ * @flow */ -export * from 'react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig'; +export * from 'react-server-dom-relay/src/ReactFlightServerConfigDOMRelay'; +export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM'; diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js b/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js index ab64c4324654..1eacc4516fe1 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/packages/react-server/src/forks/ReactServerFormatConfig.custom.js b/packages/react-server/src/forks/ReactServerFormatConfig.custom.js deleted file mode 100644 index 33f6c5aa65dd..000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.custom.js +++ /dev/null @@ -1,86 +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 - */ - -// This is a host config that's used for the `react-server` package on npm. -// It is only used by third-party renderers. -// -// Its API lets you pass the host config as an argument. -// However, inside the `react-server` we treat host config as a module. -// This file is a shim between two worlds. -// -// It works because the `react-server` bundle is wrapped in something like: -// -// module.exports = function ($$$config) { -// /* renderer code */ -// } -// -// So `$$$config` looks like a global variable, but it's -// really an argument to a top-level wrapping function. - -declare var $$$hostConfig: any; -export opaque type Destination = mixed; // eslint-disable-line no-undef -export opaque type ResponseState = mixed; -export opaque type Resources = mixed; -export opaque type BoundaryResources = mixed; -export opaque type FormatContext = mixed; -export opaque type SuspenseBoundaryID = mixed; - -export const isPrimaryRenderer = false; - -export const getChildFormatContext = $$$hostConfig.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; -export const pushStartCompletedSuspenseBoundary = - $$$hostConfig.pushStartCompletedSuspenseBoundary; -export const pushEndCompletedSuspenseBoundary = - $$$hostConfig.pushEndCompletedSuspenseBoundary; -export const pushSegmentFinale = $$$hostConfig.pushSegmentFinale; -export const writeCompletedRoot = $$$hostConfig.writeCompletedRoot; -export const writePlaceholder = $$$hostConfig.writePlaceholder; -export const writeStartCompletedSuspenseBoundary = - $$$hostConfig.writeStartCompletedSuspenseBoundary; -export const writeStartPendingSuspenseBoundary = - $$$hostConfig.writeStartPendingSuspenseBoundary; -export const writeStartClientRenderedSuspenseBoundary = - $$$hostConfig.writeStartClientRenderedSuspenseBoundary; -export const writeEndCompletedSuspenseBoundary = - $$$hostConfig.writeEndCompletedSuspenseBoundary; -export const writeEndPendingSuspenseBoundary = - $$$hostConfig.writeEndPendingSuspenseBoundary; -export const writeEndClientRenderedSuspenseBoundary = - $$$hostConfig.writeEndClientRenderedSuspenseBoundary; -export const writeStartSegment = $$$hostConfig.writeStartSegment; -export const writeEndSegment = $$$hostConfig.writeEndSegment; -export const writeCompletedSegmentInstruction = - $$$hostConfig.writeCompletedSegmentInstruction; -export const writeCompletedBoundaryInstruction = - $$$hostConfig.writeCompletedBoundaryInstruction; -export const writeClientRenderBoundaryInstruction = - $$$hostConfig.writeClientRenderBoundaryInstruction; -export const prepareToRender = $$$hostConfig.prepareToRender; -export const cleanupAfterRender = $$$hostConfig.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 setCurrentlyRenderingBoundaryResourcesTarget = - $$$hostConfig.setCurrentlyRenderingBoundaryResourcesTarget; -export const writeResourcesForBoundary = - $$$hostConfig.writeResourcesForBoundary; diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js deleted file mode 100644 index 485793a6893e..000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.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-bun.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-bun.js deleted file mode 100644 index 485793a6893e..000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-bun.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-edge-webpack.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-edge-webpack.js deleted file mode 100644 index 485793a6893e..000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-edge-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/server/ReactDOMServerFormatConfig'; 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 7fe33c0b9957..000000000000 --- 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-webpack.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-node-webpack.js deleted file mode 100644 index 485793a6893e..000000000000 --- a/packages/react-server/src/forks/ReactServerFormatConfig.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/server/ReactDOMServerFormatConfig'; 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 485793a6893e..000000000000 --- 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 485793a6893e..000000000000 --- 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 c02082f497a7..000000000000 --- 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/packages/react-server/src/forks/ReactServerStreamConfig.custom.js b/packages/react-server/src/forks/ReactServerStreamConfig.custom.js index 0e7bafab961a..ed00afa434e7 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/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 e306f9e1a0b0..2d6c087c81f9 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 2080c287a86f..26e6d154f32f 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 4a657ee2e656..4b832be83cb4 100644 --- a/scripts/flow/createFlowConfigs.js +++ b/scripts/flow/createFlowConfigs.js @@ -51,11 +51,11 @@ 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='ReactServerFormatConfig$$' -> 'forks/ReactServerFormatConfig.${serverRenderer}' +module.name_mapper='ReactFizzConfig$$' -> 'forks/ReactFizzConfig.${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 14c62ca4b4d9..2ed0fe91a882 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); @@ -68,20 +68,20 @@ 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('react-server/src/ReactFlightServerBundlerConfigCustom', () => ({ + jest.mock(shimServerConfigPath, () => config); + jest.mock('react-server/src/ReactFlightServerConfigBundlerCustom', () => ({ isClientReference: config.isClientReference, isServerReference: config.isServerReference, getClientReferenceKey: config.getClientReferenceKey, @@ -95,20 +95,19 @@ 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-reconciler/src/ReactFiberConfig', + '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 21217ec50a37..d51e784f6837 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?' ); @@ -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?' ); @@ -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?' ); diff --git a/scripts/rollup/wrappers.js b/scripts/rollup/wrappers.js index d9b0a60c12cf..237e49c91251 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;