@samitouri / QOS-React-2 / commits / c5d2fc7127

Move some files out of /shared and rename to upper case (#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.

Sebastian Markbåge committed Mar 21, 2020 at 15:22 UTC c5d2fc7127654e43de59fff865b74765a103c4a5
92 files changed +153 -139
packages/legacy-events/EventPropagators.js
+1 -1
@@ -12,7 +12,7 @@ import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
12
13 import getListener from 'legacy-events/getListener';
14
15 -import {traverseEnterLeave} from 'shared/ReactTreeTraversal';
15 +import {traverseEnterLeave} from 'react-reconciler/src/ReactTreeTraversal';
16 import accumulateInto from './accumulateInto';
17 import forEachAccumulated from './forEachAccumulated';
18
packages/legacy-events/ResponderEventPlugin.js
+1 -1
@@ -10,7 +10,7 @@ import {
10 isAncestor,
11 getParentInstance,
12 traverseTwoPhase,
13 -} from 'shared/ReactTreeTraversal';
13 +} from 'react-reconciler/src/ReactTreeTraversal';
14
15 import {
16 executeDirectDispatch,
packages/legacy-events/__tests__/ResponderEventPlugin-test.internal.js
+2 -2
@@ -9,7 +9,7 @@
9
10 'use strict';
11
12 -const {HostComponent} = require('shared/ReactWorkTags');
12 +const {HostComponent} = require('react-reconciler/src/ReactWorkTags');
13 const {PLUGIN_EVENT_SYSTEM} = require('legacy-events/EventSystemFlags');
14
15 let EventBatching;
@@ -1378,7 +1378,7 @@ describe('ResponderEventPlugin', () => {
1378 // ResponderEventPlugin uses `getLowestCommonAncestor`
1379 const React = require('react');
1380 const ReactTestUtils = require('react-dom/test-utils');
1381 - const ReactTreeTraversal = require('shared/ReactTreeTraversal');
1381 + const ReactTreeTraversal = require('react-reconciler/src/ReactTreeTraversal');
1382 const ReactDOMComponentTree = require('../../react-dom/src/client/ReactDOMComponentTree');
1383
1384 class ChildComponent extends React.Component {
packages/react-art/src/ReactART.js
+1 -1
@@ -7,7 +7,7 @@
7
8 import * as React from 'react';
9 import ReactVersion from 'shared/ReactVersion';
10 -import {LegacyRoot} from 'shared/ReactRootTags';
10 +import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
11 import {
12 createContainer,
13 updateContainer,
packages/react-art/src/ReactARTHostConfig.js
+2 -2
@@ -241,8 +241,8 @@ function applyTextProps(instance, props, prevProps = {}) {
241 }
242 }
243
244 -export * from 'shared/HostConfigWithNoPersistence';
245 -export * from 'shared/HostConfigWithNoHydration';
244 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
245 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
246
247 export function appendInitialChild(parentInstance, child) {
248 if (typeof child === 'string') {
packages/react-debug-tools/src/ReactDebugHooks.js
+1 -1
@@ -29,7 +29,7 @@ import {
29 ContextProvider,
30 ForwardRef,
31 Block,
32 -} from 'shared/ReactWorkTags';
32 +} from 'react-reconciler/src/ReactWorkTags';
33
34 type CurrentDispatcherRef = typeof ReactSharedInternals.ReactCurrentDispatcher;
35
packages/react-dom/src/client/ReactDOM.js
+1 -1
@@ -37,7 +37,7 @@ import {
37 attemptContinuousHydration,
38 attemptHydrationAtCurrentPriority,
39 } from 'react-reconciler/src/ReactFiberReconciler';
40 -import {createPortal as createPortalImpl} from 'shared/ReactPortal';
40 +import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
41 import {canUseDOM} from 'shared/ExecutionEnvironment';
42 import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching';
43 import {
packages/react-dom/src/client/ReactDOMComponent.js
+5 -1
@@ -9,7 +9,6 @@
9
10 import {registrationNameModules} from 'legacy-events/EventPluginRegistry';
11 import {canUseDOM} from 'shared/ExecutionEnvironment';
12 -import endsWith from 'shared/endsWith';
12 import invariant from 'shared/invariant';
13 import {setListenToResponderEventTypes} from '../events/DeprecatedDOMEventResponderSystem';
14
@@ -1327,6 +1326,11 @@ export function restoreControlledState(
1326 }
1327 }
1328
1329 +function endsWith(subject: string, search: string): boolean {
1330 + const length = subject.length;
1331 + return subject.substring(length - search.length, length) === search;
1332 +}
1333 +
1334 export function listenToEventResponderEventTypes(
1335 eventTypes: Array<string>,
1336 document: Document,
packages/react-dom/src/client/ReactDOMComponentTree.js
+2 -2
@@ -15,14 +15,14 @@ import type {
15 SuspenseInstance,
16 Props,
17 } from './ReactDOMHostConfig';
18 -import type {ReactDOMListener} from 'shared/ReactDOMTypes';
18 +import type {ReactDOMListener} from '../shared/ReactDOMTypes';
19
20 import {
21 HostComponent,
22 HostText,
23 HostRoot,
24 SuspenseComponent,
25 -} from 'shared/ReactWorkTags';
25 +} from 'react-reconciler/src/ReactWorkTags';
26 import invariant from 'shared/invariant';
27
28 import {getParentSuspenseInstance} from './ReactDOMHostConfig';
packages/react-dom/src/client/ReactDOMHostConfig.js
+3 -3
@@ -55,7 +55,7 @@ import type {
55 ReactDOMListener,
56 ReactDOMListenerEvent,
57 ReactDOMListenerMap,
58 -} from 'shared/ReactDOMTypes';
58 +} from '../shared/ReactDOMTypes';
59 import {
60 mountEventResponder,
61 unmountEventResponder,
@@ -69,7 +69,7 @@ import {
69 enableFundamentalAPI,
70 enableUseEventAPI,
71 } from 'shared/ReactFeatureFlags';
72 -import {HostComponent} from 'shared/ReactWorkTags';
72 +import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
73 import {
74 RESPONDER_EVENT_SYSTEM,
75 IS_PASSIVE,
@@ -171,7 +171,7 @@ function shouldAutoFocusHostComponent(type: string, props: Props): boolean {
171 return false;
172 }
173
174 -export * from 'shared/HostConfigWithNoPersistence';
174 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
175
176 export function getRootHostContext(
177 rootContainerInstance: Container,
packages/react-dom/src/client/ReactDOMRoot.js
+6 -2
@@ -8,7 +8,7 @@
8 */
9
10 import type {Container} from './ReactDOMHostConfig';
11 -import type {RootTag} from 'shared/ReactRootTags';
11 +import type {RootTag} from 'react-reconciler/src/ReactRootTags';
12 import type {ReactNodeList} from 'shared/ReactTypes';
13 // TODO: This type is shared between the reconciler and ReactDOM, but will
14 // eventually be lifted out to the renderer.
@@ -50,7 +50,11 @@ import {
50 updateContainer,
51 } from 'react-reconciler/src/ReactFiberReconciler';
52 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';
58
59 function ReactDOMRoot(container: Container, options: void | RootOptions) {
60 this._internalRoot = createRootImpl(container, ConcurrentRoot, options);
packages/react-dom/src/client/ReactDOMUseEvent.js
+1 -1
@@ -12,7 +12,7 @@ import type {EventPriority} from 'shared/ReactTypes';
12 import type {
13 ReactDOMListenerEvent,
14 ReactDOMListenerMap,
15 -} from 'shared/ReactDOMTypes';
15 +} from '../shared/ReactDOMTypes';
16
17 import ReactSharedInternals from 'shared/ReactSharedInternals';
18 import invariant from 'shared/invariant';
packages/react-dom/src/events/ChangeEventPlugin.js
+1 -1
@@ -9,7 +9,7 @@ import {runEventsInBatch} from 'legacy-events/EventBatching';
9 import {enqueueStateRestore} from 'legacy-events/ReactControlledComponent';
10 import {batchedUpdates} from 'legacy-events/ReactGenericBatching';
11 import SyntheticEvent from 'legacy-events/SyntheticEvent';
12 -import isTextInputElement from 'shared/isTextInputElement';
12 +import isTextInputElement from './isTextInputElement';
13 import {canUseDOM} from 'shared/ExecutionEnvironment';
14
15 import {
packages/react-dom/src/events/DOMLegacyEventPluginSystem.js
+5 -1
@@ -16,7 +16,11 @@ import type {PluginModule} from 'legacy-events/PluginModuleType';
16 import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
17 import type {TopLevelType} from 'legacy-events/TopLevelEventTypes';
18
19 -import {HostRoot, HostComponent, HostText} from 'shared/ReactWorkTags';
19 +import {
20 + HostRoot,
21 + HostComponent,
22 + HostText,
23 +} from 'react-reconciler/src/ReactWorkTags';
24 import {IS_FIRST_ANCESTOR} from 'legacy-events/EventSystemFlags';
25 import {batchedEventUpdates} from 'legacy-events/ReactGenericBatching';
26 import {runEventsInBatch} from 'legacy-events/EventBatching';
packages/react-dom/src/events/DOMModernPluginEventSystem.js
+2 -2
@@ -21,7 +21,7 @@ import type {
21 ReactSyntheticEvent,
22 CustomDispatchConfig,
23 } from 'legacy-events/ReactSyntheticEventType';
24 -import type {ReactDOMListener} from 'shared/ReactDOMTypes';
24 +import type {ReactDOMListener} from '../shared/ReactDOMTypes';
25
26 import {registrationNameDependencies} from 'legacy-events/EventPluginRegistry';
27 import {batchedEventUpdates} from 'legacy-events/ReactGenericBatching';
@@ -33,7 +33,7 @@ import {
33 IS_TARGET_EVENT_ONLY,
34 } from 'legacy-events/EventSystemFlags';
35
36 -import {HostRoot, HostPortal} from 'shared/ReactWorkTags';
36 +import {HostRoot, HostPortal} from 'react-reconciler/src/ReactWorkTags';
37
38 import {
39 addTrappedEventListener,
packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js
+6 -2
@@ -12,14 +12,18 @@ import {
12 PASSIVE_NOT_SUPPORTED,
13 } from 'legacy-events/EventSystemFlags';
14 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';
20 import type {EventPriority} from 'shared/ReactTypes';
21 import type {
22 ReactDOMEventResponder,
23 ReactDOMEventResponderInstance,
24 ReactDOMResponderContext,
25 ReactDOMResponderEvent,
22 -} from 'shared/ReactDOMTypes';
26 +} from '../shared/ReactDOMTypes';
27 import type {DOMTopLevelEventType} from 'legacy-events/TopLevelEventTypes';
28 import {
29 batchedEventUpdates,
packages/react-dom/src/events/EnterLeaveEventPlugin.js
+1 -1
@@ -20,7 +20,7 @@ import {
20 getClosestInstanceFromNode,
21 getNodeFromInstance,
22 } from '../client/ReactDOMComponentTree';
23 -import {HostComponent, HostText} from 'shared/ReactWorkTags';
23 +import {HostComponent, HostText} from 'react-reconciler/src/ReactWorkTags';
24 import {getNearestMountedFiber} from 'react-reconciler/src/ReactFiberTreeReflection';
25 import {enableModernEventSystem} from 'shared/ReactFeatureFlags';
26
packages/react-dom/src/events/ReactDOMEventListener.js
+1 -1
@@ -34,7 +34,7 @@ import {
34 getContainerFromFiber,
35 getSuspenseInstanceFromFiber,
36 } from 'react-reconciler/src/ReactFiberTreeReflection';
37 -import {HostRoot, SuspenseComponent} from 'shared/ReactWorkTags';
37 +import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags';
38 import {
39 type EventSystemFlags,
40 PLUGIN_EVENT_SYSTEM,
packages/react-dom/src/events/ReactDOMEventReplaying.js
+1 -1
@@ -40,7 +40,7 @@ import {
40 getClosestInstanceFromNode,
41 } from '../client/ReactDOMComponentTree';
42 import {unsafeCastDOMTopLevelTypeToString} from 'legacy-events/TopLevelEventTypes';
43 -import {HostRoot, SuspenseComponent} from 'shared/ReactWorkTags';
43 +import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags';
44
45 let attemptSynchronousHydration: (fiber: Object) => void;
46
packages/react-dom/src/events/SelectEventPlugin.js
+1 -1
@@ -7,7 +7,7 @@
7
8 import {canUseDOM} from 'shared/ExecutionEnvironment';
9 import SyntheticEvent from 'legacy-events/SyntheticEvent';
10 -import isTextInputElement from 'shared/isTextInputElement';
10 +import isTextInputElement from './isTextInputElement';
11 import shallowEqual from 'shared/shallowEqual';
12
13 import {
packages/react-dom/src/events/accumulateTwoPhaseListeners.js
+1 -1
@@ -11,7 +11,7 @@ import type {DOMTopLevelEventType} from 'legacy-events/TopLevelEventTypes';
11 import type {EventSystemFlags} from 'legacy-events/EventSystemFlags';
12 import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType';
13
14 -import {HostComponent} from 'shared/ReactWorkTags';
14 +import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
15 import {enableUseEventAPI} from 'shared/ReactFeatureFlags';
16
17 import getListener from 'legacy-events/getListener';
packages/react-dom/src/events/isTextInputElement.js renamed
packages/react-dom/src/server/ReactPartialRendererHooks.js
+1 -1
@@ -20,7 +20,7 @@ import type {
20 ReactEventResponderListener,
21 } from 'shared/ReactTypes';
22 import type {SuspenseConfig} from 'react-reconciler/src/ReactFiberSuspenseConfig';
23 -import type {ReactDOMListenerMap} from 'shared/ReactDOMTypes';
23 +import type {ReactDOMListenerMap} from '../shared/ReactDOMTypes';
24
25 import {validateContextBounds} from './ReactPartialRendererContext';
26
packages/react-dom/src/shared/ReactDOMTypes.js renamed
packages/react-dom/src/test-utils/ReactTestUtils.js
+2 -2
@@ -14,7 +14,7 @@ import {
14 FunctionComponent,
15 HostComponent,
16 HostText,
17 -} from 'shared/ReactWorkTags';
17 +} from 'react-reconciler/src/ReactWorkTags';
18 import SyntheticEvent from 'legacy-events/SyntheticEvent';
19 import invariant from 'shared/invariant';
20 import {ELEMENT_NODE} from '../shared/HTMLNodeType';
@@ -23,7 +23,7 @@ import {PLUGIN_EVENT_SYSTEM} from 'legacy-events/EventSystemFlags';
23 import act from './ReactTestUtilsAct';
24 import forEachAccumulated from 'legacy-events/forEachAccumulated';
25 import accumulateInto from 'legacy-events/accumulateInto';
26 -import {traverseTwoPhase} from 'shared/ReactTreeTraversal';
26 +import {traverseTwoPhase} from 'react-reconciler/src/ReactTreeTraversal';
27
28 const {findDOMNode} = ReactDOM;
29 // Keep in sync with ReactDOMUnstableNativeDependencies.js
packages/react-interactions/events/src/dom/ContextMenu.js
+1 -1
@@ -11,7 +11,7 @@ import type {
11 ReactDOMResponderEvent,
12 ReactDOMResponderContext,
13 PointerType,
14 -} from 'shared/ReactDOMTypes';
14 +} from 'react-dom/src/shared/ReactDOMTypes';
15 import type {ReactEventResponderListener} from 'shared/ReactTypes';
16
17 import * as React from 'react';
packages/react-interactions/events/src/dom/Focus.js
+1 -1
@@ -11,7 +11,7 @@ import type {
11 ReactDOMResponderEvent,
12 ReactDOMResponderContext,
13 PointerType,
14 -} from 'shared/ReactDOMTypes';
14 +} from 'react-dom/src/shared/ReactDOMTypes';
15 import type {ReactEventResponderListener} from 'shared/ReactTypes';
16
17 import * as React from 'react';
packages/react-interactions/events/src/dom/Hover.js
+1 -1
@@ -11,7 +11,7 @@ import type {
11 ReactDOMResponderEvent,
12 ReactDOMResponderContext,
13 PointerType,
14 -} from 'shared/ReactDOMTypes';
14 +} from 'react-dom/src/shared/ReactDOMTypes';
15 import type {ReactEventResponderListener} from 'shared/ReactTypes';
16
17 import * as React from 'react';
packages/react-interactions/events/src/dom/Input.js
+1 -1
@@ -10,7 +10,7 @@
10 import type {
11 ReactDOMResponderEvent,
12 ReactDOMResponderContext,
13 -} from 'shared/ReactDOMTypes';
13 +} from 'react-dom/src/shared/ReactDOMTypes';
14
15 import * as React from 'react';
16 import {DiscreteEvent} from 'shared/ReactTypes';
packages/react-interactions/events/src/dom/Keyboard.js
+1 -1
@@ -10,7 +10,7 @@
10 import type {
11 ReactDOMResponderEvent,
12 ReactDOMResponderContext,
13 -} from 'shared/ReactDOMTypes';
13 +} from 'react-dom/src/shared/ReactDOMTypes';
14 import type {ReactEventResponderListener} from 'shared/ReactTypes';
15
16 import * as React from 'react';
packages/react-interactions/events/src/dom/Press.js
+1 -1
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {PointerType} from 'shared/ReactDOMTypes';
10 +import type {PointerType} from 'react-dom/src/shared/ReactDOMTypes';
11
12 import * as React from 'react';
13 import {useTap} from 'react-interactions/events/tap';
packages/react-interactions/events/src/dom/PressLegacy.js
+1 -1
@@ -11,7 +11,7 @@ import type {
11 ReactDOMResponderEvent,
12 ReactDOMResponderContext,
13 PointerType,
14 -} from 'shared/ReactDOMTypes';
14 +} from 'react-dom/src/shared/ReactDOMTypes';
15 import type {
16 EventPriority,
17 ReactEventResponderListener,
packages/react-interactions/events/src/dom/Tap.js
+1 -1
@@ -11,7 +11,7 @@ import type {
11 ReactDOMResponderContext,
12 ReactDOMResponderEvent,
13 PointerType,
14 -} from 'shared/ReactDOMTypes';
14 +} from 'react-dom/src/shared/ReactDOMTypes';
15 import type {ReactEventResponderListener} from 'shared/ReactTypes';
16
17 import * as React from 'react';
packages/react-interactions/events/src/dom/shared/index.js
+1 -1
@@ -13,7 +13,7 @@ import {DiscreteEvent, UserBlockingEvent} from 'shared/ReactTypes';
13 import type {
14 ReactDOMResponderContext,
15 ReactDOMResponderEvent,
16 -} from 'shared/ReactDOMTypes';
16 +} from 'react-dom/src/shared/ReactDOMTypes';
17
18 export const hasPointerEvents =
19 typeof window !== 'undefined' && window.PointerEvent !== undefined;
packages/react-native-renderer/src/ReactFabric.js
+2 -2
@@ -26,7 +26,7 @@ import {
26 getPublicRootInstance,
27 } from 'react-reconciler/src/ReactFiberReconciler';
28
29 -import {createPortal as createPortalImpl} from 'shared/ReactPortal';
29 +import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
30 import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching';
31 import ReactVersion from 'shared/ReactVersion';
32
@@ -36,7 +36,7 @@ import {UIManager} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateI
36 import {getClosestInstanceFromNode} from './ReactFabricComponentTree';
37 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
38
39 -import {LegacyRoot} from 'shared/ReactRootTags';
39 +import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
40 import ReactSharedInternals from 'shared/ReactSharedInternals';
41 import getComponentName from 'shared/getComponentName';
42
packages/react-native-renderer/src/ReactFabricHostConfig.js
+2 -2
@@ -171,8 +171,8 @@ class ReactFabricHostComponent {
171 // eslint-disable-next-line no-unused-expressions
172 (ReactFabricHostComponent.prototype: NativeMethods);
173
174 -export * from 'shared/HostConfigWithNoMutation';
175 -export * from 'shared/HostConfigWithNoHydration';
174 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMutation';
175 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
176
177 export function appendInitialChild(
178 parentInstance: Instance,
packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js
+1 -1
@@ -18,7 +18,7 @@ import invariant from 'shared/invariant';
18 import {ReactNativeViewConfigRegistry} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
19 import accumulateInto from 'legacy-events/accumulateInto';
20 import getListener from 'legacy-events/getListener';
21 -import {traverseTwoPhase} from 'shared/ReactTreeTraversal';
21 +import {traverseTwoPhase} from 'react-reconciler/src/ReactTreeTraversal';
22 import forEachAccumulated from 'legacy-events/forEachAccumulated';
23
24 const {
packages/react-native-renderer/src/ReactNativeFiberInspector.js
+1 -1
@@ -14,7 +14,7 @@ import {
14 findCurrentFiberUsingSlowPath,
15 } from 'react-reconciler/src/ReactFiberTreeReflection';
16 import getComponentName from 'shared/getComponentName';
17 -import {HostComponent} from 'shared/ReactWorkTags';
17 +import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
18 import invariant from 'shared/invariant';
19 // Module provided by RN:
20 import {UIManager} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
packages/react-native-renderer/src/ReactNativeHostConfig.js
+2 -2
@@ -75,8 +75,8 @@ function recursivelyUncacheFiberNode(node: Instance | TextInstance) {
75 }
76 }
77
78 -export * from 'shared/HostConfigWithNoPersistence';
79 -export * from 'shared/HostConfigWithNoHydration';
78 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
79 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
80
81 export function appendInitialChild(
82 parentInstance: Instance,
packages/react-native-renderer/src/ReactNativeRenderer.js
+2 -2
@@ -26,7 +26,7 @@ import {
26 } from 'react-reconciler/src/ReactFiberReconciler';
27 // TODO: direct imports like some-package/src/* are bad. Fix me.
28 import {getStackByFiberInDevAndProd} from 'react-reconciler/src/ReactCurrentFiber';
29 -import {createPortal as createPortalImpl} from 'shared/ReactPortal';
29 +import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
30 import {
31 setBatchingImplementation,
32 batchedUpdates,
@@ -38,7 +38,7 @@ import {UIManager} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateI
38 import {getClosestInstanceFromNode} from './ReactNativeComponentTree';
39 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
40
41 -import {LegacyRoot} from 'shared/ReactRootTags';
41 +import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
42 import ReactSharedInternals from 'shared/ReactSharedInternals';
43 import getComponentName from 'shared/getComponentName';
44
packages/react-noop-renderer/src/createReactNoop.js
+7 -4
@@ -17,12 +17,15 @@
17 import type {Fiber} from 'react-reconciler/src/ReactFiber';
18 import type {UpdateQueue} from 'react-reconciler/src/ReactUpdateQueue';
19 import type {ReactNodeList} from 'shared/ReactTypes';
20 -import type {RootTag} from 'shared/ReactRootTags';
20 +import type {RootTag} from 'react-reconciler/src/ReactRootTags';
21
22 import * as Scheduler from 'scheduler/unstable_mock';
23 -import {createPortal} from 'shared/ReactPortal';
23 import {REACT_FRAGMENT_TYPE, REACT_ELEMENT_TYPE} from 'shared/ReactSymbols';
25 -import {ConcurrentRoot, BlockingRoot, LegacyRoot} from 'shared/ReactRootTags';
24 +import {
25 + ConcurrentRoot,
26 + BlockingRoot,
27 + LegacyRoot,
28 +} from 'react-reconciler/src/ReactRootTags';
29
30 type Container = {
31 rootID: string,
@@ -826,7 +829,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
829 container: Container,
830 key: ?string = null,
831 ) {
829 - return createPortal(children, container, null, key);
832 + return NoopRenderer.createPortal(children, container, null, key);
833 },
834
835 // Shortcut for testing a single root
packages/react-reconciler/src/MaxInts.js renamed
+1 -1
@@ -10,4 +10,4 @@
10 // Max 31 bit integer. The max integer size in V8 for 32-bit systems.
11 // Math.pow(2, 30) - 1
12 // 0b111111111111111111111111111111
13 -export default 1073741823;
13 +export const MAX_SIGNED_31_BIT_INT = 1073741823;
packages/react-reconciler/src/ReactChildFiber.js
+3 -3
@@ -9,12 +9,12 @@
9
10 import type {ReactElement} from 'shared/ReactElementType';
11 import type {ReactPortal} from 'shared/ReactTypes';
12 -import type {BlockComponent} from 'react/src/block';
12 +import type {BlockComponent} from 'react/src/ReactBlock';
13 import type {Fiber} from './ReactFiber';
14 import type {ExpirationTime} from './ReactFiberExpirationTime';
15
16 import getComponentName from 'shared/getComponentName';
17 -import {Placement, Deletion} from 'shared/ReactSideEffectTags';
17 +import {Placement, Deletion} from './ReactSideEffectTags';
18 import {
19 getIteratorFn,
20 REACT_ELEMENT_TYPE,
@@ -29,7 +29,7 @@ import {
29 HostPortal,
30 Fragment,
31 Block,
32 -} from 'shared/ReactWorkTags';
32 +} from './ReactWorkTags';
33 import invariant from 'shared/invariant';
34 import {warnAboutStringRefs, enableBlocksAPI} from 'shared/ReactFeatureFlags';
35
packages/react-reconciler/src/ReactCurrentFiber.js
+1 -1
@@ -17,7 +17,7 @@ import {
17 Fragment,
18 ContextProvider,
19 ContextConsumer,
20 -} from 'shared/ReactWorkTags';
20 +} from './ReactWorkTags';
21 import describeComponentFrame from 'shared/describeComponentFrame';
22 import getComponentName from 'shared/getComponentName';
23
packages/react-reconciler/src/ReactDebugFiberPerf.js
+1 -1
@@ -21,7 +21,7 @@ import {
21 ContextConsumer,
22 Mode,
23 SuspenseComponent,
24 -} from 'shared/ReactWorkTags';
24 +} from './ReactWorkTags';
25
26 type MeasurementPhase =
27 | 'componentWillMount'
packages/react-reconciler/src/ReactFiber.js
+6 -6
@@ -17,10 +17,10 @@ import type {
17 ReactFundamentalComponent,
18 ReactScope,
19 } from 'shared/ReactTypes';
20 -import type {RootTag} from 'shared/ReactRootTags';
21 -import type {WorkTag} from 'shared/ReactWorkTags';
20 +import type {RootTag} from 'react-reconciler/src/ReactRootTags';
21 +import type {WorkTag} from './ReactWorkTags';
22 import type {TypeOfMode} from './ReactTypeOfMode';
23 -import type {SideEffectTag} from 'shared/ReactSideEffectTags';
23 +import type {SideEffectTag} from './ReactSideEffectTags';
24 import type {ExpirationTime} from './ReactFiberExpirationTime';
25 import type {UpdateQueue} from './ReactUpdateQueue';
26 import type {ContextDependency} from './ReactFiberNewContext';
@@ -36,8 +36,8 @@ import {
36 enableBlocksAPI,
37 throwEarlyForMysteriousError,
38 } from 'shared/ReactFeatureFlags';
39 -import {NoEffect, Placement} from 'shared/ReactSideEffectTags';
40 -import {ConcurrentRoot, BlockingRoot} from 'shared/ReactRootTags';
39 +import {NoEffect, Placement} from './ReactSideEffectTags';
40 +import {ConcurrentRoot, BlockingRoot} from 'react-reconciler/src/ReactRootTags';
41 import {
42 IndeterminateComponent,
43 ClassComponent,
@@ -61,7 +61,7 @@ import {
61 FundamentalComponent,
62 ScopeComponent,
63 Block,
64 -} from 'shared/ReactWorkTags';
64 +} from './ReactWorkTags';
65 import getComponentName from 'shared/getComponentName';
66
67 import {isDevToolsPresent} from './ReactFiberDevToolsHook';
packages/react-reconciler/src/ReactFiberBeginWork.js
+3 -3
@@ -8,7 +8,7 @@
8 */
9
10 import type {ReactProviderType, ReactContext} from 'shared/ReactTypes';
11 -import type {BlockComponent} from 'react/src/block';
11 +import type {BlockComponent} from 'react/src/ReactBlock';
12 import type {Fiber} from './ReactFiber';
13 import type {FiberRoot} from './ReactFiberRoot';
14 import type {ExpirationTime} from './ReactFiberExpirationTime';
@@ -44,7 +44,7 @@ import {
44 FundamentalComponent,
45 ScopeComponent,
46 Block,
47 -} from 'shared/ReactWorkTags';
47 +} from './ReactWorkTags';
48 import {
49 NoEffect,
50 PerformedWork,
@@ -55,7 +55,7 @@ import {
55 Update,
56 Ref,
57 Deletion,
58 -} from 'shared/ReactSideEffectTags';
58 +} from './ReactSideEffectTags';
59 import ReactSharedInternals from 'shared/ReactSharedInternals';
60 import {
61 debugRenderPhaseSideEffectsForStrictMode,
packages/react-reconciler/src/ReactFiberClassComponent.js
+1 -1
@@ -12,7 +12,7 @@ import type {ExpirationTime} from './ReactFiberExpirationTime';
12 import type {UpdateQueue} from './ReactUpdateQueue';
13
14 import * as React from 'react';
15 -import {Update, Snapshot} from 'shared/ReactSideEffectTags';
15 +import {Update, Snapshot} from './ReactSideEffectTags';
16 import {
17 debugRenderPhaseSideEffectsForStrictMode,
18 disableLegacyContext,
packages/react-reconciler/src/ReactFiberCommitWork.js
+2 -2
@@ -56,7 +56,7 @@ import {
56 FundamentalComponent,
57 ScopeComponent,
58 Block,
59 -} from 'shared/ReactWorkTags';
59 +} from './ReactWorkTags';
60 import {
61 invokeGuardedCallback,
62 hasCaughtError,
@@ -69,7 +69,7 @@ import {
69 Snapshot,
70 Update,
71 Passive,
72 -} from 'shared/ReactSideEffectTags';
72 +} from './ReactSideEffectTags';
73 import getComponentName from 'shared/getComponentName';
74 import invariant from 'shared/invariant';
75
packages/react-reconciler/src/ReactFiberCompleteWork.js
+2 -2
@@ -53,7 +53,7 @@ import {
53 FundamentalComponent,
54 ScopeComponent,
55 Block,
56 -} from 'shared/ReactWorkTags';
56 +} from './ReactWorkTags';
57 import {NoMode, BlockingMode} from './ReactTypeOfMode';
58 import {
59 Ref,
@@ -61,7 +61,7 @@ import {
61 NoEffect,
62 DidCapture,
63 Deletion,
64 -} from 'shared/ReactSideEffectTags';
64 +} from './ReactSideEffectTags';
65 import invariant from 'shared/invariant';
66
67 import {
packages/react-reconciler/src/ReactFiberContext.js
+1 -1
@@ -12,7 +12,7 @@ import type {StackCursor} from './ReactFiberStack';
12
13 import {isFiberMounted} from 'react-reconciler/src/ReactFiberTreeReflection';
14 import {disableLegacyContext} from 'shared/ReactFeatureFlags';
15 -import {ClassComponent, HostRoot} from 'shared/ReactWorkTags';
15 +import {ClassComponent, HostRoot} from './ReactWorkTags';
16 import getComponentName from 'shared/getComponentName';
17 import invariant from 'shared/invariant';
18 import checkPropTypes from 'shared/checkPropTypes';
packages/react-reconciler/src/ReactFiberDeprecatedEvents.js
+1 -1
@@ -24,7 +24,7 @@ import {NoWork} from './ReactFiberExpirationTime';
24 import {REACT_RESPONDER_TYPE} from 'shared/ReactSymbols';
25
26 import invariant from 'shared/invariant';
27 -import {HostComponent, HostRoot} from 'shared/ReactWorkTags';
27 +import {HostComponent, HostRoot} from './ReactWorkTags';
28
29 const emptyObject = {};
30 const isArray = Array.isArray;
packages/react-reconciler/src/ReactFiberDevToolsHook.js
+1 -1
@@ -16,7 +16,7 @@ import type {FiberRoot} from './ReactFiberRoot';
16 import type {ExpirationTime} from './ReactFiberExpirationTime';
17 import type {ReactNodeList} from 'shared/ReactTypes';
18
19 -import {DidCapture} from 'shared/ReactSideEffectTags';
19 +import {DidCapture} from './ReactSideEffectTags';
20
21 declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: Object | void;
22
packages/react-reconciler/src/ReactFiberExpirationTime.js
+1 -1
@@ -9,7 +9,7 @@
9
10 import type {ReactPriorityLevel} from './SchedulerWithReactIntegration';
11
12 -import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
12 +import {MAX_SIGNED_31_BIT_INT} from './MaxInts';
13
14 import {
15 ImmediatePriority,
packages/react-reconciler/src/ReactFiberHooks.js
+1 -1
@@ -36,7 +36,7 @@ import {createDeprecatedResponderListener} from './ReactFiberDeprecatedEvents';
36 import {
37 Update as UpdateEffect,
38 Passive as PassiveEffect,
39 -} from 'shared/ReactSideEffectTags';
39 +} from './ReactSideEffectTags';
40 import {
41 NoEffect as NoHookEffect,
42 HasEffect as HookHasEffect,
packages/react-reconciler/src/ReactFiberHostConfigWithNoHydration.js renamed
packages/react-reconciler/src/ReactFiberHostConfigWithNoMutation.js renamed
packages/react-reconciler/src/ReactFiberHostConfigWithNoPersistence.js renamed
packages/react-reconciler/src/ReactFiberHotReloading.js
+1 -1
@@ -30,7 +30,7 @@ import {
30 HostRoot,
31 MemoComponent,
32 SimpleMemoComponent,
33 -} from 'shared/ReactWorkTags';
33 +} from './ReactWorkTags';
34 import {
35 REACT_FORWARD_REF_TYPE,
36 REACT_MEMO_TYPE,
packages/react-reconciler/src/ReactFiberHydrationContext.js
+2 -2
@@ -23,8 +23,8 @@ import {
23 HostText,
24 HostRoot,
25 SuspenseComponent,
26 -} from 'shared/ReactWorkTags';
27 -import {Deletion, Placement, Hydrating} from 'shared/ReactSideEffectTags';
26 +} from './ReactWorkTags';
27 +import {Deletion, Placement, Hydrating} from './ReactSideEffectTags';
28 import invariant from 'shared/invariant';
29
30 import {
packages/react-reconciler/src/ReactFiberNewContext.js
+2 -2
@@ -21,12 +21,12 @@ export type ContextDependency<T> = {
21
22 import {isPrimaryRenderer} from './ReactFiberHostConfig';
23 import {createCursor, push, pop} from './ReactFiberStack';
24 -import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
24 +import {MAX_SIGNED_31_BIT_INT} from './MaxInts';
25 import {
26 ContextProvider,
27 ClassComponent,
28 DehydratedFragment,
29 -} from 'shared/ReactWorkTags';
29 +} from './ReactWorkTags';
30
31 import invariant from 'shared/invariant';
32 import is from 'shared/objectIs';
packages/react-reconciler/src/ReactFiberReconciler.js
+5
@@ -39,6 +39,7 @@ import {
39 shouldSuspend as shouldSuspend_old,
40 injectIntoDevTools as injectIntoDevTools_old,
41 act as act_old,
42 + createPortal as createPortal_old,
43 } from './ReactFiberReconciler.old';
44
45 // TODO: Update these to point to the fork.
@@ -67,6 +68,7 @@ import {
68 shouldSuspend as shouldSuspend_new,
69 injectIntoDevTools as injectIntoDevTools_new,
70 act as act_new,
71 + createPortal as createPortal_new,
72 } from './ReactFiberReconciler.old';
73
74 export const createContainer = enableNewReconciler
@@ -137,3 +139,6 @@ export const injectIntoDevTools = enableNewReconciler
139 ? injectIntoDevTools_new
140 : injectIntoDevTools_old;
141 export const act = enableNewReconciler ? act_new : act_old;
142 +export const createPortal = enableNewReconciler
143 + ? createPortal_new
144 + : createPortal_old;
packages/react-reconciler/src/ReactFiberReconciler.old.js
+5 -3
@@ -9,14 +9,14 @@
9
10 import type {Fiber} from './ReactFiber';
11 import type {FiberRoot} from './ReactFiberRoot';
12 -import type {RootTag} from 'shared/ReactRootTags';
12 +import type {RootTag} from 'react-reconciler/src/ReactRootTags';
13 import type {
14 Instance,
15 TextInstance,
16 Container,
17 PublicInstance,
18 } from './ReactFiberHostConfig';
19 -import {FundamentalComponent} from 'shared/ReactWorkTags';
19 +import {FundamentalComponent} from './ReactWorkTags';
20 import type {ReactNodeList} from 'shared/ReactTypes';
21 import type {ExpirationTime} from './ReactFiberExpirationTime';
22 import type {
@@ -34,7 +34,7 @@ import {
34 ClassComponent,
35 HostRoot,
36 SuspenseComponent,
37 -} from 'shared/ReactWorkTags';
37 +} from './ReactWorkTags';
38 import getComponentName from 'shared/getComponentName';
39 import invariant from 'shared/invariant';
40 import ReactSharedInternals from 'shared/ReactSharedInternals';
@@ -92,6 +92,8 @@ import enqueueTask from 'shared/enqueueTask';
92 import * as Scheduler from 'scheduler';
93 // end isTestEnvironment imports
94
95 +export {createPortal} from './ReactPortal';
96 +
97 type OpaqueRoot = FiberRoot;
98
99 // 0 is PROD, 1 is DEV.
packages/react-reconciler/src/ReactFiberRoot.js
+1 -1
@@ -9,7 +9,7 @@
9
10 import type {Fiber} from './ReactFiber';
11 import type {ExpirationTime} from './ReactFiberExpirationTime';
12 -import type {RootTag} from 'shared/ReactRootTags';
12 +import type {RootTag} from 'react-reconciler/src/ReactRootTags';
13 import type {TimeoutHandle, NoTimeout} from './ReactFiberHostConfig';
14 import type {Thenable} from './ReactFiberWorkLoop';
15 import type {Interaction} from 'scheduler/src/Tracing';
packages/react-reconciler/src/ReactFiberScope.js
+1 -1
@@ -23,7 +23,7 @@ import {
23 SuspenseComponent,
24 ScopeComponent,
25 ContextProvider,
26 -} from 'shared/ReactWorkTags';
26 +} from './ReactWorkTags';
27 import {enableScopeAPI} from 'shared/ReactFeatureFlags';
28
29 function isFiberSuspenseAndTimedOut(fiber: Fiber): boolean {
packages/react-reconciler/src/ReactFiberSuspenseComponent.js
+2 -2
@@ -10,8 +10,8 @@
10 import type {Fiber} from './ReactFiber';
11 import type {SuspenseInstance} from './ReactFiberHostConfig';
12 import type {ExpirationTime} from './ReactFiberExpirationTime';
13 -import {SuspenseComponent, SuspenseListComponent} from 'shared/ReactWorkTags';
14 -import {NoEffect, DidCapture} from 'shared/ReactSideEffectTags';
13 +import {SuspenseComponent, SuspenseListComponent} from './ReactWorkTags';
14 +import {NoEffect, DidCapture} from './ReactSideEffectTags';
15 import {
16 isSuspenseInstancePending,
17 isSuspenseInstanceFallback,
packages/react-reconciler/src/ReactFiberThrow.js
+2 -2
@@ -21,14 +21,14 @@ import {
21 HostRoot,
22 SuspenseComponent,
23 IncompleteClassComponent,
24 -} from 'shared/ReactWorkTags';
24 +} from './ReactWorkTags';
25 import {
26 DidCapture,
27 Incomplete,
28 NoEffect,
29 ShouldCapture,
30 LifecycleEffectMask,
31 -} from 'shared/ReactSideEffectTags';
31 +} from './ReactSideEffectTags';
32 import {NoMode, BlockingMode} from './ReactTypeOfMode';
33 import {shouldCaptureSuspense} from './ReactFiberSuspenseComponent';
34
packages/react-reconciler/src/ReactFiberTreeReflection.js
+2 -2
@@ -24,8 +24,8 @@ import {
24 HostText,
25 FundamentalComponent,
26 SuspenseComponent,
27 -} from 'shared/ReactWorkTags';
28 -import {NoEffect, Placement, Hydrating} from 'shared/ReactSideEffectTags';
27 +} from './ReactWorkTags';
28 +import {NoEffect, Placement, Hydrating} from './ReactSideEffectTags';
29 import {enableFundamentalAPI} from 'shared/ReactFeatureFlags';
30
31 const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
packages/react-reconciler/src/ReactFiberUnwindWork.js
+2 -2
@@ -20,8 +20,8 @@ import {
20 ContextProvider,
21 SuspenseComponent,
22 SuspenseListComponent,
23 -} from 'shared/ReactWorkTags';
24 -import {DidCapture, NoEffect, ShouldCapture} from 'shared/ReactSideEffectTags';
23 +} from './ReactWorkTags';
24 +import {DidCapture, NoEffect, ShouldCapture} from './ReactSideEffectTags';
25 import {enableSuspenseServerRenderer} from 'shared/ReactFeatureFlags';
26
27 import {popHostContainer, popHostContext} from './ReactFiberHostContext';
packages/react-reconciler/src/ReactFiberWorkLoop.js
+3 -3
@@ -90,8 +90,8 @@ import {
90 MemoComponent,
91 SimpleMemoComponent,
92 Block,
93 -} from 'shared/ReactWorkTags';
94 -import {LegacyRoot} from 'shared/ReactRootTags';
93 +} from './ReactWorkTags';
94 +import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
95 import {
96 NoEffect,
97 PerformedWork,
@@ -108,7 +108,7 @@ import {
108 HostEffectMask,
109 Hydrating,
110 HydratingAndUpdate,
111 -} from 'shared/ReactSideEffectTags';
111 +} from './ReactSideEffectTags';
112 import {
113 NoWork,
114 Sync,
packages/react-reconciler/src/ReactPortal.js renamed
packages/react-reconciler/src/ReactProfilerTimer.js
+1 -1
@@ -13,7 +13,7 @@ import {
13 enableProfilerTimer,
14 enableProfilerCommitHooks,
15 } from 'shared/ReactFeatureFlags';
16 -import {Profiler} from 'shared/ReactWorkTags';
16 +import {Profiler} from './ReactWorkTags';
17
18 // Intentionally not named imports because Rollup would use dynamic dispatch for
19 // CommonJS interop named imports.
packages/react-reconciler/src/ReactRootTags.js renamed
packages/react-reconciler/src/ReactSideEffectTags.js renamed
packages/react-reconciler/src/ReactTreeTraversal.js renamed
packages/react-reconciler/src/ReactUpdateQueue.js
+1 -1
@@ -94,7 +94,7 @@ import {
94 enterDisallowedContextReadInDEV,
95 exitDisallowedContextReadInDEV,
96 } from './ReactFiberNewContext';
97 -import {Callback, ShouldCapture, DidCapture} from 'shared/ReactSideEffectTags';
97 +import {Callback, ShouldCapture, DidCapture} from './ReactSideEffectTags';
98
99 import {debugRenderPhaseSideEffectsForStrictMode} from 'shared/ReactFeatureFlags';
100
packages/react-reconciler/src/ReactWorkTags.js renamed
packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js
+1 -1
@@ -19,7 +19,7 @@ describe('ReactFiberHostContext', () => {
19 jest.resetModules();
20 React = require('react');
21 ReactFiberReconciler = require('react-reconciler');
22 - ConcurrentRoot = require('shared/ReactRootTags');
22 + ConcurrentRoot = require('react-reconciler/src/ReactRootTags');
23 });
24
25 it('works with null host context', () => {
packages/react-test-renderer/src/ReactTestHostConfig.js
+2 -2
@@ -49,8 +49,8 @@ export type ReactListenerEvent = Object;
49 export type ReactListenerMap = Object;
50 export type ReactListener = Object;
51
52 -export * from 'shared/HostConfigWithNoPersistence';
53 -export * from 'shared/HostConfigWithNoHydration';
52 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
53 +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
54
55 const EVENT_COMPONENT_CONTEXT = {};
56 const NO_CONTEXT = {};
packages/react-test-renderer/src/ReactTestRenderer.js
+2 -2
@@ -40,13 +40,13 @@ import {
40 Block,
41 IncompleteClassComponent,
42 ScopeComponent,
43 -} from 'shared/ReactWorkTags';
43 +} from 'react-reconciler/src/ReactWorkTags';
44 import invariant from 'shared/invariant';
45 import getComponentName from 'shared/getComponentName';
46 import ReactVersion from 'shared/ReactVersion';
47
48 import {getPublicInstance} from './ReactTestHostConfig';
49 -import {ConcurrentRoot, LegacyRoot} from 'shared/ReactRootTags';
49 +import {ConcurrentRoot, LegacyRoot} from 'react-reconciler/src/ReactRootTags';
50
51 type TestRendererOptions = {
52 createNodeMock: (element: React$Element<any>) => any,
packages/react/src/BadMapPolyfill.js renamed
packages/react/src/React.js
+8 -8
@@ -27,9 +27,9 @@ import {
27 } from './ReactElement';
28 import {createContext} from './ReactContext';
29 import {lazy} from './ReactLazy';
30 -import forwardRef from './forwardRef';
31 -import memo from './memo';
32 -import block from './block';
30 +import {forwardRef} from './ReactForwardRef';
31 +import {memo} from './ReactMemo';
32 +import {block} from './ReactBlock';
33 import {
34 useCallback,
35 useContext,
@@ -52,11 +52,11 @@ import {
52 createFactoryWithValidation,
53 cloneElementWithValidation,
54 } from './ReactElementValidator';
55 -import createMutableSource from './createMutableSource';
55 +import {createMutableSource} from './ReactMutableSource';
56 import ReactSharedInternals from './ReactSharedInternals';
57 -import createFundamental from 'shared/createFundamentalComponent';
58 -import createResponder from 'shared/createEventResponder';
59 -import createScope from 'shared/createScope';
57 +import {createFundamental} from './ReactFundamental';
58 +import {createEventResponder} from './ReactEventResponder';
59 +import {createScope} from './ReactScope';
60
61 // TODO: Move this branching into the other module instead and just re-export.
62 const createElement = __DEV__ ? createElementWithValidation : createElementProd;
@@ -112,7 +112,7 @@ export {
112 block,
113 // enableDeprecatedFlareAPI
114 useResponder as DEPRECATED_useResponder,
115 - createResponder as DEPRECATED_createResponder,
115 + createEventResponder as DEPRECATED_createResponder,
116 // enableFundamentalAPI
117 createFundamental as unstable_createFundamental,
118 // enableScopeAPI
packages/react/src/ReactBlock.js renamed
+1 -1
@@ -68,7 +68,7 @@ opaque type Block<Props>: React$AbstractComponent<
68 null,
69 > = React$AbstractComponent<Props, null>;
70
71 -export default function block<Args: Iterable<any>, Props, Data>(
71 +export function block<Args: Iterable<any>, Props, Data>(
72 query: BlockQueryFunction<Args, Data>,
73 render: BlockRenderFunction<Props, Data>,
74 ): (...args: Args) => Block<Props> {
packages/react/src/ReactEventResponder.js renamed
+2 -2
@@ -8,9 +8,9 @@
8
9 import type {ReactEventResponder} from 'shared/ReactTypes';
10 import {REACT_RESPONDER_TYPE} from 'shared/ReactSymbols';
11 -import {hasBadMapPolyfill} from './hasBadMapPolyfill';
11 +import {hasBadMapPolyfill} from './BadMapPolyfill';
12
13 -export default function createEventResponder<E, C>(
13 +export function createEventResponder<E, C>(
14 displayName: string,
15 responderConfig: Object,
16 ): ReactEventResponder<E, C> {
packages/react/src/ReactForwardRef.js renamed
+1 -1
@@ -7,7 +7,7 @@
7
8 import {REACT_FORWARD_REF_TYPE, REACT_MEMO_TYPE} from 'shared/ReactSymbols';
9
10 -export default function forwardRef<Props, ElementType: React$ElementType>(
10 +export function forwardRef<Props, ElementType: React$ElementType>(
11 render: (props: Props, ref: React$Ref<ElementType>) => React$Node,
12 ) {
13 if (__DEV__) {
packages/react/src/ReactFundamental.js renamed
+2 -2
@@ -11,9 +11,9 @@ import type {
11 ReactFundamentalComponent,
12 } from 'shared/ReactTypes';
13 import {REACT_FUNDAMENTAL_TYPE} from 'shared/ReactSymbols';
14 -import {hasBadMapPolyfill} from './hasBadMapPolyfill';
14 +import {hasBadMapPolyfill} from './BadMapPolyfill';
15
16 -export default function createFundamentalComponent<C, H>(
16 +export function createFundamental<C, H>(
17 impl: ReactFundamentalImpl<C, H>,
18 ): ReactFundamentalComponent<C, H> {
19 // We use responder as a Map key later on. When we have a bad
packages/react/src/ReactMemo.js renamed
+1 -1
@@ -9,7 +9,7 @@ import {REACT_MEMO_TYPE} from 'shared/ReactSymbols';
9
10 import isValidElementType from 'shared/isValidElementType';
11
12 -export default function memo<Props>(
12 +export function memo<Props>(
13 type: React$ElementType,
14 compare?: (oldProps: Props, newProps: Props) => boolean,
15 ) {
packages/react/src/ReactMutableSource.js renamed
+1 -1
@@ -9,7 +9,7 @@
9
10 import type {MutableSource, MutableSourceGetVersionFn} from 'shared/ReactTypes';
11
12 -export default function createMutableSource<Source: $NonMaybeType<mixed>>(
12 +export function createMutableSource<Source: $NonMaybeType<mixed>>(
13 source: Source,
14 getVersion: MutableSourceGetVersionFn,
15 ): MutableSource<Source> {
packages/react/src/ReactScope.js renamed
+1 -1
@@ -9,7 +9,7 @@
9 import type {ReactScope} from 'shared/ReactTypes';
10 import {REACT_SCOPE_TYPE} from 'shared/ReactSymbols';
11
12 -export default function createScope(): ReactScope {
12 +export function createScope(): ReactScope {
13 const scopeComponent = {
14 $$typeof: REACT_SCOPE_TYPE,
15 };
packages/shared/ReactLazyComponent.js
+1 -1
@@ -19,7 +19,7 @@ import type {
19 ResolvedBlockComponent,
20 RejectedBlockComponent,
21 BlockComponent,
22 -} from 'react/src/block';
22 +} from 'react/src/ReactBlock';
23
24 import {
25 Uninitialized,
packages/shared/endsWith.js deleted
-13
@@ -1,13 +0,0 @@
1 -/**
2 - * Copyright (c) Facebook, Inc. and its affiliates.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @flow
8 - */
9 -
10 -export default function endsWith(subject: string, search: string): boolean {
11 - const length = subject.length;
12 - return subject.substring(length - search.length, length) === search;
13 -}
scripts/shared/inlinedHostConfigs.js
+1
@@ -25,6 +25,7 @@ module.exports = [
25 'react-flight-dom-webpack/server',
26 'react-flight-dom-webpack/server.node',
27 'react-flight-dom-webpack/src/ReactFlightDOMServerNode.js', // react-flight-dom-webpack/server.browser
28 + 'react-interactions',
29 ],
30 isFlowTyped: true,
31 isServerSupported: true,