Skip to content

Commit 7a1691c

Browse files
authored
Refactor Host Config Infra (getting rid of .inline*.js) (#18240)
* Require deep for reconcilers * Delete inline* files * Delete react-reconciler/persistent This no longer makes any sense because it react-reconciler takes supportsMutation or supportsPersistence as options. It's no longer based on feature flags. * Fix jest mocking * Fix Flow strategy We now explicitly list which paths we want to be checked by a renderer. For every other renderer config we ignore those paths. Nothing is "any" typed. So if some transitive dependency isn't reachable it won't be accidentally "any" that leaks.
1 parent 238b57f commit 7a1691c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+127
-561
lines changed

packages/react-art/src/ReactART.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
createContainer,
1313
updateContainer,
1414
injectIntoDevTools,
15-
} from 'react-reconciler/inline.art';
15+
} from 'react-reconciler/src/ReactFiberReconciler';
1616
import Transform from 'art/core/transform';
1717
import Mode from 'art/modes/current';
1818
import FastNoSideEffects from 'art/modes/fast-noSideEffects';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {
3535
attemptUserBlockingHydration,
3636
attemptContinuousHydration,
3737
attemptHydrationAtCurrentPriority,
38-
} from 'react-reconciler/inline.dom';
38+
} from 'react-reconciler/src/ReactFiberReconciler';
3939
import {createPortal as createPortalImpl} from 'shared/ReactPortal';
4040
import {canUseDOM} from 'shared/ExecutionEnvironment';
4141
import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
getPublicRootInstance,
3232
findHostInstance,
3333
findHostInstanceWithWarning,
34-
} from 'react-reconciler/inline.dom';
34+
} from 'react-reconciler/src/ReactFiberReconciler';
3535
import getComponentName from 'shared/getComponentName';
3636
import invariant from 'shared/invariant';
3737
import ReactSharedInternals from 'shared/ReactSharedInternals';

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import type {ReactNodeList} from 'shared/ReactTypes';
1313
// TODO: This type is shared between the reconciler and ReactDOM, but will
1414
// eventually be lifted out to the renderer.
1515
import type {FiberRoot} from 'react-reconciler/src/ReactFiberRoot';
16-
import {findHostInstanceWithNoPortals} from 'react-reconciler/inline.dom';
16+
import {findHostInstanceWithNoPortals} from 'react-reconciler/src/ReactFiberReconciler';
1717

1818
export type RootType = {
1919
render(children: ReactNodeList): void,
@@ -45,7 +45,10 @@ import {
4545
DOCUMENT_FRAGMENT_NODE,
4646
} from '../shared/HTMLNodeType';
4747

48-
import {createContainer, updateContainer} from 'react-reconciler/inline.dom';
48+
import {
49+
createContainer,
50+
updateContainer,
51+
} from 'react-reconciler/src/ReactFiberReconciler';
4952
import invariant from 'shared/invariant';
5053
import {BlockingRoot, ConcurrentRoot, LegacyRoot} from 'shared/ReactRootTags';
5154

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
getNodeFromInstance,
2222
} from '../client/ReactDOMComponentTree';
2323
import {HostComponent, HostText} from 'shared/ReactWorkTags';
24-
import {getNearestMountedFiber} from 'react-reconciler/reflection';
24+
import {getNearestMountedFiber} from 'react-reconciler/src/ReactFiberTreeReflection';
2525
import {enableModernEventSystem} from 'shared/ReactFeatureFlags';
2626

2727
const eventTypes = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
getNearestMountedFiber,
3333
getContainerFromFiber,
3434
getSuspenseInstanceFromFiber,
35-
} from 'react-reconciler/reflection';
35+
} from 'react-reconciler/src/ReactFiberTreeReflection';
3636
import {HostRoot, SuspenseComponent} from 'shared/ReactWorkTags';
3737
import {
3838
type EventSystemFlags,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
getNearestMountedFiber,
2929
getContainerFromFiber,
3030
getSuspenseInstanceFromFiber,
31-
} from 'react-reconciler/reflection';
31+
} from 'react-reconciler/src/ReactFiberTreeReflection';
3232
import {
3333
attemptToDispatchEvent,
3434
addResponderEventSystemEvent,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
createRequest,
1414
startWork,
1515
startFlowing,
16-
} from 'react-server/inline.dom-browser';
16+
} from 'react-server/src/ReactFizzStreamer';
1717

1818
function renderToReadableStream(children: ReactNodeList): ReadableStream {
1919
let request;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
import type {ReactNodeList} from 'shared/ReactTypes';
1111
import type {Writable} from 'stream';
1212

13-
import {createRequest, startWork, startFlowing} from 'react-server/inline.dom';
13+
import {
14+
createRequest,
15+
startWork,
16+
startFlowing,
17+
} from 'react-server/src/ReactFizzStreamer';
1418

1519
function createDrainHandler(destination, request) {
1620
return () => startFlowing(request);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import * as React from 'react';
99
import * as ReactDOM from 'react-dom';
10-
import {findCurrentFiberUsingSlowPath} from 'react-reconciler/reflection';
10+
import {findCurrentFiberUsingSlowPath} from 'react-reconciler/src/ReactFiberTreeReflection';
1111
import {get as getInstance} from 'shared/ReactInstanceMap';
1212
import {
1313
ClassComponent,

0 commit comments

Comments
 (0)