Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename ReactServerFormatConfig to ReactFizzConfig #26591

Merged
merged 1 commit into from
Apr 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Rename ReactServerFormatConfig to ReactFizzConfig
  • Loading branch information
gnoff committed Apr 10, 2023
commit 941236129ef40139fcd39222255e6e38a2481ca8
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {
FormatContext,
StreamingFormat,
InstructionState,
} from './ReactDOMServerFormatConfig';
} from './ReactFizzConfigDOM';

import {
createResponseState as createResponseStateImpl,
Expand All @@ -23,7 +23,7 @@ import {
writeEndCompletedSuspenseBoundary as writeEndCompletedSuspenseBoundaryImpl,
writeEndClientRenderedSuspenseBoundary as writeEndClientRenderedSuspenseBoundaryImpl,
HTML_MODE,
} from './ReactDOMServerFormatConfig';
} from './ReactFizzConfigDOM';

import type {
Destination,
Expand All @@ -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<Chunk | PrecomputedChunk>,
placeholderPrefix: PrecomputedChunk,
segmentPrefix: PrecomputedChunk,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -109,7 +109,7 @@ export type {
BoundaryResources,
FormatContext,
SuspenseBoundaryID,
} from './ReactDOMServerFormatConfig';
} from './ReactFizzConfigDOM';

export {
getChildFormatContext,
Expand Down Expand Up @@ -139,7 +139,7 @@ export {
setCurrentlyRenderingBoundaryResourcesTarget,
prepareToRender,
cleanupAfterRender,
} from './ReactDOMServerFormatConfig';
} from './ReactFizzConfigDOM';

import {stringToChunk} from 'react-server/src/ReactServerStreamConfig';

Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactDOMFizzServerBrowser.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactDOMFizzServerBun.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactDOMFizzServerEdge.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactDOMFizzServerNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactDOMFizzStaticEdge.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactDOMFizzStaticNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactDOMLegacyServerImpl.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions packages/react-server-dom-relay/src/ReactDOMServerFB.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -25,7 +25,7 @@ import {
import {
createResponseState,
createRootFormatContext,
} from 'react-server/src/ReactServerFormatConfig';
} from 'react-server/src/ReactFizzConfig';

type Options = {
identifierPrefix?: string,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-server/src/ReactFizzHooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ 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';

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,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server/src/ReactFizzNewContext.js
Original file line number Diff line number Diff line change
Expand Up @@ -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__) {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-server/src/ReactFizzServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -76,7 +76,7 @@ import {
setCurrentlyRenderingBoundaryResourcesTarget,
createResources,
createBoundaryResources,
} from './ReactServerFormatConfig';
} from './ReactFizzConfig';
import {
constructClassInstance,
mountClassInstance,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig';
export * from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig';
export * from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig';
export * from 'react-dom-bindings/src/server/ReactFizzConfigDOM';
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
* @flow
*/

export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig';
export * from 'react-dom-bindings/src/server/ReactFizzConfigDOMLegacy';
Original file line number Diff line number Diff line change
@@ -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';
10 changes: 10 additions & 0 deletions packages/react-server/src/forks/ReactFizzConfig.dom-node.js
Original file line number Diff line number Diff line change
@@ -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';
10 changes: 10 additions & 0 deletions packages/react-server/src/forks/ReactFizzConfig.dom-relay.js
Original file line number Diff line number Diff line change
@@ -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';
10 changes: 10 additions & 0 deletions packages/react-server/src/forks/ReactFizzConfig.native-relay.js
Original file line number Diff line number Diff line change
@@ -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';

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/flow/createFlowConfigs.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function writeConfig(renderer, rendererInfo, isServerSupported) {
`
module.name_mapper='ReactFiberHostConfig$$' -> 'forks/ReactFiberHostConfig.${renderer}'
module.name_mapper='ReactServerStreamConfig$$' -> 'forks/ReactServerStreamConfig.${serverRenderer}'
module.name_mapper='ReactServerFormatConfig$$' -> 'forks/ReactServerFormatConfig.${serverRenderer}'
module.name_mapper='ReactFizzConfig$$' -> 'forks/ReactFizzConfig.${serverRenderer}'
module.name_mapper='ReactFlightServerConfig$$' -> 'forks/ReactFlightServerConfig.${serverRenderer}'
module.name_mapper='ReactFlightClientConfig$$' -> 'forks/ReactFlightClientConfig.${serverRenderer}'
module.name_mapper='react-devtools-feature-flags' -> 'react-devtools-shared/src/config/DevToolsFeatureFlags.default'
Expand Down
Loading