Refactor Host Config Infra (getting rid of .inline*.js)

packages/react-art/src/ReactART.js

@@ -12,7 +12,7 @@ import {
   createContainer,
   updateContainer,
   injectIntoDevTools,
-} from 'react-reconciler/inline.art';
+} from 'react-reconciler/src/ReactFiberReconciler';
 import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
 import FastNoSideEffects from 'art/modes/fast-noSideEffects';

packages/react-dom/src/client/ReactDOM.js

@@ -35,7 +35,7 @@ import {
   attemptUserBlockingHydration,
   attemptContinuousHydration,
   attemptHydrationAtCurrentPriority,
-} from 'react-reconciler/inline.dom';
+} from 'react-reconciler/src/ReactFiberReconciler';
 import {createPortal as createPortalImpl} from 'shared/ReactPortal';
 import {canUseDOM} from 'shared/ExecutionEnvironment';
 import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching';

packages/react-dom/src/client/ReactDOMLegacy.js

@@ -31,7 +31,7 @@ import {
   getPublicRootInstance,
   findHostInstance,
   findHostInstanceWithWarning,
-} from 'react-reconciler/inline.dom';
+} from 'react-reconciler/src/ReactFiberReconciler';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
 import ReactSharedInternals from 'shared/ReactSharedInternals';

packages/react-dom/src/client/ReactDOMRoot.js

@@ -13,7 +13,7 @@ import type {ReactNodeList} from 'shared/ReactTypes';
 // TODO: This type is shared between the reconciler and ReactDOM, but will
 // eventually be lifted out to the renderer.
 import type {FiberRoot} from 'react-reconciler/src/ReactFiberRoot';
-import {findHostInstanceWithNoPortals} from 'react-reconciler/inline.dom';
+import {findHostInstanceWithNoPortals} from 'react-reconciler/src/ReactFiberReconciler';
 
 export type RootType = {
   render(children: ReactNodeList): void,
@@ -45,7 +45,10 @@ import {
   DOCUMENT_FRAGMENT_NODE,
 } from '../shared/HTMLNodeType';
 
-import {createContainer, updateContainer} from 'react-reconciler/inline.dom';
+import {
+  createContainer,
+  updateContainer,
+} from 'react-reconciler/src/ReactFiberReconciler';
 import invariant from 'shared/invariant';
 import {BlockingRoot, ConcurrentRoot, LegacyRoot} from 'shared/ReactRootTags';
 

packages/react-dom/src/events/EnterLeaveEventPlugin.js

@@ -21,7 +21,7 @@ import {
   getNodeFromInstance,
 } from '../client/ReactDOMComponentTree';
 import {HostComponent, HostText} from 'shared/ReactWorkTags';
-import {getNearestMountedFiber} from 'react-reconciler/reflection';
+import {getNearestMountedFiber} from 'react-reconciler/src/ReactFiberTreeReflection';
 import {enableModernEventSystem} from 'shared/ReactFeatureFlags';
 
 const eventTypes = {

packages/react-dom/src/events/ReactDOMEventListener.js

@@ -32,7 +32,7 @@ import {
   getNearestMountedFiber,
   getContainerFromFiber,
   getSuspenseInstanceFromFiber,
-} from 'react-reconciler/reflection';
+} from 'react-reconciler/src/ReactFiberTreeReflection';
 import {HostRoot, SuspenseComponent} from 'shared/ReactWorkTags';
 import {
   type EventSystemFlags,

packages/react-dom/src/events/ReactDOMEventReplaying.js

@@ -28,7 +28,7 @@ import {
   getNearestMountedFiber,
   getContainerFromFiber,
   getSuspenseInstanceFromFiber,
-} from 'react-reconciler/reflection';
+} from 'react-reconciler/src/ReactFiberTreeReflection';
 import {
   attemptToDispatchEvent,
   addResponderEventSystemEvent,

packages/react-dom/src/server/ReactDOMFizzServerBrowser.js

@@ -13,7 +13,7 @@ import {
   createRequest,
   startWork,
   startFlowing,
-} from 'react-server/inline.dom-browser';
+} from 'react-server/src/ReactFizzStreamer';
 
 function renderToReadableStream(children: ReactNodeList): ReadableStream {
   let request;

packages/react-dom/src/server/ReactDOMFizzServerNode.js

@@ -10,7 +10,11 @@
 import type {ReactNodeList} from 'shared/ReactTypes';
 import type {Writable} from 'stream';
 
-import {createRequest, startWork, startFlowing} from 'react-server/inline.dom';
+import {
+  createRequest,
+  startWork,
+  startFlowing,
+} from 'react-server/src/ReactFizzStreamer';
 
 function createDrainHandler(destination, request) {
   return () => startFlowing(request);

packages/react-dom/src/test-utils/ReactTestUtils.js

@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import {findCurrentFiberUsingSlowPath} from 'react-reconciler/reflection';
+import {findCurrentFiberUsingSlowPath} from 'react-reconciler/src/ReactFiberTreeReflection';
 import {get as getInstance} from 'shared/ReactInstanceMap';
 import {
   ClassComponent,

packages/react-dom/testing.classic.fb.js

@@ -8,4 +8,4 @@
  */
 
 export * from './index.classic.fb.js';
-export {act} from 'react-reconciler/inline.dom';
+export {act} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-dom/testing.experimental.js

@@ -8,4 +8,4 @@
  */
 
 export * from './index.experimental.js';
-export {act} from 'react-reconciler/inline.dom';
+export {act} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-dom/testing.js

@@ -8,4 +8,4 @@
  */
 
 export * from './index.js';
-export {act} from 'react-reconciler/inline.dom';
+export {act} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-dom/testing.modern.fb.js

@@ -8,4 +8,4 @@
  */
 
 export * from './index.modern.fb.js';
-export {act} from 'react-reconciler/inline.dom';
+export {act} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-dom/testing.stable.js

@@ -8,4 +8,4 @@
  */
 
 export * from './index.stable.js';
-export {act} from 'react-reconciler/inline.dom';
+export {act} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-flight-dom-webpack/src/ReactFlightDOMClient.js

@@ -16,7 +16,7 @@ import {
   processStringChunk,
   processBinaryChunk,
   complete,
-} from 'react-flight/inline.dom';
+} from 'react-flight/src/ReactFlightClient';
 
 function startReadingFromStream(response, stream: ReadableStream): void {
   let reader = stream.getReader();

packages/react-flight-dom-webpack/src/ReactFlightDOMServerBrowser.js

@@ -7,13 +7,13 @@
  * @flow
  */
 
-import type {ReactModel} from 'react-server/flight.inline-typed';
+import type {ReactModel} from 'react-server/src/ReactFlightServer';
 
 import {
   createRequest,
   startWork,
   startFlowing,
-} from 'react-server/flight.inline.dom-browser';
+} from 'react-server/src/ReactFlightServer';
 
 function renderToReadableStream(model: ReactModel): ReadableStream {
   let request;

packages/react-flight-dom-webpack/src/ReactFlightDOMServerNode.js

@@ -7,14 +7,14 @@
  * @flow
  */
 
-import type {ReactModel} from 'react-server/flight.inline-typed';
+import type {ReactModel} from 'react-server/src/ReactFlightServer';
 import type {Writable} from 'stream';
 
 import {
   createRequest,
   startWork,
   startFlowing,
-} from 'react-server/flight.inline.dom';
+} from 'react-server/src/ReactFlightServer';
 
 function createDrainHandler(destination, request) {
   return () => startFlowing(request);

packages/react-flight/index.js

@@ -3,18 +3,8 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
  */
 
-// This entry point is intentionally not typed. It exists only for third-party
-// renderers. The renderers we ship (such as React DOM) instead import a named
-// "inline" entry point (for example, `react-server/inline.dom`). It uses
-// the same code, but the Flow configuration redirects the host config to its
-// real implementation so we can check it against exact intended host types.
-//
-// Only one renderer (the one you passed to `yarn flow <renderer>`) is fully
-// type-checked at any given time. The Flow config maps the
-// `react-server/inline.<renderer>` import (which is *not* Flow typed) to
-// `react-server/inline-typed` (which *is*) for the current renderer.
-// On CI, we run Flow checks for each renderer separately.
-
 export * from './src/ReactFlightClient';

packages/react-native-renderer/src/ReactFabric.js

@@ -24,7 +24,7 @@ import {
   updateContainer,
   injectIntoDevTools,
   getPublicRootInstance,
-} from 'react-reconciler/inline.fabric';
+} from 'react-reconciler/src/ReactFiberReconciler';
 
 import {createPortal as createPortalImpl} from 'shared/ReactPortal';
 import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching';

packages/react-native-renderer/src/ReactNativeFiberInspector.js

@@ -12,7 +12,7 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import {
   findCurrentHostFiber,
   findCurrentFiberUsingSlowPath,
-} from 'react-reconciler/reflection';
+} from 'react-reconciler/src/ReactFiberTreeReflection';
 import getComponentName from 'shared/getComponentName';
 import {HostComponent} from 'shared/ReactWorkTags';
 import invariant from 'shared/invariant';

packages/react-native-renderer/src/ReactNativeRenderer.js

@@ -23,7 +23,7 @@ import {
   updateContainer,
   injectIntoDevTools,
   getPublicRootInstance,
-} from 'react-reconciler/inline.native';
+} from 'react-reconciler/src/ReactFiberReconciler';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import {getStackByFiberInDevAndProd} from 'react-reconciler/src/ReactCurrentFiber';
 import {createPortal as createPortalImpl} from 'shared/ReactPortal';

packages/react-noop-renderer/src/ReactNoopFlightClient.js

@@ -14,7 +14,7 @@
  * environment.
  */
 
-import type {ReactModelRoot} from 'react-flight/inline-typed';
+import type {ReactModelRoot} from 'react-flight';
 
 import ReactFlightClient from 'react-flight';
 

packages/react-noop-renderer/src/ReactNoopFlightServer.js

@@ -14,7 +14,7 @@
  * environment.
  */
 
-import type {ReactModel} from 'react-server/flight.inline-typed';
+import type {ReactModel} from 'react-server/src/ReactFlightServer';
 
 import ReactFlightServer from 'react-server/flight';
 

packages/react-noop-renderer/src/ReactNoopPersistent.js

@@ -14,7 +14,7 @@
  * environment.
  */
 
-import ReactFiberPersistentReconciler from 'react-reconciler/persistent';
+import ReactFiberReconciler from 'react-reconciler';
 import createReactNoop from './createReactNoop';
 
 export const {
@@ -47,6 +47,6 @@ export const {
   dumpTree,
   getRoot,
 } = createReactNoop(
-  ReactFiberPersistentReconciler, // reconciler
+  ReactFiberReconciler, // reconciler
   false, // useMutation
 );

packages/react-reconciler/index.js

@@ -3,18 +3,8 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
  */
 
-// This entry point is intentionally not typed. It exists only for third-party
-// renderers. The renderers we ship (such as React DOM) instead import a named
-// "inline" entry point (for example, `react-reconciler/inline.dom`). It uses
-// the same code, but the Flow configuration redirects the host config to its
-// real implementation so we can check it against exact intended host types.
-//
-// Only one renderer (the one you passed to `yarn flow <renderer>`) is fully
-// type-checked at any given time. The Flow config maps the
-// `react-reconciler/inline.<renderer>` import (which is *not* Flow typed) to
-// `react-reconciler/inline-typed` (which *is*) for the current renderer.
-// On CI, we run Flow checks for each renderer separately.
-
 export * from './src/ReactFiberReconciler';