diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 2cf9791f8a2..bed780c2b10 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -9,8 +9,8 @@ import type {ReactElement} from 'shared/ReactElementType'; import type {ReactPortal} from 'shared/ReactTypes'; -import type {Fiber} from 'react-reconciler/src/ReactFiber'; -import type {ExpirationTime} from 'react-reconciler/src/ReactFiberExpirationTime'; +import type {Fiber} from './ReactFiber'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; import getComponentName from 'shared/getComponentName'; import {Placement, Deletion} from 'shared/ReactSideEffectTags'; diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js index 661c46fffe8..05ecd6bdd53 100644 --- a/packages/react-reconciler/src/ReactCurrentFiber.js +++ b/packages/react-reconciler/src/ReactCurrentFiber.js @@ -7,6 +7,8 @@ * @flow */ +import type {Fiber} from './ReactFiber'; + import ReactSharedInternals from 'shared/ReactSharedInternals'; import { IndeterminateComponent, @@ -21,8 +23,6 @@ import getComponentName from 'shared/getComponentName'; const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame; -import type {Fiber} from './ReactFiber'; - type LifeCyclePhase = 'render' | 'getChildContext'; function describeFiber(fiber: Fiber): string { diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 5358a693100..f3c0730dc8a 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 {Fiber} from 'react-reconciler/src/ReactFiber'; +import type {Fiber} from './ReactFiber'; import type {FiberRoot} from './ReactFiberRoot'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import type {SuspenseState} from './ReactFiberSuspenseComponent'; diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index 34be16bdb25..c1726536c7a 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -53,12 +53,6 @@ import getComponentName from 'shared/getComponentName'; import invariant from 'shared/invariant'; import warningWithoutStack from 'shared/warningWithoutStack'; -import { - scheduleTimeout, - cancelTimeout, - noTimeout, -} from './ReactFiberHostConfig'; - import ReactFiberInstrumentation from './ReactFiberInstrumentation'; import * as ReactCurrentFiber from './ReactCurrentFiber'; import { @@ -67,6 +61,9 @@ import { cancelDeferredCallback, prepareForCommit, resetAfterCommit, + scheduleTimeout, + cancelTimeout, + noTimeout, } from './ReactFiberHostConfig'; import { markPendingPriorityLevel, diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js index a5ace9487fc..00161bf3510 100644 --- a/packages/react-reconciler/src/ReactFiberTreeReflection.js +++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js @@ -7,7 +7,7 @@ * @flow */ -import type {Fiber} from 'react-reconciler/src/ReactFiber'; +import type {Fiber} from './ReactFiber'; import invariant from 'shared/invariant'; import warningWithoutStack from 'shared/warningWithoutStack'; diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js index 40c814a37d7..2903a81a906 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js @@ -61,11 +61,12 @@ import { isAlreadyFailedLegacyErrorBoundary, retrySuspendedRoot, } from './ReactFiberScheduler'; -import {NoWork, Sync} from './ReactFiberExpirationTime'; import invariant from 'shared/invariant'; import maxSigned31BitInt from './maxSigned31BitInt'; import { + NoWork, + Sync, expirationTimeToMs, LOW_PRIORITY_EXPIRATION, } from './ReactFiberExpirationTime';