diff --git a/packages/legacy-events/EventPropagators.js b/packages/legacy-events/EventPropagators.js index 7c10838d5aa1..510f116233d2 100644 --- a/packages/legacy-events/EventPropagators.js +++ b/packages/legacy-events/EventPropagators.js @@ -12,7 +12,7 @@ import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType'; import getListener from 'legacy-events/getListener'; -import {traverseEnterLeave} from 'shared/ReactTreeTraversal'; +import {traverseEnterLeave} from 'react-reconciler/src/ReactTreeTraversal'; import accumulateInto from './accumulateInto'; import forEachAccumulated from './forEachAccumulated'; diff --git a/packages/legacy-events/ResponderEventPlugin.js b/packages/legacy-events/ResponderEventPlugin.js index 077e431f20e9..0812e71bf3db 100644 --- a/packages/legacy-events/ResponderEventPlugin.js +++ b/packages/legacy-events/ResponderEventPlugin.js @@ -10,7 +10,7 @@ import { isAncestor, getParentInstance, traverseTwoPhase, -} from 'shared/ReactTreeTraversal'; +} from 'react-reconciler/src/ReactTreeTraversal'; import { executeDirectDispatch, diff --git a/packages/legacy-events/__tests__/ResponderEventPlugin-test.internal.js b/packages/legacy-events/__tests__/ResponderEventPlugin-test.internal.js index a290784c95c2..627489ac9ae7 100644 --- a/packages/legacy-events/__tests__/ResponderEventPlugin-test.internal.js +++ b/packages/legacy-events/__tests__/ResponderEventPlugin-test.internal.js @@ -9,7 +9,7 @@ 'use strict'; -const {HostComponent} = require('shared/ReactWorkTags'); +const {HostComponent} = require('react-reconciler/src/ReactWorkTags'); const {PLUGIN_EVENT_SYSTEM} = require('legacy-events/EventSystemFlags'); let EventBatching; @@ -1378,7 +1378,7 @@ describe('ResponderEventPlugin', () => { // ResponderEventPlugin uses `getLowestCommonAncestor` const React = require('react'); const ReactTestUtils = require('react-dom/test-utils'); - const ReactTreeTraversal = require('shared/ReactTreeTraversal'); + const ReactTreeTraversal = require('react-reconciler/src/ReactTreeTraversal'); const ReactDOMComponentTree = require('../../react-dom/src/client/ReactDOMComponentTree'); class ChildComponent extends React.Component { diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js index 9e0778c1c573..a29f9cd23714 100644 --- a/packages/react-art/src/ReactART.js +++ b/packages/react-art/src/ReactART.js @@ -7,7 +7,7 @@ import * as React from 'react'; import ReactVersion from 'shared/ReactVersion'; -import {LegacyRoot} from 'shared/ReactRootTags'; +import {LegacyRoot} from 'react-reconciler/src/ReactRootTags'; import { createContainer, updateContainer, diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js index 41f544810f76..28bbc236b14e 100644 --- a/packages/react-art/src/ReactARTHostConfig.js +++ b/packages/react-art/src/ReactARTHostConfig.js @@ -241,8 +241,8 @@ function applyTextProps(instance, props, prevProps = {}) { } } -export * from 'shared/HostConfigWithNoPersistence'; -export * from 'shared/HostConfigWithNoHydration'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration'; export function appendInitialChild(parentInstance, child) { if (typeof child === 'string') { diff --git a/packages/react-debug-tools/src/ReactDebugHooks.js b/packages/react-debug-tools/src/ReactDebugHooks.js index 17b4b4326342..175b51485d30 100644 --- a/packages/react-debug-tools/src/ReactDebugHooks.js +++ b/packages/react-debug-tools/src/ReactDebugHooks.js @@ -29,7 +29,7 @@ import { ContextProvider, ForwardRef, Block, -} from 'shared/ReactWorkTags'; +} from 'react-reconciler/src/ReactWorkTags'; type CurrentDispatcherRef = typeof ReactSharedInternals.ReactCurrentDispatcher; diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index 1128ad28ee25..5de914e34513 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -37,7 +37,7 @@ import { attemptContinuousHydration, attemptHydrationAtCurrentPriority, } from 'react-reconciler/src/ReactFiberReconciler'; -import {createPortal as createPortalImpl} from 'shared/ReactPortal'; +import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal'; import {canUseDOM} from 'shared/ExecutionEnvironment'; import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching'; import { diff --git a/packages/react-dom/src/client/ReactDOMComponent.js b/packages/react-dom/src/client/ReactDOMComponent.js index c26205fdd988..f841cbabb558 100644 --- a/packages/react-dom/src/client/ReactDOMComponent.js +++ b/packages/react-dom/src/client/ReactDOMComponent.js @@ -9,7 +9,6 @@ import {registrationNameModules} from 'legacy-events/EventPluginRegistry'; import {canUseDOM} from 'shared/ExecutionEnvironment'; -import endsWith from 'shared/endsWith'; import invariant from 'shared/invariant'; import {setListenToResponderEventTypes} from '../events/DeprecatedDOMEventResponderSystem'; @@ -1327,6 +1326,11 @@ export function restoreControlledState( } } +function endsWith(subject: string, search: string): boolean { + const length = subject.length; + return subject.substring(length - search.length, length) === search; +} + export function listenToEventResponderEventTypes( eventTypes: Array, document: Document, diff --git a/packages/react-dom/src/client/ReactDOMComponentTree.js b/packages/react-dom/src/client/ReactDOMComponentTree.js index 31d86a624964..a5eae3704280 100644 --- a/packages/react-dom/src/client/ReactDOMComponentTree.js +++ b/packages/react-dom/src/client/ReactDOMComponentTree.js @@ -15,14 +15,14 @@ import type { SuspenseInstance, Props, } from './ReactDOMHostConfig'; -import type {ReactDOMListener} from 'shared/ReactDOMTypes'; +import type {ReactDOMListener} from '../shared/ReactDOMTypes'; import { HostComponent, HostText, HostRoot, SuspenseComponent, -} from 'shared/ReactWorkTags'; +} from 'react-reconciler/src/ReactWorkTags'; import invariant from 'shared/invariant'; import {getParentSuspenseInstance} from './ReactDOMHostConfig'; diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js index a6e3eeefa52a..2d9d080b41be 100644 --- a/packages/react-dom/src/client/ReactDOMHostConfig.js +++ b/packages/react-dom/src/client/ReactDOMHostConfig.js @@ -55,7 +55,7 @@ import type { ReactDOMListener, ReactDOMListenerEvent, ReactDOMListenerMap, -} from 'shared/ReactDOMTypes'; +} from '../shared/ReactDOMTypes'; import { mountEventResponder, unmountEventResponder, @@ -69,7 +69,7 @@ import { enableFundamentalAPI, enableUseEventAPI, } from 'shared/ReactFeatureFlags'; -import {HostComponent} from 'shared/ReactWorkTags'; +import {HostComponent} from 'react-reconciler/src/ReactWorkTags'; import { RESPONDER_EVENT_SYSTEM, IS_PASSIVE, @@ -171,7 +171,7 @@ function shouldAutoFocusHostComponent(type: string, props: Props): boolean { return false; } -export * from 'shared/HostConfigWithNoPersistence'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence'; export function getRootHostContext( rootContainerInstance: Container, diff --git a/packages/react-dom/src/client/ReactDOMRoot.js b/packages/react-dom/src/client/ReactDOMRoot.js index 62cd9fcef034..a73f51daee34 100644 --- a/packages/react-dom/src/client/ReactDOMRoot.js +++ b/packages/react-dom/src/client/ReactDOMRoot.js @@ -8,7 +8,7 @@ */ import type {Container} from './ReactDOMHostConfig'; -import type {RootTag} from 'shared/ReactRootTags'; +import type {RootTag} from 'react-reconciler/src/ReactRootTags'; 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. @@ -50,7 +50,11 @@ import { updateContainer, } from 'react-reconciler/src/ReactFiberReconciler'; import invariant from 'shared/invariant'; -import {BlockingRoot, ConcurrentRoot, LegacyRoot} from 'shared/ReactRootTags'; +import { + BlockingRoot, + ConcurrentRoot, + LegacyRoot, +} from 'react-reconciler/src/ReactRootTags'; function ReactDOMRoot(container: Container, options: void | RootOptions) { this._internalRoot = createRootImpl(container, ConcurrentRoot, options); diff --git a/packages/react-dom/src/client/ReactDOMUseEvent.js b/packages/react-dom/src/client/ReactDOMUseEvent.js index 01d28889981b..9947b563c949 100644 --- a/packages/react-dom/src/client/ReactDOMUseEvent.js +++ b/packages/react-dom/src/client/ReactDOMUseEvent.js @@ -12,7 +12,7 @@ import type {EventPriority} from 'shared/ReactTypes'; import type { ReactDOMListenerEvent, ReactDOMListenerMap, -} from 'shared/ReactDOMTypes'; +} from '../shared/ReactDOMTypes'; import ReactSharedInternals from 'shared/ReactSharedInternals'; import invariant from 'shared/invariant'; diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js index ac36d6fe1e1b..18a30258132b 100644 --- a/packages/react-dom/src/events/ChangeEventPlugin.js +++ b/packages/react-dom/src/events/ChangeEventPlugin.js @@ -9,7 +9,7 @@ import {runEventsInBatch} from 'legacy-events/EventBatching'; import {enqueueStateRestore} from 'legacy-events/ReactControlledComponent'; import {batchedUpdates} from 'legacy-events/ReactGenericBatching'; import SyntheticEvent from 'legacy-events/SyntheticEvent'; -import isTextInputElement from 'shared/isTextInputElement'; +import isTextInputElement from './isTextInputElement'; import {canUseDOM} from 'shared/ExecutionEnvironment'; import { diff --git a/packages/react-dom/src/events/DOMLegacyEventPluginSystem.js b/packages/react-dom/src/events/DOMLegacyEventPluginSystem.js index 2c9791d38406..412d2c94aa77 100644 --- a/packages/react-dom/src/events/DOMLegacyEventPluginSystem.js +++ b/packages/react-dom/src/events/DOMLegacyEventPluginSystem.js @@ -16,7 +16,11 @@ import type {PluginModule} from 'legacy-events/PluginModuleType'; import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType'; import type {TopLevelType} from 'legacy-events/TopLevelEventTypes'; -import {HostRoot, HostComponent, HostText} from 'shared/ReactWorkTags'; +import { + HostRoot, + HostComponent, + HostText, +} from 'react-reconciler/src/ReactWorkTags'; import {IS_FIRST_ANCESTOR} from 'legacy-events/EventSystemFlags'; import {batchedEventUpdates} from 'legacy-events/ReactGenericBatching'; import {runEventsInBatch} from 'legacy-events/EventBatching'; diff --git a/packages/react-dom/src/events/DOMModernPluginEventSystem.js b/packages/react-dom/src/events/DOMModernPluginEventSystem.js index 9188c120f9a9..a284e726f32b 100644 --- a/packages/react-dom/src/events/DOMModernPluginEventSystem.js +++ b/packages/react-dom/src/events/DOMModernPluginEventSystem.js @@ -21,7 +21,7 @@ import type { ReactSyntheticEvent, CustomDispatchConfig, } from 'legacy-events/ReactSyntheticEventType'; -import type {ReactDOMListener} from 'shared/ReactDOMTypes'; +import type {ReactDOMListener} from '../shared/ReactDOMTypes'; import {registrationNameDependencies} from 'legacy-events/EventPluginRegistry'; import {batchedEventUpdates} from 'legacy-events/ReactGenericBatching'; @@ -33,7 +33,7 @@ import { IS_TARGET_EVENT_ONLY, } from 'legacy-events/EventSystemFlags'; -import {HostRoot, HostPortal} from 'shared/ReactWorkTags'; +import {HostRoot, HostPortal} from 'react-reconciler/src/ReactWorkTags'; import { addTrappedEventListener, diff --git a/packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js b/packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js index eb1e7fba882c..b307a0be081b 100644 --- a/packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js +++ b/packages/react-dom/src/events/DeprecatedDOMEventResponderSystem.js @@ -12,14 +12,18 @@ import { PASSIVE_NOT_SUPPORTED, } from 'legacy-events/EventSystemFlags'; import type {AnyNativeEvent} from 'legacy-events/PluginModuleType'; -import {HostComponent, ScopeComponent, HostPortal} from 'shared/ReactWorkTags'; +import { + HostComponent, + ScopeComponent, + HostPortal, +} from 'react-reconciler/src/ReactWorkTags'; import type {EventPriority} from 'shared/ReactTypes'; import type { ReactDOMEventResponder, ReactDOMEventResponderInstance, ReactDOMResponderContext, ReactDOMResponderEvent, -} from 'shared/ReactDOMTypes'; +} from '../shared/ReactDOMTypes'; import type {DOMTopLevelEventType} from 'legacy-events/TopLevelEventTypes'; import { batchedEventUpdates, diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js index b996973b6917..c9860c8aa18e 100644 --- a/packages/react-dom/src/events/EnterLeaveEventPlugin.js +++ b/packages/react-dom/src/events/EnterLeaveEventPlugin.js @@ -20,7 +20,7 @@ import { getClosestInstanceFromNode, getNodeFromInstance, } from '../client/ReactDOMComponentTree'; -import {HostComponent, HostText} from 'shared/ReactWorkTags'; +import {HostComponent, HostText} from 'react-reconciler/src/ReactWorkTags'; import {getNearestMountedFiber} from 'react-reconciler/src/ReactFiberTreeReflection'; import {enableModernEventSystem} from 'shared/ReactFeatureFlags'; diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js index b69ad59adac0..eac94698aeb0 100644 --- a/packages/react-dom/src/events/ReactDOMEventListener.js +++ b/packages/react-dom/src/events/ReactDOMEventListener.js @@ -34,7 +34,7 @@ import { getContainerFromFiber, getSuspenseInstanceFromFiber, } from 'react-reconciler/src/ReactFiberTreeReflection'; -import {HostRoot, SuspenseComponent} from 'shared/ReactWorkTags'; +import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags'; import { type EventSystemFlags, PLUGIN_EVENT_SYSTEM, diff --git a/packages/react-dom/src/events/ReactDOMEventReplaying.js b/packages/react-dom/src/events/ReactDOMEventReplaying.js index 9f34d3a898d2..d2bf8949a2ac 100644 --- a/packages/react-dom/src/events/ReactDOMEventReplaying.js +++ b/packages/react-dom/src/events/ReactDOMEventReplaying.js @@ -40,7 +40,7 @@ import { getClosestInstanceFromNode, } from '../client/ReactDOMComponentTree'; import {unsafeCastDOMTopLevelTypeToString} from 'legacy-events/TopLevelEventTypes'; -import {HostRoot, SuspenseComponent} from 'shared/ReactWorkTags'; +import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags'; let attemptSynchronousHydration: (fiber: Object) => void; diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js index 5467b48fd6ca..9de277a32c24 100644 --- a/packages/react-dom/src/events/SelectEventPlugin.js +++ b/packages/react-dom/src/events/SelectEventPlugin.js @@ -7,7 +7,7 @@ import {canUseDOM} from 'shared/ExecutionEnvironment'; import SyntheticEvent from 'legacy-events/SyntheticEvent'; -import isTextInputElement from 'shared/isTextInputElement'; +import isTextInputElement from './isTextInputElement'; import shallowEqual from 'shared/shallowEqual'; import { diff --git a/packages/react-dom/src/events/accumulateTwoPhaseListeners.js b/packages/react-dom/src/events/accumulateTwoPhaseListeners.js index 243a3c91bfb6..3a275eee17f2 100644 --- a/packages/react-dom/src/events/accumulateTwoPhaseListeners.js +++ b/packages/react-dom/src/events/accumulateTwoPhaseListeners.js @@ -11,7 +11,7 @@ import type {DOMTopLevelEventType} from 'legacy-events/TopLevelEventTypes'; import type {EventSystemFlags} from 'legacy-events/EventSystemFlags'; import type {ReactSyntheticEvent} from 'legacy-events/ReactSyntheticEventType'; -import {HostComponent} from 'shared/ReactWorkTags'; +import {HostComponent} from 'react-reconciler/src/ReactWorkTags'; import {enableUseEventAPI} from 'shared/ReactFeatureFlags'; import getListener from 'legacy-events/getListener'; diff --git a/packages/shared/isTextInputElement.js b/packages/react-dom/src/events/isTextInputElement.js similarity index 100% rename from packages/shared/isTextInputElement.js rename to packages/react-dom/src/events/isTextInputElement.js diff --git a/packages/react-dom/src/server/ReactPartialRendererHooks.js b/packages/react-dom/src/server/ReactPartialRendererHooks.js index ca480f8ed58a..f614caf5b392 100644 --- a/packages/react-dom/src/server/ReactPartialRendererHooks.js +++ b/packages/react-dom/src/server/ReactPartialRendererHooks.js @@ -20,7 +20,7 @@ import type { ReactEventResponderListener, } from 'shared/ReactTypes'; import type {SuspenseConfig} from 'react-reconciler/src/ReactFiberSuspenseConfig'; -import type {ReactDOMListenerMap} from 'shared/ReactDOMTypes'; +import type {ReactDOMListenerMap} from '../shared/ReactDOMTypes'; import {validateContextBounds} from './ReactPartialRendererContext'; diff --git a/packages/shared/ReactDOMTypes.js b/packages/react-dom/src/shared/ReactDOMTypes.js similarity index 100% rename from packages/shared/ReactDOMTypes.js rename to packages/react-dom/src/shared/ReactDOMTypes.js diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js index 0465e73771ac..4105c0dec30a 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtils.js +++ b/packages/react-dom/src/test-utils/ReactTestUtils.js @@ -14,7 +14,7 @@ import { FunctionComponent, HostComponent, HostText, -} from 'shared/ReactWorkTags'; +} from 'react-reconciler/src/ReactWorkTags'; import SyntheticEvent from 'legacy-events/SyntheticEvent'; import invariant from 'shared/invariant'; import {ELEMENT_NODE} from '../shared/HTMLNodeType'; @@ -23,7 +23,7 @@ import {PLUGIN_EVENT_SYSTEM} from 'legacy-events/EventSystemFlags'; import act from './ReactTestUtilsAct'; import forEachAccumulated from 'legacy-events/forEachAccumulated'; import accumulateInto from 'legacy-events/accumulateInto'; -import {traverseTwoPhase} from 'shared/ReactTreeTraversal'; +import {traverseTwoPhase} from 'react-reconciler/src/ReactTreeTraversal'; const {findDOMNode} = ReactDOM; // Keep in sync with ReactDOMUnstableNativeDependencies.js diff --git a/packages/react-interactions/events/src/dom/ContextMenu.js b/packages/react-interactions/events/src/dom/ContextMenu.js index 8cccb992d407..e62446d7df52 100644 --- a/packages/react-interactions/events/src/dom/ContextMenu.js +++ b/packages/react-interactions/events/src/dom/ContextMenu.js @@ -11,7 +11,7 @@ import type { ReactDOMResponderEvent, ReactDOMResponderContext, PointerType, -} from 'shared/ReactDOMTypes'; +} from 'react-dom/src/shared/ReactDOMTypes'; import type {ReactEventResponderListener} from 'shared/ReactTypes'; import * as React from 'react'; diff --git a/packages/react-interactions/events/src/dom/Focus.js b/packages/react-interactions/events/src/dom/Focus.js index 17a9b72d6bc8..5cba09a4ca23 100644 --- a/packages/react-interactions/events/src/dom/Focus.js +++ b/packages/react-interactions/events/src/dom/Focus.js @@ -11,7 +11,7 @@ import type { ReactDOMResponderEvent, ReactDOMResponderContext, PointerType, -} from 'shared/ReactDOMTypes'; +} from 'react-dom/src/shared/ReactDOMTypes'; import type {ReactEventResponderListener} from 'shared/ReactTypes'; import * as React from 'react'; diff --git a/packages/react-interactions/events/src/dom/Hover.js b/packages/react-interactions/events/src/dom/Hover.js index c7db1d1bb775..d749c772ca8b 100644 --- a/packages/react-interactions/events/src/dom/Hover.js +++ b/packages/react-interactions/events/src/dom/Hover.js @@ -11,7 +11,7 @@ import type { ReactDOMResponderEvent, ReactDOMResponderContext, PointerType, -} from 'shared/ReactDOMTypes'; +} from 'react-dom/src/shared/ReactDOMTypes'; import type {ReactEventResponderListener} from 'shared/ReactTypes'; import * as React from 'react'; diff --git a/packages/react-interactions/events/src/dom/Input.js b/packages/react-interactions/events/src/dom/Input.js index dbe0e98dae92..c07e2aa0aeda 100644 --- a/packages/react-interactions/events/src/dom/Input.js +++ b/packages/react-interactions/events/src/dom/Input.js @@ -10,7 +10,7 @@ import type { ReactDOMResponderEvent, ReactDOMResponderContext, -} from 'shared/ReactDOMTypes'; +} from 'react-dom/src/shared/ReactDOMTypes'; import * as React from 'react'; import {DiscreteEvent} from 'shared/ReactTypes'; diff --git a/packages/react-interactions/events/src/dom/Keyboard.js b/packages/react-interactions/events/src/dom/Keyboard.js index 4e8a23ded61a..5f0b1aa07527 100644 --- a/packages/react-interactions/events/src/dom/Keyboard.js +++ b/packages/react-interactions/events/src/dom/Keyboard.js @@ -10,7 +10,7 @@ import type { ReactDOMResponderEvent, ReactDOMResponderContext, -} from 'shared/ReactDOMTypes'; +} from 'react-dom/src/shared/ReactDOMTypes'; import type {ReactEventResponderListener} from 'shared/ReactTypes'; import * as React from 'react'; diff --git a/packages/react-interactions/events/src/dom/Press.js b/packages/react-interactions/events/src/dom/Press.js index 4cdef4aad4de..1995c1421d71 100644 --- a/packages/react-interactions/events/src/dom/Press.js +++ b/packages/react-interactions/events/src/dom/Press.js @@ -7,7 +7,7 @@ * @flow */ -import type {PointerType} from 'shared/ReactDOMTypes'; +import type {PointerType} from 'react-dom/src/shared/ReactDOMTypes'; import * as React from 'react'; import {useTap} from 'react-interactions/events/tap'; diff --git a/packages/react-interactions/events/src/dom/PressLegacy.js b/packages/react-interactions/events/src/dom/PressLegacy.js index d869eace7535..9669829013b6 100644 --- a/packages/react-interactions/events/src/dom/PressLegacy.js +++ b/packages/react-interactions/events/src/dom/PressLegacy.js @@ -11,7 +11,7 @@ import type { ReactDOMResponderEvent, ReactDOMResponderContext, PointerType, -} from 'shared/ReactDOMTypes'; +} from 'react-dom/src/shared/ReactDOMTypes'; import type { EventPriority, ReactEventResponderListener, diff --git a/packages/react-interactions/events/src/dom/Tap.js b/packages/react-interactions/events/src/dom/Tap.js index e633a71cbd0c..d2bb32e45ed5 100644 --- a/packages/react-interactions/events/src/dom/Tap.js +++ b/packages/react-interactions/events/src/dom/Tap.js @@ -11,7 +11,7 @@ import type { ReactDOMResponderContext, ReactDOMResponderEvent, PointerType, -} from 'shared/ReactDOMTypes'; +} from 'react-dom/src/shared/ReactDOMTypes'; import type {ReactEventResponderListener} from 'shared/ReactTypes'; import * as React from 'react'; diff --git a/packages/react-interactions/events/src/dom/shared/index.js b/packages/react-interactions/events/src/dom/shared/index.js index e5096e930450..5032293689a6 100644 --- a/packages/react-interactions/events/src/dom/shared/index.js +++ b/packages/react-interactions/events/src/dom/shared/index.js @@ -13,7 +13,7 @@ import {DiscreteEvent, UserBlockingEvent} from 'shared/ReactTypes'; import type { ReactDOMResponderContext, ReactDOMResponderEvent, -} from 'shared/ReactDOMTypes'; +} from 'react-dom/src/shared/ReactDOMTypes'; export const hasPointerEvents = typeof window !== 'undefined' && window.PointerEvent !== undefined; diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js index c5d49f81283d..e90ba95683f3 100644 --- a/packages/react-native-renderer/src/ReactFabric.js +++ b/packages/react-native-renderer/src/ReactFabric.js @@ -26,7 +26,7 @@ import { getPublicRootInstance, } from 'react-reconciler/src/ReactFiberReconciler'; -import {createPortal as createPortalImpl} from 'shared/ReactPortal'; +import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal'; import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching'; import ReactVersion from 'shared/ReactVersion'; @@ -36,7 +36,7 @@ import {UIManager} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateI import {getClosestInstanceFromNode} from './ReactFabricComponentTree'; import {getInspectorDataForViewTag} from './ReactNativeFiberInspector'; -import {LegacyRoot} from 'shared/ReactRootTags'; +import {LegacyRoot} from 'react-reconciler/src/ReactRootTags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; import getComponentName from 'shared/getComponentName'; diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js index d0d39009309f..308c2ed08bd8 100644 --- a/packages/react-native-renderer/src/ReactFabricHostConfig.js +++ b/packages/react-native-renderer/src/ReactFabricHostConfig.js @@ -171,8 +171,8 @@ class ReactFabricHostComponent { // eslint-disable-next-line no-unused-expressions (ReactFabricHostComponent.prototype: NativeMethods); -export * from 'shared/HostConfigWithNoMutation'; -export * from 'shared/HostConfigWithNoHydration'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMutation'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration'; export function appendInitialChild( parentInstance: Instance, diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js index 5dad72e05a1d..dd2d97f7e181 100644 --- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js +++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js @@ -18,7 +18,7 @@ import invariant from 'shared/invariant'; import {ReactNativeViewConfigRegistry} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface'; import accumulateInto from 'legacy-events/accumulateInto'; import getListener from 'legacy-events/getListener'; -import {traverseTwoPhase} from 'shared/ReactTreeTraversal'; +import {traverseTwoPhase} from 'react-reconciler/src/ReactTreeTraversal'; import forEachAccumulated from 'legacy-events/forEachAccumulated'; const { diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js index bdd4cdef7828..f48cfeb5a063 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js +++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js @@ -14,7 +14,7 @@ import { findCurrentFiberUsingSlowPath, } from 'react-reconciler/src/ReactFiberTreeReflection'; import getComponentName from 'shared/getComponentName'; -import {HostComponent} from 'shared/ReactWorkTags'; +import {HostComponent} from 'react-reconciler/src/ReactWorkTags'; import invariant from 'shared/invariant'; // Module provided by RN: import {UIManager} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface'; diff --git a/packages/react-native-renderer/src/ReactNativeHostConfig.js b/packages/react-native-renderer/src/ReactNativeHostConfig.js index 13ef9878dd89..2f0274a50197 100644 --- a/packages/react-native-renderer/src/ReactNativeHostConfig.js +++ b/packages/react-native-renderer/src/ReactNativeHostConfig.js @@ -75,8 +75,8 @@ function recursivelyUncacheFiberNode(node: Instance | TextInstance) { } } -export * from 'shared/HostConfigWithNoPersistence'; -export * from 'shared/HostConfigWithNoHydration'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration'; export function appendInitialChild( parentInstance: Instance, diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index 0d587355cffb..eb40fa485ab3 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -26,7 +26,7 @@ import { } 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'; +import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal'; import { setBatchingImplementation, batchedUpdates, @@ -38,7 +38,7 @@ import {UIManager} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateI import {getClosestInstanceFromNode} from './ReactNativeComponentTree'; import {getInspectorDataForViewTag} from './ReactNativeFiberInspector'; -import {LegacyRoot} from 'shared/ReactRootTags'; +import {LegacyRoot} from 'react-reconciler/src/ReactRootTags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; import getComponentName from 'shared/getComponentName'; diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js index 62ecd341c51f..0785387aef1f 100644 --- a/packages/react-noop-renderer/src/createReactNoop.js +++ b/packages/react-noop-renderer/src/createReactNoop.js @@ -17,12 +17,15 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber'; import type {UpdateQueue} from 'react-reconciler/src/ReactUpdateQueue'; import type {ReactNodeList} from 'shared/ReactTypes'; -import type {RootTag} from 'shared/ReactRootTags'; +import type {RootTag} from 'react-reconciler/src/ReactRootTags'; import * as Scheduler from 'scheduler/unstable_mock'; -import {createPortal} from 'shared/ReactPortal'; import {REACT_FRAGMENT_TYPE, REACT_ELEMENT_TYPE} from 'shared/ReactSymbols'; -import {ConcurrentRoot, BlockingRoot, LegacyRoot} from 'shared/ReactRootTags'; +import { + ConcurrentRoot, + BlockingRoot, + LegacyRoot, +} from 'react-reconciler/src/ReactRootTags'; type Container = { rootID: string, @@ -826,7 +829,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) { container: Container, key: ?string = null, ) { - return createPortal(children, container, null, key); + return NoopRenderer.createPortal(children, container, null, key); }, // Shortcut for testing a single root diff --git a/packages/react-reconciler/src/maxSigned31BitInt.js b/packages/react-reconciler/src/MaxInts.js similarity index 87% rename from packages/react-reconciler/src/maxSigned31BitInt.js rename to packages/react-reconciler/src/MaxInts.js index 9aa139b6db2b..bd925478e883 100644 --- a/packages/react-reconciler/src/maxSigned31BitInt.js +++ b/packages/react-reconciler/src/MaxInts.js @@ -10,4 +10,4 @@ // Max 31 bit integer. The max integer size in V8 for 32-bit systems. // Math.pow(2, 30) - 1 // 0b111111111111111111111111111111 -export default 1073741823; +export const MAX_SIGNED_31_BIT_INT = 1073741823; diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 72721b9b9d45..ab4c8a17a6d9 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -9,12 +9,12 @@ import type {ReactElement} from 'shared/ReactElementType'; import type {ReactPortal} from 'shared/ReactTypes'; -import type {BlockComponent} from 'react/src/block'; +import type {BlockComponent} from 'react/src/ReactBlock'; import type {Fiber} from './ReactFiber'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import getComponentName from 'shared/getComponentName'; -import {Placement, Deletion} from 'shared/ReactSideEffectTags'; +import {Placement, Deletion} from './ReactSideEffectTags'; import { getIteratorFn, REACT_ELEMENT_TYPE, @@ -29,7 +29,7 @@ import { HostPortal, Fragment, Block, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import invariant from 'shared/invariant'; import {warnAboutStringRefs, enableBlocksAPI} from 'shared/ReactFeatureFlags'; diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js index d6096791b674..617dd1ff87f3 100644 --- a/packages/react-reconciler/src/ReactCurrentFiber.js +++ b/packages/react-reconciler/src/ReactCurrentFiber.js @@ -17,7 +17,7 @@ import { Fragment, ContextProvider, ContextConsumer, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import describeComponentFrame from 'shared/describeComponentFrame'; import getComponentName from 'shared/getComponentName'; diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js index c08276945c2e..63dcf1af59a0 100644 --- a/packages/react-reconciler/src/ReactDebugFiberPerf.js +++ b/packages/react-reconciler/src/ReactDebugFiberPerf.js @@ -21,7 +21,7 @@ import { ContextConsumer, Mode, SuspenseComponent, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; type MeasurementPhase = | 'componentWillMount' diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index 4ff3aa45d27a..64e230a891d6 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -17,10 +17,10 @@ import type { ReactFundamentalComponent, ReactScope, } from 'shared/ReactTypes'; -import type {RootTag} from 'shared/ReactRootTags'; -import type {WorkTag} from 'shared/ReactWorkTags'; +import type {RootTag} from 'react-reconciler/src/ReactRootTags'; +import type {WorkTag} from './ReactWorkTags'; import type {TypeOfMode} from './ReactTypeOfMode'; -import type {SideEffectTag} from 'shared/ReactSideEffectTags'; +import type {SideEffectTag} from './ReactSideEffectTags'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import type {UpdateQueue} from './ReactUpdateQueue'; import type {ContextDependency} from './ReactFiberNewContext'; @@ -36,8 +36,8 @@ import { enableBlocksAPI, throwEarlyForMysteriousError, } from 'shared/ReactFeatureFlags'; -import {NoEffect, Placement} from 'shared/ReactSideEffectTags'; -import {ConcurrentRoot, BlockingRoot} from 'shared/ReactRootTags'; +import {NoEffect, Placement} from './ReactSideEffectTags'; +import {ConcurrentRoot, BlockingRoot} from 'react-reconciler/src/ReactRootTags'; import { IndeterminateComponent, ClassComponent, @@ -61,7 +61,7 @@ import { FundamentalComponent, ScopeComponent, Block, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import getComponentName from 'shared/getComponentName'; import {isDevToolsPresent} from './ReactFiberDevToolsHook'; diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 207429a3d7a8..ea595f5f538b 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -8,7 +8,7 @@ */ import type {ReactProviderType, ReactContext} from 'shared/ReactTypes'; -import type {BlockComponent} from 'react/src/block'; +import type {BlockComponent} from 'react/src/ReactBlock'; import type {Fiber} from './ReactFiber'; import type {FiberRoot} from './ReactFiberRoot'; import type {ExpirationTime} from './ReactFiberExpirationTime'; @@ -44,7 +44,7 @@ import { FundamentalComponent, ScopeComponent, Block, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import { NoEffect, PerformedWork, @@ -55,7 +55,7 @@ import { Update, Ref, Deletion, -} from 'shared/ReactSideEffectTags'; +} from './ReactSideEffectTags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; import { debugRenderPhaseSideEffectsForStrictMode, diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js index 6073f7aa2cb4..83eff60f9285 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.js +++ b/packages/react-reconciler/src/ReactFiberClassComponent.js @@ -12,7 +12,7 @@ import type {ExpirationTime} from './ReactFiberExpirationTime'; import type {UpdateQueue} from './ReactUpdateQueue'; import * as React from 'react'; -import {Update, Snapshot} from 'shared/ReactSideEffectTags'; +import {Update, Snapshot} from './ReactSideEffectTags'; import { debugRenderPhaseSideEffectsForStrictMode, disableLegacyContext, diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index 2ed7ac9c252d..7173571d1a10 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -56,7 +56,7 @@ import { FundamentalComponent, ScopeComponent, Block, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import { invokeGuardedCallback, hasCaughtError, @@ -69,7 +69,7 @@ import { Snapshot, Update, Passive, -} from 'shared/ReactSideEffectTags'; +} from './ReactSideEffectTags'; import getComponentName from 'shared/getComponentName'; import invariant from 'shared/invariant'; diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index 7c04efe58f02..5deef7f9eb65 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -53,7 +53,7 @@ import { FundamentalComponent, ScopeComponent, Block, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import {NoMode, BlockingMode} from './ReactTypeOfMode'; import { Ref, @@ -61,7 +61,7 @@ import { NoEffect, DidCapture, Deletion, -} from 'shared/ReactSideEffectTags'; +} from './ReactSideEffectTags'; import invariant from 'shared/invariant'; import { diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js index 27c1b1c3fd40..33ba72aeec10 100644 --- a/packages/react-reconciler/src/ReactFiberContext.js +++ b/packages/react-reconciler/src/ReactFiberContext.js @@ -12,7 +12,7 @@ import type {StackCursor} from './ReactFiberStack'; import {isFiberMounted} from 'react-reconciler/src/ReactFiberTreeReflection'; import {disableLegacyContext} from 'shared/ReactFeatureFlags'; -import {ClassComponent, HostRoot} from 'shared/ReactWorkTags'; +import {ClassComponent, HostRoot} from './ReactWorkTags'; import getComponentName from 'shared/getComponentName'; import invariant from 'shared/invariant'; import checkPropTypes from 'shared/checkPropTypes'; diff --git a/packages/react-reconciler/src/ReactFiberDeprecatedEvents.js b/packages/react-reconciler/src/ReactFiberDeprecatedEvents.js index a3048273de61..4cbd0b118fb4 100644 --- a/packages/react-reconciler/src/ReactFiberDeprecatedEvents.js +++ b/packages/react-reconciler/src/ReactFiberDeprecatedEvents.js @@ -24,7 +24,7 @@ import {NoWork} from './ReactFiberExpirationTime'; import {REACT_RESPONDER_TYPE} from 'shared/ReactSymbols'; import invariant from 'shared/invariant'; -import {HostComponent, HostRoot} from 'shared/ReactWorkTags'; +import {HostComponent, HostRoot} from './ReactWorkTags'; const emptyObject = {}; const isArray = Array.isArray; diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js index d75a34080273..764321609f90 100644 --- a/packages/react-reconciler/src/ReactFiberDevToolsHook.js +++ b/packages/react-reconciler/src/ReactFiberDevToolsHook.js @@ -16,7 +16,7 @@ import type {FiberRoot} from './ReactFiberRoot'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import type {ReactNodeList} from 'shared/ReactTypes'; -import {DidCapture} from 'shared/ReactSideEffectTags'; +import {DidCapture} from './ReactSideEffectTags'; declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: Object | void; diff --git a/packages/react-reconciler/src/ReactFiberExpirationTime.js b/packages/react-reconciler/src/ReactFiberExpirationTime.js index b27a75aeba6d..71bf7cfa1422 100644 --- a/packages/react-reconciler/src/ReactFiberExpirationTime.js +++ b/packages/react-reconciler/src/ReactFiberExpirationTime.js @@ -9,7 +9,7 @@ import type {ReactPriorityLevel} from './SchedulerWithReactIntegration'; -import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt'; +import {MAX_SIGNED_31_BIT_INT} from './MaxInts'; import { ImmediatePriority, diff --git a/packages/react-reconciler/src/ReactFiberHooks.js b/packages/react-reconciler/src/ReactFiberHooks.js index 9cc65ae0b563..8eefb9dc2f0a 100644 --- a/packages/react-reconciler/src/ReactFiberHooks.js +++ b/packages/react-reconciler/src/ReactFiberHooks.js @@ -36,7 +36,7 @@ import {createDeprecatedResponderListener} from './ReactFiberDeprecatedEvents'; import { Update as UpdateEffect, Passive as PassiveEffect, -} from 'shared/ReactSideEffectTags'; +} from './ReactSideEffectTags'; import { NoEffect as NoHookEffect, HasEffect as HookHasEffect, diff --git a/packages/shared/HostConfigWithNoHydration.js b/packages/react-reconciler/src/ReactFiberHostConfigWithNoHydration.js similarity index 100% rename from packages/shared/HostConfigWithNoHydration.js rename to packages/react-reconciler/src/ReactFiberHostConfigWithNoHydration.js diff --git a/packages/shared/HostConfigWithNoMutation.js b/packages/react-reconciler/src/ReactFiberHostConfigWithNoMutation.js similarity index 100% rename from packages/shared/HostConfigWithNoMutation.js rename to packages/react-reconciler/src/ReactFiberHostConfigWithNoMutation.js diff --git a/packages/shared/HostConfigWithNoPersistence.js b/packages/react-reconciler/src/ReactFiberHostConfigWithNoPersistence.js similarity index 100% rename from packages/shared/HostConfigWithNoPersistence.js rename to packages/react-reconciler/src/ReactFiberHostConfigWithNoPersistence.js diff --git a/packages/react-reconciler/src/ReactFiberHotReloading.js b/packages/react-reconciler/src/ReactFiberHotReloading.js index 7fc670813bfc..3bc1980d4f9c 100644 --- a/packages/react-reconciler/src/ReactFiberHotReloading.js +++ b/packages/react-reconciler/src/ReactFiberHotReloading.js @@ -30,7 +30,7 @@ import { HostRoot, MemoComponent, SimpleMemoComponent, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import { REACT_FORWARD_REF_TYPE, REACT_MEMO_TYPE, diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js index a48391d204a5..76add94ea6f6 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js @@ -23,8 +23,8 @@ import { HostText, HostRoot, SuspenseComponent, -} from 'shared/ReactWorkTags'; -import {Deletion, Placement, Hydrating} from 'shared/ReactSideEffectTags'; +} from './ReactWorkTags'; +import {Deletion, Placement, Hydrating} from './ReactSideEffectTags'; import invariant from 'shared/invariant'; import { diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js index 510c1eb674ad..ba0ffc34cb27 100644 --- a/packages/react-reconciler/src/ReactFiberNewContext.js +++ b/packages/react-reconciler/src/ReactFiberNewContext.js @@ -21,12 +21,12 @@ export type ContextDependency = { import {isPrimaryRenderer} from './ReactFiberHostConfig'; import {createCursor, push, pop} from './ReactFiberStack'; -import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt'; +import {MAX_SIGNED_31_BIT_INT} from './MaxInts'; import { ContextProvider, ClassComponent, DehydratedFragment, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import invariant from 'shared/invariant'; import is from 'shared/objectIs'; diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index 668ba370e35c..69a278566e5e 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -39,6 +39,7 @@ import { shouldSuspend as shouldSuspend_old, injectIntoDevTools as injectIntoDevTools_old, act as act_old, + createPortal as createPortal_old, } from './ReactFiberReconciler.old'; // TODO: Update these to point to the fork. @@ -67,6 +68,7 @@ import { shouldSuspend as shouldSuspend_new, injectIntoDevTools as injectIntoDevTools_new, act as act_new, + createPortal as createPortal_new, } from './ReactFiberReconciler.old'; export const createContainer = enableNewReconciler @@ -137,3 +139,6 @@ export const injectIntoDevTools = enableNewReconciler ? injectIntoDevTools_new : injectIntoDevTools_old; export const act = enableNewReconciler ? act_new : act_old; +export const createPortal = enableNewReconciler + ? createPortal_new + : createPortal_old; diff --git a/packages/react-reconciler/src/ReactFiberReconciler.old.js b/packages/react-reconciler/src/ReactFiberReconciler.old.js index 5ff2964fcea8..8ad745990197 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.old.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.old.js @@ -9,14 +9,14 @@ import type {Fiber} from './ReactFiber'; import type {FiberRoot} from './ReactFiberRoot'; -import type {RootTag} from 'shared/ReactRootTags'; +import type {RootTag} from 'react-reconciler/src/ReactRootTags'; import type { Instance, TextInstance, Container, PublicInstance, } from './ReactFiberHostConfig'; -import {FundamentalComponent} from 'shared/ReactWorkTags'; +import {FundamentalComponent} from './ReactWorkTags'; import type {ReactNodeList} from 'shared/ReactTypes'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import type { @@ -34,7 +34,7 @@ import { ClassComponent, HostRoot, SuspenseComponent, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import getComponentName from 'shared/getComponentName'; import invariant from 'shared/invariant'; import ReactSharedInternals from 'shared/ReactSharedInternals'; @@ -92,6 +92,8 @@ import enqueueTask from 'shared/enqueueTask'; import * as Scheduler from 'scheduler'; // end isTestEnvironment imports +export {createPortal} from './ReactPortal'; + type OpaqueRoot = FiberRoot; // 0 is PROD, 1 is DEV. diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js index 2201bbb998f9..cd99e1d7bf5f 100644 --- a/packages/react-reconciler/src/ReactFiberRoot.js +++ b/packages/react-reconciler/src/ReactFiberRoot.js @@ -9,7 +9,7 @@ import type {Fiber} from './ReactFiber'; import type {ExpirationTime} from './ReactFiberExpirationTime'; -import type {RootTag} from 'shared/ReactRootTags'; +import type {RootTag} from 'react-reconciler/src/ReactRootTags'; import type {TimeoutHandle, NoTimeout} from './ReactFiberHostConfig'; import type {Thenable} from './ReactFiberWorkLoop'; import type {Interaction} from 'scheduler/src/Tracing'; diff --git a/packages/react-reconciler/src/ReactFiberScope.js b/packages/react-reconciler/src/ReactFiberScope.js index eb0959f8ddc1..2b848d136659 100644 --- a/packages/react-reconciler/src/ReactFiberScope.js +++ b/packages/react-reconciler/src/ReactFiberScope.js @@ -23,7 +23,7 @@ import { SuspenseComponent, ScopeComponent, ContextProvider, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import {enableScopeAPI} from 'shared/ReactFeatureFlags'; function isFiberSuspenseAndTimedOut(fiber: Fiber): boolean { diff --git a/packages/react-reconciler/src/ReactFiberSuspenseComponent.js b/packages/react-reconciler/src/ReactFiberSuspenseComponent.js index f1c11d2f86a9..1c5f90735af5 100644 --- a/packages/react-reconciler/src/ReactFiberSuspenseComponent.js +++ b/packages/react-reconciler/src/ReactFiberSuspenseComponent.js @@ -10,8 +10,8 @@ import type {Fiber} from './ReactFiber'; import type {SuspenseInstance} from './ReactFiberHostConfig'; import type {ExpirationTime} from './ReactFiberExpirationTime'; -import {SuspenseComponent, SuspenseListComponent} from 'shared/ReactWorkTags'; -import {NoEffect, DidCapture} from 'shared/ReactSideEffectTags'; +import {SuspenseComponent, SuspenseListComponent} from './ReactWorkTags'; +import {NoEffect, DidCapture} from './ReactSideEffectTags'; import { isSuspenseInstancePending, isSuspenseInstanceFallback, diff --git a/packages/react-reconciler/src/ReactFiberThrow.js b/packages/react-reconciler/src/ReactFiberThrow.js index df2154db9d5c..7ed959f23504 100644 --- a/packages/react-reconciler/src/ReactFiberThrow.js +++ b/packages/react-reconciler/src/ReactFiberThrow.js @@ -21,14 +21,14 @@ import { HostRoot, SuspenseComponent, IncompleteClassComponent, -} from 'shared/ReactWorkTags'; +} from './ReactWorkTags'; import { DidCapture, Incomplete, NoEffect, ShouldCapture, LifecycleEffectMask, -} from 'shared/ReactSideEffectTags'; +} from './ReactSideEffectTags'; import {NoMode, BlockingMode} from './ReactTypeOfMode'; import {shouldCaptureSuspense} from './ReactFiberSuspenseComponent'; diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js index 68a6c83d577f..ea2fbfad4de4 100644 --- a/packages/react-reconciler/src/ReactFiberTreeReflection.js +++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js @@ -24,8 +24,8 @@ import { HostText, FundamentalComponent, SuspenseComponent, -} from 'shared/ReactWorkTags'; -import {NoEffect, Placement, Hydrating} from 'shared/ReactSideEffectTags'; +} from './ReactWorkTags'; +import {NoEffect, Placement, Hydrating} from './ReactSideEffectTags'; import {enableFundamentalAPI} from 'shared/ReactFeatureFlags'; const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner; diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js index 2bd46b98316d..37bb66482415 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js @@ -20,8 +20,8 @@ import { ContextProvider, SuspenseComponent, SuspenseListComponent, -} from 'shared/ReactWorkTags'; -import {DidCapture, NoEffect, ShouldCapture} from 'shared/ReactSideEffectTags'; +} from './ReactWorkTags'; +import {DidCapture, NoEffect, ShouldCapture} from './ReactSideEffectTags'; import {enableSuspenseServerRenderer} from 'shared/ReactFeatureFlags'; import {popHostContainer, popHostContext} from './ReactFiberHostContext'; diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.js b/packages/react-reconciler/src/ReactFiberWorkLoop.js index c7a867864a16..552ea737f5ca 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.js @@ -90,8 +90,8 @@ import { MemoComponent, SimpleMemoComponent, Block, -} from 'shared/ReactWorkTags'; -import {LegacyRoot} from 'shared/ReactRootTags'; +} from './ReactWorkTags'; +import {LegacyRoot} from 'react-reconciler/src/ReactRootTags'; import { NoEffect, PerformedWork, @@ -108,7 +108,7 @@ import { HostEffectMask, Hydrating, HydratingAndUpdate, -} from 'shared/ReactSideEffectTags'; +} from './ReactSideEffectTags'; import { NoWork, Sync, diff --git a/packages/shared/ReactPortal.js b/packages/react-reconciler/src/ReactPortal.js similarity index 100% rename from packages/shared/ReactPortal.js rename to packages/react-reconciler/src/ReactPortal.js diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js index d876b4f07e41..25beb5621a34 100644 --- a/packages/react-reconciler/src/ReactProfilerTimer.js +++ b/packages/react-reconciler/src/ReactProfilerTimer.js @@ -13,7 +13,7 @@ import { enableProfilerTimer, enableProfilerCommitHooks, } from 'shared/ReactFeatureFlags'; -import {Profiler} from 'shared/ReactWorkTags'; +import {Profiler} from './ReactWorkTags'; // Intentionally not named imports because Rollup would use dynamic dispatch for // CommonJS interop named imports. diff --git a/packages/shared/ReactRootTags.js b/packages/react-reconciler/src/ReactRootTags.js similarity index 100% rename from packages/shared/ReactRootTags.js rename to packages/react-reconciler/src/ReactRootTags.js diff --git a/packages/shared/ReactSideEffectTags.js b/packages/react-reconciler/src/ReactSideEffectTags.js similarity index 100% rename from packages/shared/ReactSideEffectTags.js rename to packages/react-reconciler/src/ReactSideEffectTags.js diff --git a/packages/shared/ReactTreeTraversal.js b/packages/react-reconciler/src/ReactTreeTraversal.js similarity index 100% rename from packages/shared/ReactTreeTraversal.js rename to packages/react-reconciler/src/ReactTreeTraversal.js diff --git a/packages/react-reconciler/src/ReactUpdateQueue.js b/packages/react-reconciler/src/ReactUpdateQueue.js index 7aa664fb5075..52a1b441a8e5 100644 --- a/packages/react-reconciler/src/ReactUpdateQueue.js +++ b/packages/react-reconciler/src/ReactUpdateQueue.js @@ -94,7 +94,7 @@ import { enterDisallowedContextReadInDEV, exitDisallowedContextReadInDEV, } from './ReactFiberNewContext'; -import {Callback, ShouldCapture, DidCapture} from 'shared/ReactSideEffectTags'; +import {Callback, ShouldCapture, DidCapture} from './ReactSideEffectTags'; import {debugRenderPhaseSideEffectsForStrictMode} from 'shared/ReactFeatureFlags'; diff --git a/packages/shared/ReactWorkTags.js b/packages/react-reconciler/src/ReactWorkTags.js similarity index 100% rename from packages/shared/ReactWorkTags.js rename to packages/react-reconciler/src/ReactWorkTags.js diff --git a/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js index 6a724025abdc..ddf68091a537 100644 --- a/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js +++ b/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js @@ -19,7 +19,7 @@ describe('ReactFiberHostContext', () => { jest.resetModules(); React = require('react'); ReactFiberReconciler = require('react-reconciler'); - ConcurrentRoot = require('shared/ReactRootTags'); + ConcurrentRoot = require('react-reconciler/src/ReactRootTags'); }); it('works with null host context', () => { diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactTestHostConfig.js index 2cf8de7acc30..315fc8067141 100644 --- a/packages/react-test-renderer/src/ReactTestHostConfig.js +++ b/packages/react-test-renderer/src/ReactTestHostConfig.js @@ -49,8 +49,8 @@ export type ReactListenerEvent = Object; export type ReactListenerMap = Object; export type ReactListener = Object; -export * from 'shared/HostConfigWithNoPersistence'; -export * from 'shared/HostConfigWithNoHydration'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence'; +export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration'; const EVENT_COMPONENT_CONTEXT = {}; const NO_CONTEXT = {}; diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index 3bb1001b8443..a4572d9930b3 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -40,13 +40,13 @@ import { Block, IncompleteClassComponent, ScopeComponent, -} from 'shared/ReactWorkTags'; +} from 'react-reconciler/src/ReactWorkTags'; import invariant from 'shared/invariant'; import getComponentName from 'shared/getComponentName'; import ReactVersion from 'shared/ReactVersion'; import {getPublicInstance} from './ReactTestHostConfig'; -import {ConcurrentRoot, LegacyRoot} from 'shared/ReactRootTags'; +import {ConcurrentRoot, LegacyRoot} from 'react-reconciler/src/ReactRootTags'; type TestRendererOptions = { createNodeMock: (element: React$Element) => any, diff --git a/packages/shared/hasBadMapPolyfill.js b/packages/react/src/BadMapPolyfill.js similarity index 100% rename from packages/shared/hasBadMapPolyfill.js rename to packages/react/src/BadMapPolyfill.js diff --git a/packages/react/src/React.js b/packages/react/src/React.js index dd369e71c063..8484ef5886e9 100644 --- a/packages/react/src/React.js +++ b/packages/react/src/React.js @@ -27,9 +27,9 @@ import { } from './ReactElement'; import {createContext} from './ReactContext'; import {lazy} from './ReactLazy'; -import forwardRef from './forwardRef'; -import memo from './memo'; -import block from './block'; +import {forwardRef} from './ReactForwardRef'; +import {memo} from './ReactMemo'; +import {block} from './ReactBlock'; import { useCallback, useContext, @@ -52,11 +52,11 @@ import { createFactoryWithValidation, cloneElementWithValidation, } from './ReactElementValidator'; -import createMutableSource from './createMutableSource'; +import {createMutableSource} from './ReactMutableSource'; import ReactSharedInternals from './ReactSharedInternals'; -import createFundamental from 'shared/createFundamentalComponent'; -import createResponder from 'shared/createEventResponder'; -import createScope from 'shared/createScope'; +import {createFundamental} from './ReactFundamental'; +import {createEventResponder} from './ReactEventResponder'; +import {createScope} from './ReactScope'; // TODO: Move this branching into the other module instead and just re-export. const createElement = __DEV__ ? createElementWithValidation : createElementProd; @@ -112,7 +112,7 @@ export { block, // enableDeprecatedFlareAPI useResponder as DEPRECATED_useResponder, - createResponder as DEPRECATED_createResponder, + createEventResponder as DEPRECATED_createResponder, // enableFundamentalAPI createFundamental as unstable_createFundamental, // enableScopeAPI diff --git a/packages/react/src/block.js b/packages/react/src/ReactBlock.js similarity index 98% rename from packages/react/src/block.js rename to packages/react/src/ReactBlock.js index a16dc1e68c41..2b6c93b110fa 100644 --- a/packages/react/src/block.js +++ b/packages/react/src/ReactBlock.js @@ -68,7 +68,7 @@ opaque type Block: React$AbstractComponent< null, > = React$AbstractComponent; -export default function block, Props, Data>( +export function block, Props, Data>( query: BlockQueryFunction, render: BlockRenderFunction, ): (...args: Args) => Block { diff --git a/packages/shared/createEventResponder.js b/packages/react/src/ReactEventResponder.js similarity index 92% rename from packages/shared/createEventResponder.js rename to packages/react/src/ReactEventResponder.js index c18b1595c496..8444d0b82dce 100644 --- a/packages/shared/createEventResponder.js +++ b/packages/react/src/ReactEventResponder.js @@ -8,9 +8,9 @@ import type {ReactEventResponder} from 'shared/ReactTypes'; import {REACT_RESPONDER_TYPE} from 'shared/ReactSymbols'; -import {hasBadMapPolyfill} from './hasBadMapPolyfill'; +import {hasBadMapPolyfill} from './BadMapPolyfill'; -export default function createEventResponder( +export function createEventResponder( displayName: string, responderConfig: Object, ): ReactEventResponder { diff --git a/packages/react/src/forwardRef.js b/packages/react/src/ReactForwardRef.js similarity index 95% rename from packages/react/src/forwardRef.js rename to packages/react/src/ReactForwardRef.js index 64bc4698dd7c..eb93dba2be3c 100644 --- a/packages/react/src/forwardRef.js +++ b/packages/react/src/ReactForwardRef.js @@ -7,7 +7,7 @@ import {REACT_FORWARD_REF_TYPE, REACT_MEMO_TYPE} from 'shared/ReactSymbols'; -export default function forwardRef( +export function forwardRef( render: (props: Props, ref: React$Ref) => React$Node, ) { if (__DEV__) { diff --git a/packages/shared/createFundamentalComponent.js b/packages/react/src/ReactFundamental.js similarity index 88% rename from packages/shared/createFundamentalComponent.js rename to packages/react/src/ReactFundamental.js index 88fa369922d8..7842cbf856c5 100644 --- a/packages/shared/createFundamentalComponent.js +++ b/packages/react/src/ReactFundamental.js @@ -11,9 +11,9 @@ import type { ReactFundamentalComponent, } from 'shared/ReactTypes'; import {REACT_FUNDAMENTAL_TYPE} from 'shared/ReactSymbols'; -import {hasBadMapPolyfill} from './hasBadMapPolyfill'; +import {hasBadMapPolyfill} from './BadMapPolyfill'; -export default function createFundamentalComponent( +export function createFundamental( impl: ReactFundamentalImpl, ): ReactFundamentalComponent { // We use responder as a Map key later on. When we have a bad diff --git a/packages/react/src/memo.js b/packages/react/src/ReactMemo.js similarity index 95% rename from packages/react/src/memo.js rename to packages/react/src/ReactMemo.js index e52270185e5a..3b3010db3fd9 100644 --- a/packages/react/src/memo.js +++ b/packages/react/src/ReactMemo.js @@ -9,7 +9,7 @@ import {REACT_MEMO_TYPE} from 'shared/ReactSymbols'; import isValidElementType from 'shared/isValidElementType'; -export default function memo( +export function memo( type: React$ElementType, compare?: (oldProps: Props, newProps: Props) => boolean, ) { diff --git a/packages/react/src/createMutableSource.js b/packages/react/src/ReactMutableSource.js similarity index 90% rename from packages/react/src/createMutableSource.js rename to packages/react/src/ReactMutableSource.js index 915c5c72408a..684594829db3 100644 --- a/packages/react/src/createMutableSource.js +++ b/packages/react/src/ReactMutableSource.js @@ -9,7 +9,7 @@ import type {MutableSource, MutableSourceGetVersionFn} from 'shared/ReactTypes'; -export default function createMutableSource>( +export function createMutableSource>( source: Source, getVersion: MutableSourceGetVersionFn, ): MutableSource { diff --git a/packages/shared/createScope.js b/packages/react/src/ReactScope.js similarity index 89% rename from packages/shared/createScope.js rename to packages/react/src/ReactScope.js index a5d31dc7aeab..d2f5c13ccdd8 100644 --- a/packages/shared/createScope.js +++ b/packages/react/src/ReactScope.js @@ -9,7 +9,7 @@ import type {ReactScope} from 'shared/ReactTypes'; import {REACT_SCOPE_TYPE} from 'shared/ReactSymbols'; -export default function createScope(): ReactScope { +export function createScope(): ReactScope { const scopeComponent = { $$typeof: REACT_SCOPE_TYPE, }; diff --git a/packages/shared/ReactLazyComponent.js b/packages/shared/ReactLazyComponent.js index 838cff5a8815..8ed9a35b4ea6 100644 --- a/packages/shared/ReactLazyComponent.js +++ b/packages/shared/ReactLazyComponent.js @@ -19,7 +19,7 @@ import type { ResolvedBlockComponent, RejectedBlockComponent, BlockComponent, -} from 'react/src/block'; +} from 'react/src/ReactBlock'; import { Uninitialized, diff --git a/packages/shared/endsWith.js b/packages/shared/endsWith.js deleted file mode 100644 index 115e75a9746f..000000000000 --- a/packages/shared/endsWith.js +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its 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 default function endsWith(subject: string, search: string): boolean { - const length = subject.length; - return subject.substring(length - search.length, length) === search; -} diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js index 051ecf90b7b9..e347acbaea83 100644 --- a/scripts/shared/inlinedHostConfigs.js +++ b/scripts/shared/inlinedHostConfigs.js @@ -25,6 +25,7 @@ module.exports = [ 'react-flight-dom-webpack/server', 'react-flight-dom-webpack/server.node', 'react-flight-dom-webpack/src/ReactFlightDOMServerNode.js', // react-flight-dom-webpack/server.browser + 'react-interactions', ], isFlowTyped: true, isServerSupported: true,