Skip to content

Commit c5d2fc7

Browse files
authored
Move some files out of /shared and rename to upper case (facebook#18363)
* Rename lower case isomorphic default exports modules to upper case named exports We're somewhat inconsistent here between e.g. ReactLazy and memo. Let's pick one. This also moves the responder, fundamental, scope creators from shared since they're isomorphic and same as the other creators. * Move some files that are specific to the react-reconciler from shared Individual renderers are allowed to deep require into the reconciler. * Move files specific to react-dom from shared react-interactions is right now dom specific (it wasn't before) so we can type check it together with other dom stuff. Avoids the need for a shared ReactDOMTypes to be checked by RN for example. * Move ReactWorkTags to the reconciler * Move createPortal to export from reconciler Otherwise Noop can't access it since it's not allowed deep requires.
1 parent a600408 commit c5d2fc7

File tree

92 files changed

+153
-139
lines changed

Some content is hidden

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

92 files changed

+153
-139
lines changed

packages/legacy-events/EventPropagators.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
1212

1313
import getListener from 'legacy-events/getListener';
1414

15-
import {traverseEnterLeave} from 'shared/ReactTreeTraversal';
15+
import {traverseEnterLeave} from 'react-reconciler/src/ReactTreeTraversal';
1616
import accumulateInto from './accumulateInto';
1717
import forEachAccumulated from './forEachAccumulated';
1818

packages/legacy-events/ResponderEventPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
isAncestor,
1111
getParentInstance,
1212
traverseTwoPhase,
13-
} from 'shared/ReactTreeTraversal';
13+
} from 'react-reconciler/src/ReactTreeTraversal';
1414

1515
import {
1616
executeDirectDispatch,

packages/legacy-events/__tests__/ResponderEventPlugin-test.internal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
'use strict';
1111

12-
const {HostComponent} = require('shared/ReactWorkTags');
12+
const {HostComponent} = require('react-reconciler/src/ReactWorkTags');
1313
const {PLUGIN_EVENT_SYSTEM} = require('legacy-events/EventSystemFlags');
1414

1515
let EventBatching;
@@ -1378,7 +1378,7 @@ describe('ResponderEventPlugin', () => {
13781378
// ResponderEventPlugin uses `getLowestCommonAncestor`
13791379
const React = require('react');
13801380
const ReactTestUtils = require('react-dom/test-utils');
1381-
const ReactTreeTraversal = require('shared/ReactTreeTraversal');
1381+
const ReactTreeTraversal = require('react-reconciler/src/ReactTreeTraversal');
13821382
const ReactDOMComponentTree = require('../../react-dom/src/client/ReactDOMComponentTree');
13831383

13841384
class ChildComponent extends React.Component {

packages/react-art/src/ReactART.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import * as React from 'react';
99
import ReactVersion from 'shared/ReactVersion';
10-
import {LegacyRoot} from 'shared/ReactRootTags';
10+
import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
1111
import {
1212
createContainer,
1313
updateContainer,

packages/react-art/src/ReactARTHostConfig.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ function applyTextProps(instance, props, prevProps = {}) {
241241
}
242242
}
243243

244-
export * from 'shared/HostConfigWithNoPersistence';
245-
export * from 'shared/HostConfigWithNoHydration';
244+
export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
245+
export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
246246

247247
export function appendInitialChild(parentInstance, child) {
248248
if (typeof child === 'string') {

packages/react-debug-tools/src/ReactDebugHooks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
ContextProvider,
3030
ForwardRef,
3131
Block,
32-
} from 'shared/ReactWorkTags';
32+
} from 'react-reconciler/src/ReactWorkTags';
3333

3434
type CurrentDispatcherRef = typeof ReactSharedInternals.ReactCurrentDispatcher;
3535

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {
3737
attemptContinuousHydration,
3838
attemptHydrationAtCurrentPriority,
3939
} from 'react-reconciler/src/ReactFiberReconciler';
40-
import {createPortal as createPortalImpl} from 'shared/ReactPortal';
40+
import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
4141
import {canUseDOM} from 'shared/ExecutionEnvironment';
4242
import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching';
4343
import {

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import {registrationNameModules} from 'legacy-events/EventPluginRegistry';
1111
import {canUseDOM} from 'shared/ExecutionEnvironment';
12-
import endsWith from 'shared/endsWith';
1312
import invariant from 'shared/invariant';
1413
import {setListenToResponderEventTypes} from '../events/DeprecatedDOMEventResponderSystem';
1514

@@ -1327,6 +1326,11 @@ export function restoreControlledState(
13271326
}
13281327
}
13291328

1329+
function endsWith(subject: string, search: string): boolean {
1330+
const length = subject.length;
1331+
return subject.substring(length - search.length, length) === search;
1332+
}
1333+
13301334
export function listenToEventResponderEventTypes(
13311335
eventTypes: Array<string>,
13321336
document: Document,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import type {
1515
SuspenseInstance,
1616
Props,
1717
} from './ReactDOMHostConfig';
18-
import type {ReactDOMListener} from 'shared/ReactDOMTypes';
18+
import type {ReactDOMListener} from '../shared/ReactDOMTypes';
1919

2020
import {
2121
HostComponent,
2222
HostText,
2323
HostRoot,
2424
SuspenseComponent,
25-
} from 'shared/ReactWorkTags';
25+
} from 'react-reconciler/src/ReactWorkTags';
2626
import invariant from 'shared/invariant';
2727

2828
import {getParentSuspenseInstance} from './ReactDOMHostConfig';

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import type {
5555
ReactDOMListener,
5656
ReactDOMListenerEvent,
5757
ReactDOMListenerMap,
58-
} from 'shared/ReactDOMTypes';
58+
} from '../shared/ReactDOMTypes';
5959
import {
6060
mountEventResponder,
6161
unmountEventResponder,
@@ -69,7 +69,7 @@ import {
6969
enableFundamentalAPI,
7070
enableUseEventAPI,
7171
} from 'shared/ReactFeatureFlags';
72-
import {HostComponent} from 'shared/ReactWorkTags';
72+
import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
7373
import {
7474
RESPONDER_EVENT_SYSTEM,
7575
IS_PASSIVE,
@@ -171,7 +171,7 @@ function shouldAutoFocusHostComponent(type: string, props: Props): boolean {
171171
return false;
172172
}
173173

174-
export * from 'shared/HostConfigWithNoPersistence';
174+
export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
175175

176176
export function getRootHostContext(
177177
rootContainerInstance: Container,

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
import type {Container} from './ReactDOMHostConfig';
11-
import type {RootTag} from 'shared/ReactRootTags';
11+
import type {RootTag} from 'react-reconciler/src/ReactRootTags';
1212
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.
@@ -50,7 +50,11 @@ import {
5050
updateContainer,
5151
} from 'react-reconciler/src/ReactFiberReconciler';
5252
import invariant from 'shared/invariant';
53-
import {BlockingRoot, ConcurrentRoot, LegacyRoot} from 'shared/ReactRootTags';
53+
import {
54+
BlockingRoot,
55+
ConcurrentRoot,
56+
LegacyRoot,
57+
} from 'react-reconciler/src/ReactRootTags';
5458

5559
function ReactDOMRoot(container: Container, options: void | RootOptions) {
5660
this._internalRoot = createRootImpl(container, ConcurrentRoot, options);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {EventPriority} from 'shared/ReactTypes';
1212
import type {
1313
ReactDOMListenerEvent,
1414
ReactDOMListenerMap,
15-
} from 'shared/ReactDOMTypes';
15+
} from '../shared/ReactDOMTypes';
1616

1717
import ReactSharedInternals from 'shared/ReactSharedInternals';
1818
import invariant from 'shared/invariant';

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {runEventsInBatch} from 'legacy-events/EventBatching';
99
import {enqueueStateRestore} from 'legacy-events/ReactControlledComponent';
1010
import {batchedUpdates} from 'legacy-events/ReactGenericBatching';
1111
import SyntheticEvent from 'legacy-events/SyntheticEvent';
12-
import isTextInputElement from 'shared/isTextInputElement';
12+
import isTextInputElement from './isTextInputElement';
1313
import {canUseDOM} from 'shared/ExecutionEnvironment';
1414

1515
import {

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ import type {PluginModule} from 'legacy-events/PluginModuleType';
1616
import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
1717
import type {TopLevelType} from 'legacy-events/TopLevelEventTypes';
1818

19-
import {HostRoot, HostComponent, HostText} from 'shared/ReactWorkTags';
19+
import {
20+
HostRoot,
21+
HostComponent,
22+
HostText,
23+
} from 'react-reconciler/src/ReactWorkTags';
2024
import {IS_FIRST_ANCESTOR} from 'legacy-events/EventSystemFlags';
2125
import {batchedEventUpdates} from 'legacy-events/ReactGenericBatching';
2226
import {runEventsInBatch} from 'legacy-events/EventBatching';

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import type {
2121
ReactSyntheticEvent,
2222
CustomDispatchConfig,
2323
} from 'legacy-events/ReactSyntheticEventType';
24-
import type {ReactDOMListener} from 'shared/ReactDOMTypes';
24+
import type {ReactDOMListener} from '../shared/ReactDOMTypes';
2525

2626
import {registrationNameDependencies} from 'legacy-events/EventPluginRegistry';
2727
import {batchedEventUpdates} from 'legacy-events/ReactGenericBatching';
@@ -33,7 +33,7 @@ import {
3333
IS_TARGET_EVENT_ONLY,
3434
} from 'legacy-events/EventSystemFlags';
3535

36-
import {HostRoot, HostPortal} from 'shared/ReactWorkTags';
36+
import {HostRoot, HostPortal} from 'react-reconciler/src/ReactWorkTags';
3737

3838
import {
3939
addTrappedEventListener,

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ import {
1212
PASSIVE_NOT_SUPPORTED,
1313
} from 'legacy-events/EventSystemFlags';
1414
import type {AnyNativeEvent} from 'legacy-events/PluginModuleType';
15-
import {HostComponent, ScopeComponent, HostPortal} from 'shared/ReactWorkTags';
15+
import {
16+
HostComponent,
17+
ScopeComponent,
18+
HostPortal,
19+
} from 'react-reconciler/src/ReactWorkTags';
1620
import type {EventPriority} from 'shared/ReactTypes';
1721
import type {
1822
ReactDOMEventResponder,
1923
ReactDOMEventResponderInstance,
2024
ReactDOMResponderContext,
2125
ReactDOMResponderEvent,
22-
} from 'shared/ReactDOMTypes';
26+
} from '../shared/ReactDOMTypes';
2327
import type {DOMTopLevelEventType} from 'legacy-events/TopLevelEventTypes';
2428
import {
2529
batchedEventUpdates,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
getClosestInstanceFromNode,
2121
getNodeFromInstance,
2222
} from '../client/ReactDOMComponentTree';
23-
import {HostComponent, HostText} from 'shared/ReactWorkTags';
23+
import {HostComponent, HostText} from 'react-reconciler/src/ReactWorkTags';
2424
import {getNearestMountedFiber} from 'react-reconciler/src/ReactFiberTreeReflection';
2525
import {enableModernEventSystem} from 'shared/ReactFeatureFlags';
2626

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import {
3434
getContainerFromFiber,
3535
getSuspenseInstanceFromFiber,
3636
} from 'react-reconciler/src/ReactFiberTreeReflection';
37-
import {HostRoot, SuspenseComponent} from 'shared/ReactWorkTags';
37+
import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags';
3838
import {
3939
type EventSystemFlags,
4040
PLUGIN_EVENT_SYSTEM,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import {
4040
getClosestInstanceFromNode,
4141
} from '../client/ReactDOMComponentTree';
4242
import {unsafeCastDOMTopLevelTypeToString} from 'legacy-events/TopLevelEventTypes';
43-
import {HostRoot, SuspenseComponent} from 'shared/ReactWorkTags';
43+
import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags';
4444

4545
let attemptSynchronousHydration: (fiber: Object) => void;
4646

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import {canUseDOM} from 'shared/ExecutionEnvironment';
99
import SyntheticEvent from 'legacy-events/SyntheticEvent';
10-
import isTextInputElement from 'shared/isTextInputElement';
10+
import isTextInputElement from './isTextInputElement';
1111
import shallowEqual from 'shared/shallowEqual';
1212

1313
import {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {DOMTopLevelEventType} from 'legacy-events/TopLevelEventTypes';
1111
import type {EventSystemFlags} from 'legacy-events/EventSystemFlags';
1212
import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
1313

14-
import {HostComponent} from 'shared/ReactWorkTags';
14+
import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
1515
import {enableUseEventAPI} from 'shared/ReactFeatureFlags';
1616

1717
import getListener from 'legacy-events/getListener';

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import type {
2020
ReactEventResponderListener,
2121
} from 'shared/ReactTypes';
2222
import type {SuspenseConfig} from 'react-reconciler/src/ReactFiberSuspenseConfig';
23-
import type {ReactDOMListenerMap} from 'shared/ReactDOMTypes';
23+
import type {ReactDOMListenerMap} from '../shared/ReactDOMTypes';
2424

2525
import {validateContextBounds} from './ReactPartialRendererContext';
2626

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
FunctionComponent,
1515
HostComponent,
1616
HostText,
17-
} from 'shared/ReactWorkTags';
17+
} from 'react-reconciler/src/ReactWorkTags';
1818
import SyntheticEvent from 'legacy-events/SyntheticEvent';
1919
import invariant from 'shared/invariant';
2020
import {ELEMENT_NODE} from '../shared/HTMLNodeType';
@@ -23,7 +23,7 @@ import {PLUGIN_EVENT_SYSTEM} from 'legacy-events/EventSystemFlags';
2323
import act from './ReactTestUtilsAct';
2424
import forEachAccumulated from 'legacy-events/forEachAccumulated';
2525
import accumulateInto from 'legacy-events/accumulateInto';
26-
import {traverseTwoPhase} from 'shared/ReactTreeTraversal';
26+
import {traverseTwoPhase} from 'react-reconciler/src/ReactTreeTraversal';
2727

2828
const {findDOMNode} = ReactDOM;
2929
// Keep in sync with ReactDOMUnstableNativeDependencies.js

packages/react-interactions/events/src/dom/ContextMenu.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {
1111
ReactDOMResponderEvent,
1212
ReactDOMResponderContext,
1313
PointerType,
14-
} from 'shared/ReactDOMTypes';
14+
} from 'react-dom/src/shared/ReactDOMTypes';
1515
import type {ReactEventResponderListener} from 'shared/ReactTypes';
1616

1717
import * as React from 'react';

packages/react-interactions/events/src/dom/Focus.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {
1111
ReactDOMResponderEvent,
1212
ReactDOMResponderContext,
1313
PointerType,
14-
} from 'shared/ReactDOMTypes';
14+
} from 'react-dom/src/shared/ReactDOMTypes';
1515
import type {ReactEventResponderListener} from 'shared/ReactTypes';
1616

1717
import * as React from 'react';

packages/react-interactions/events/src/dom/Hover.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {
1111
ReactDOMResponderEvent,
1212
ReactDOMResponderContext,
1313
PointerType,
14-
} from 'shared/ReactDOMTypes';
14+
} from 'react-dom/src/shared/ReactDOMTypes';
1515
import type {ReactEventResponderListener} from 'shared/ReactTypes';
1616

1717
import * as React from 'react';

packages/react-interactions/events/src/dom/Input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import type {
1111
ReactDOMResponderEvent,
1212
ReactDOMResponderContext,
13-
} from 'shared/ReactDOMTypes';
13+
} from 'react-dom/src/shared/ReactDOMTypes';
1414

1515
import * as React from 'react';
1616
import {DiscreteEvent} from 'shared/ReactTypes';

packages/react-interactions/events/src/dom/Keyboard.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import type {
1111
ReactDOMResponderEvent,
1212
ReactDOMResponderContext,
13-
} from 'shared/ReactDOMTypes';
13+
} from 'react-dom/src/shared/ReactDOMTypes';
1414
import type {ReactEventResponderListener} from 'shared/ReactTypes';
1515

1616
import * as React from 'react';

packages/react-interactions/events/src/dom/Press.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @flow
88
*/
99

10-
import type {PointerType} from 'shared/ReactDOMTypes';
10+
import type {PointerType} from 'react-dom/src/shared/ReactDOMTypes';
1111

1212
import * as React from 'react';
1313
import {useTap} from 'react-interactions/events/tap';

packages/react-interactions/events/src/dom/PressLegacy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {
1111
ReactDOMResponderEvent,
1212
ReactDOMResponderContext,
1313
PointerType,
14-
} from 'shared/ReactDOMTypes';
14+
} from 'react-dom/src/shared/ReactDOMTypes';
1515
import type {
1616
EventPriority,
1717
ReactEventResponderListener,

packages/react-interactions/events/src/dom/Tap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {
1111
ReactDOMResponderContext,
1212
ReactDOMResponderEvent,
1313
PointerType,
14-
} from 'shared/ReactDOMTypes';
14+
} from 'react-dom/src/shared/ReactDOMTypes';
1515
import type {ReactEventResponderListener} from 'shared/ReactTypes';
1616

1717
import * as React from 'react';

packages/react-interactions/events/src/dom/shared/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {DiscreteEvent, UserBlockingEvent} from 'shared/ReactTypes';
1313
import type {
1414
ReactDOMResponderContext,
1515
ReactDOMResponderEvent,
16-
} from 'shared/ReactDOMTypes';
16+
} from 'react-dom/src/shared/ReactDOMTypes';
1717

1818
export const hasPointerEvents =
1919
typeof window !== 'undefined' && window.PointerEvent !== undefined;

0 commit comments

Comments
 (0)