From dc630d3374e8b3d01cdf9e12a81eab9322ac6832 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Thu, 9 Apr 2020 12:51:02 -0700 Subject: [PATCH] Fork ReactFiberExpirationTime I had thought I wouldn't fork this one because the new "lanes" module will be pretty different, but I need it to make some incremental changes. --- .../src/ReactChildFiber.new.js | 2 +- .../src/ReactChildFiber.old.js | 2 +- .../react-reconciler/src/ReactFiber.new.js | 4 +- .../react-reconciler/src/ReactFiber.old.js | 4 +- .../src/ReactFiberBeginWork.new.js | 4 +- .../src/ReactFiberBeginWork.old.js | 4 +- .../src/ReactFiberClassComponent.new.js | 4 +- .../src/ReactFiberClassComponent.old.js | 4 +- .../src/ReactFiberCommitWork.new.js | 2 +- .../src/ReactFiberCommitWork.old.js | 2 +- .../src/ReactFiberCompleteWork.new.js | 4 +- .../src/ReactFiberCompleteWork.old.js | 4 +- .../src/ReactFiberDeprecatedEvents.new.js | 2 +- .../src/ReactFiberDeprecatedEvents.old.js | 2 +- .../src/ReactFiberDevToolsHook.new.js | 4 +- .../src/ReactFiberDevToolsHook.old.js | 4 +- .../src/ReactFiberExpirationTime.new.js | 147 ++++++++++++++++++ ...ime.js => ReactFiberExpirationTime.old.js} | 0 .../src/ReactFiberHooks.new.js | 4 +- .../src/ReactFiberHooks.old.js | 4 +- .../src/ReactFiberHotReloading.new.js | 2 +- .../src/ReactFiberHotReloading.old.js | 2 +- .../src/ReactFiberHydrationContext.new.js | 2 +- .../src/ReactFiberHydrationContext.old.js | 2 +- .../src/ReactFiberNewContext.new.js | 4 +- .../src/ReactFiberNewContext.old.js | 4 +- .../src/ReactFiberReconciler.new.js | 4 +- .../src/ReactFiberReconciler.old.js | 4 +- .../src/ReactFiberRoot.new.js | 4 +- .../src/ReactFiberRoot.old.js | 4 +- .../src/ReactFiberSuspenseComponent.new.js | 2 +- .../src/ReactFiberSuspenseComponent.old.js | 2 +- .../src/ReactFiberThrow.new.js | 4 +- .../src/ReactFiberThrow.old.js | 4 +- .../src/ReactFiberUnwindWork.new.js | 2 +- .../src/ReactFiberUnwindWork.old.js | 2 +- .../src/ReactFiberWorkLoop.new.js | 4 +- .../src/ReactFiberWorkLoop.old.js | 4 +- .../src/ReactInternalTypes.js | 2 +- .../src/ReactMutableSource.new.js | 4 +- .../src/ReactMutableSource.old.js | 4 +- .../src/ReactUpdateQueue.new.js | 4 +- .../src/ReactUpdateQueue.old.js | 4 +- 43 files changed, 214 insertions(+), 67 deletions(-) create mode 100644 packages/react-reconciler/src/ReactFiberExpirationTime.new.js rename packages/react-reconciler/src/{ReactFiberExpirationTime.js => ReactFiberExpirationTime.old.js} (100%) diff --git a/packages/react-reconciler/src/ReactChildFiber.new.js b/packages/react-reconciler/src/ReactChildFiber.new.js index 3034c4c69e92..23d3b80155bf 100644 --- a/packages/react-reconciler/src/ReactChildFiber.new.js +++ b/packages/react-reconciler/src/ReactChildFiber.new.js @@ -12,7 +12,7 @@ import type {ReactPortal} from 'shared/ReactTypes'; import type {BlockComponent} from 'react/src/ReactBlock'; import type {LazyComponent} from 'react/src/ReactLazy'; import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import getComponentName from 'shared/getComponentName'; import {Placement, Deletion} from './ReactSideEffectTags'; diff --git a/packages/react-reconciler/src/ReactChildFiber.old.js b/packages/react-reconciler/src/ReactChildFiber.old.js index a0bd2071bd5a..1bfb9f28209c 100644 --- a/packages/react-reconciler/src/ReactChildFiber.old.js +++ b/packages/react-reconciler/src/ReactChildFiber.old.js @@ -12,7 +12,7 @@ import type {ReactPortal} from 'shared/ReactTypes'; import type {BlockComponent} from 'react/src/ReactBlock'; import type {LazyComponent} from 'react/src/ReactLazy'; import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import getComponentName from 'shared/getComponentName'; import {Placement, Deletion} from './ReactSideEffectTags'; diff --git a/packages/react-reconciler/src/ReactFiber.new.js b/packages/react-reconciler/src/ReactFiber.new.js index 97c8a7a87bb2..52afd2380cfc 100644 --- a/packages/react-reconciler/src/ReactFiber.new.js +++ b/packages/react-reconciler/src/ReactFiber.new.js @@ -18,7 +18,7 @@ import type {Fiber} from './ReactInternalTypes'; import type {RootTag} from './ReactRootTags'; import type {WorkTag} from './ReactWorkTags'; import type {TypeOfMode} from './ReactTypeOfMode'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {SuspenseInstance} from './ReactFiberHostConfig'; import invariant from 'shared/invariant'; @@ -63,7 +63,7 @@ import { resolveFunctionForHotReloading, resolveForwardRefForHotReloading, } from './ReactFiberHotReloading.new'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.new'; import { NoMode, ConcurrentMode, diff --git a/packages/react-reconciler/src/ReactFiber.old.js b/packages/react-reconciler/src/ReactFiber.old.js index 388d45006a87..05dc3db46f9d 100644 --- a/packages/react-reconciler/src/ReactFiber.old.js +++ b/packages/react-reconciler/src/ReactFiber.old.js @@ -18,7 +18,7 @@ import type {Fiber} from './ReactInternalTypes'; import type {RootTag} from './ReactRootTags'; import type {WorkTag} from './ReactWorkTags'; import type {TypeOfMode} from './ReactTypeOfMode'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {SuspenseInstance} from './ReactFiberHostConfig'; import invariant from 'shared/invariant'; @@ -63,7 +63,7 @@ import { resolveFunctionForHotReloading, resolveForwardRefForHotReloading, } from './ReactFiberHotReloading.old'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.old'; import { NoMode, ConcurrentMode, diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.new.js b/packages/react-reconciler/src/ReactFiberBeginWork.new.js index 513599cdc57a..3225441e4d54 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.new.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.new.js @@ -12,7 +12,7 @@ import type {BlockComponent} from 'react/src/ReactBlock'; import type {LazyComponent as LazyComponentType} from 'react/src/ReactLazy'; import type {Fiber} from './ReactInternalTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type { SuspenseState, SuspenseListRenderState, @@ -100,7 +100,7 @@ import { Never, Sync, computeAsyncExpiration, -} from './ReactFiberExpirationTime'; +} from './ReactFiberExpirationTime.new'; import { ConcurrentMode, NoMode, diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.old.js b/packages/react-reconciler/src/ReactFiberBeginWork.old.js index 6c63c45d4f76..51a334d51956 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.old.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.old.js @@ -12,7 +12,7 @@ import type {BlockComponent} from 'react/src/ReactBlock'; import type {LazyComponent as LazyComponentType} from 'react/src/ReactLazy'; import type {Fiber} from './ReactInternalTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type { SuspenseState, SuspenseListRenderState, @@ -100,7 +100,7 @@ import { Never, Sync, computeAsyncExpiration, -} from './ReactFiberExpirationTime'; +} from './ReactFiberExpirationTime.old'; import { ConcurrentMode, NoMode, diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.new.js b/packages/react-reconciler/src/ReactFiberClassComponent.new.js index 461fd94d5e9d..89dda1d0764c 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.new.js +++ b/packages/react-reconciler/src/ReactFiberClassComponent.new.js @@ -8,7 +8,7 @@ */ import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {UpdateQueue} from './ReactUpdateQueue.new'; import * as React from 'react'; @@ -40,7 +40,7 @@ import { initializeUpdateQueue, cloneUpdateQueue, } from './ReactUpdateQueue.new'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.new'; import { cacheContext, getMaskedContext, diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.old.js b/packages/react-reconciler/src/ReactFiberClassComponent.old.js index 1e0f59108ab5..52c40ac7c06f 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.old.js +++ b/packages/react-reconciler/src/ReactFiberClassComponent.old.js @@ -8,7 +8,7 @@ */ import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {UpdateQueue} from './ReactUpdateQueue.old'; import * as React from 'react'; @@ -40,7 +40,7 @@ import { initializeUpdateQueue, cloneUpdateQueue, } from './ReactUpdateQueue.old'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.old'; import { cacheContext, getMaskedContext, diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js index 2901e8ea35b4..a93574c26a54 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.new.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.new.js @@ -17,7 +17,7 @@ import type { } from './ReactFiberHostConfig'; import type {Fiber} from './ReactInternalTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {SuspenseState} from './ReactFiberSuspenseComponent.new'; import type {UpdateQueue} from './ReactUpdateQueue.new'; import type {FunctionComponentUpdateQueue} from './ReactFiberHooks.new'; diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js index 6600cc47990a..4482ee781471 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.old.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.old.js @@ -17,7 +17,7 @@ import type { } from './ReactFiberHostConfig'; import type {Fiber} from './ReactInternalTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {SuspenseState} from './ReactFiberSuspenseComponent.old'; import type {UpdateQueue} from './ReactUpdateQueue.old'; import type {FunctionComponentUpdateQueue} from './ReactFiberHooks.old'; diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.new.js b/packages/react-reconciler/src/ReactFiberCompleteWork.new.js index b4ef64b2d9ae..d364336ec8db 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.new.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.new.js @@ -8,7 +8,7 @@ */ import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type { ReactFundamentalComponentInstance, ReactScopeInstance, @@ -129,7 +129,7 @@ import { renderHasNotSuspendedYet, } from './ReactFiberWorkLoop.new'; import {createFundamentalStateInstance} from './ReactFiberFundamental.new'; -import {Never} from './ReactFiberExpirationTime'; +import {Never} from './ReactFiberExpirationTime.new'; import {resetChildFibers} from './ReactChildFiber.new'; import {updateDeprecatedEventListeners} from './ReactFiberDeprecatedEvents.new'; import {createScopeMethods} from './ReactFiberScope.new'; diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.old.js b/packages/react-reconciler/src/ReactFiberCompleteWork.old.js index 92b9363d0f76..efe0ef63ff01 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.old.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.old.js @@ -8,7 +8,7 @@ */ import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type { ReactFundamentalComponentInstance, ReactScopeInstance, @@ -129,7 +129,7 @@ import { renderHasNotSuspendedYet, } from './ReactFiberWorkLoop.old'; import {createFundamentalStateInstance} from './ReactFiberFundamental.old'; -import {Never} from './ReactFiberExpirationTime'; +import {Never} from './ReactFiberExpirationTime.old'; import {resetChildFibers} from './ReactChildFiber.old'; import {updateDeprecatedEventListeners} from './ReactFiberDeprecatedEvents.old'; import {createScopeMethods} from './ReactFiberScope.old'; diff --git a/packages/react-reconciler/src/ReactFiberDeprecatedEvents.new.js b/packages/react-reconciler/src/ReactFiberDeprecatedEvents.new.js index 8f82f18cb9a5..971155356365 100644 --- a/packages/react-reconciler/src/ReactFiberDeprecatedEvents.new.js +++ b/packages/react-reconciler/src/ReactFiberDeprecatedEvents.new.js @@ -19,7 +19,7 @@ import { DEPRECATED_mountResponderInstance, DEPRECATED_unmountResponderInstance, } from './ReactFiberHostConfig'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.new'; import {REACT_RESPONDER_TYPE} from 'shared/ReactSymbols'; diff --git a/packages/react-reconciler/src/ReactFiberDeprecatedEvents.old.js b/packages/react-reconciler/src/ReactFiberDeprecatedEvents.old.js index 8f82f18cb9a5..b0eb5ef0abad 100644 --- a/packages/react-reconciler/src/ReactFiberDeprecatedEvents.old.js +++ b/packages/react-reconciler/src/ReactFiberDeprecatedEvents.old.js @@ -19,7 +19,7 @@ import { DEPRECATED_mountResponderInstance, DEPRECATED_unmountResponderInstance, } from './ReactFiberHostConfig'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.old'; import {REACT_RESPONDER_TYPE} from 'shared/ReactSymbols'; diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.new.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.new.js index e1623378b357..283982537949 100644 --- a/packages/react-reconciler/src/ReactFiberDevToolsHook.new.js +++ b/packages/react-reconciler/src/ReactFiberDevToolsHook.new.js @@ -9,11 +9,11 @@ import {enableProfilerTimer} from 'shared/ReactFeatureFlags'; import {getCurrentTime} from './ReactFiberWorkLoop.new'; -import {inferPriorityFromExpirationTime} from './ReactFiberExpirationTime'; +import {inferPriorityFromExpirationTime} from './ReactFiberExpirationTime.new'; import type {Fiber} from './ReactInternalTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {ReactNodeList} from 'shared/ReactTypes'; import {DidCapture} from './ReactSideEffectTags'; diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.old.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.old.js index 038af013bae9..aad3c1cc51c5 100644 --- a/packages/react-reconciler/src/ReactFiberDevToolsHook.old.js +++ b/packages/react-reconciler/src/ReactFiberDevToolsHook.old.js @@ -9,11 +9,11 @@ import {enableProfilerTimer} from 'shared/ReactFeatureFlags'; import {getCurrentTime} from './ReactFiberWorkLoop.old'; -import {inferPriorityFromExpirationTime} from './ReactFiberExpirationTime'; +import {inferPriorityFromExpirationTime} from './ReactFiberExpirationTime.old'; import type {Fiber} from './ReactInternalTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {ReactNodeList} from 'shared/ReactTypes'; import {DidCapture} from './ReactSideEffectTags'; diff --git a/packages/react-reconciler/src/ReactFiberExpirationTime.new.js b/packages/react-reconciler/src/ReactFiberExpirationTime.new.js new file mode 100644 index 000000000000..d4ef2f8264ea --- /dev/null +++ b/packages/react-reconciler/src/ReactFiberExpirationTime.new.js @@ -0,0 +1,147 @@ +/** + * 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 + */ + +import type {ReactPriorityLevel} from './ReactInternalTypes'; + +import {MAX_SIGNED_31_BIT_INT} from './MaxInts'; + +import { + ImmediatePriority, + UserBlockingPriority, + NormalPriority, + IdlePriority, +} from './SchedulerWithReactIntegration.new'; + +export type ExpirationTime = number; + +export const NoWork = 0; +// TODO: Think of a better name for Never. The key difference with Idle is that +// Never work can be committed in an inconsistent state without tearing the UI. +// The main example is offscreen content, like a hidden subtree. So one possible +// name is Offscreen. However, it also includes dehydrated Suspense boundaries, +// which are inconsistent in the sense that they haven't finished yet, but +// aren't visibly inconsistent because the server rendered HTML matches what the +// hydrated tree would look like. +export const Never = 1; +// Idle is slightly higher priority than Never. It must completely finish in +// order to be consistent. +export const Idle = 2; +// Continuous Hydration is slightly higher than Idle and is used to increase +// priority of hover targets. +export const ContinuousHydration = 3; +export const Sync = MAX_SIGNED_31_BIT_INT; +export const Batched = Sync - 1; + +const UNIT_SIZE = 10; +const MAGIC_NUMBER_OFFSET = Batched - 1; + +// 1 unit of expiration time represents 10ms. +export function msToExpirationTime(ms: number): ExpirationTime { + // Always subtract from the offset so that we don't clash with the magic number for NoWork. + return MAGIC_NUMBER_OFFSET - ((ms / UNIT_SIZE) | 0); +} + +export function expirationTimeToMs(expirationTime: ExpirationTime): number { + return (MAGIC_NUMBER_OFFSET - expirationTime) * UNIT_SIZE; +} + +function ceiling(num: number, precision: number): number { + return (((num / precision) | 0) + 1) * precision; +} + +function computeExpirationBucket( + currentTime, + expirationInMs, + bucketSizeMs, +): ExpirationTime { + return ( + MAGIC_NUMBER_OFFSET - + ceiling( + MAGIC_NUMBER_OFFSET - currentTime + expirationInMs / UNIT_SIZE, + bucketSizeMs / UNIT_SIZE, + ) + ); +} + +// TODO: This corresponds to Scheduler's NormalPriority, not LowPriority. Update +// the names to reflect. +export const LOW_PRIORITY_EXPIRATION = 5000; +export const LOW_PRIORITY_BATCH_SIZE = 250; + +export function computeAsyncExpiration( + currentTime: ExpirationTime, +): ExpirationTime { + return computeExpirationBucket( + currentTime, + LOW_PRIORITY_EXPIRATION, + LOW_PRIORITY_BATCH_SIZE, + ); +} + +export function computeSuspenseExpiration( + currentTime: ExpirationTime, + timeoutMs: number, +): ExpirationTime { + // TODO: Should we warn if timeoutMs is lower than the normal pri expiration time? + return computeExpirationBucket( + currentTime, + timeoutMs, + LOW_PRIORITY_BATCH_SIZE, + ); +} + +// We intentionally set a higher expiration time for interactive updates in +// dev than in production. +// +// If the main thread is being blocked so long that you hit the expiration, +// it's a problem that could be solved with better scheduling. +// +// People will be more likely to notice this and fix it with the long +// expiration time in development. +// +// In production we opt for better UX at the risk of masking scheduling +// problems, by expiring fast. +export const HIGH_PRIORITY_EXPIRATION = __DEV__ ? 500 : 150; +export const HIGH_PRIORITY_BATCH_SIZE = 100; + +export function computeInteractiveExpiration(currentTime: ExpirationTime) { + return computeExpirationBucket( + currentTime, + HIGH_PRIORITY_EXPIRATION, + HIGH_PRIORITY_BATCH_SIZE, + ); +} + +export function inferPriorityFromExpirationTime( + currentTime: ExpirationTime, + expirationTime: ExpirationTime, +): ReactPriorityLevel { + if (expirationTime === Sync) { + return ImmediatePriority; + } + if (expirationTime === Never || expirationTime === Idle) { + return IdlePriority; + } + const msUntil = + expirationTimeToMs(expirationTime) - expirationTimeToMs(currentTime); + if (msUntil <= 0) { + return ImmediatePriority; + } + if (msUntil <= HIGH_PRIORITY_EXPIRATION + HIGH_PRIORITY_BATCH_SIZE) { + return UserBlockingPriority; + } + if (msUntil <= LOW_PRIORITY_EXPIRATION + LOW_PRIORITY_BATCH_SIZE) { + return NormalPriority; + } + + // TODO: Handle LowPriority + + // Assume anything lower has idle priority + return IdlePriority; +} diff --git a/packages/react-reconciler/src/ReactFiberExpirationTime.js b/packages/react-reconciler/src/ReactFiberExpirationTime.old.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberExpirationTime.js rename to packages/react-reconciler/src/ReactFiberExpirationTime.old.js diff --git a/packages/react-reconciler/src/ReactFiberHooks.new.js b/packages/react-reconciler/src/ReactFiberHooks.new.js index 71e270ee2ef7..2e31b9ac401f 100644 --- a/packages/react-reconciler/src/ReactFiberHooks.new.js +++ b/packages/react-reconciler/src/ReactFiberHooks.new.js @@ -17,7 +17,7 @@ import type { ReactScopeMethods, } from 'shared/ReactTypes'; import type {Fiber, Dispatcher} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {HookEffectTag} from './ReactHookEffectTags'; import type {SuspenseConfig} from './ReactFiberSuspenseConfig'; import type {ReactPriorityLevel} from './ReactInternalTypes'; @@ -33,7 +33,7 @@ import ReactSharedInternals from 'shared/ReactSharedInternals'; import {enableUseEventAPI} from 'shared/ReactFeatureFlags'; import {markRootExpiredAtTime} from './ReactFiberRoot.new'; -import {NoWork, Sync} from './ReactFiberExpirationTime'; +import {NoWork, Sync} from './ReactFiberExpirationTime.new'; import {NoMode, BlockingMode} from './ReactTypeOfMode'; import {readContext} from './ReactFiberNewContext.new'; import {createDeprecatedResponderListener} from './ReactFiberDeprecatedEvents.new'; diff --git a/packages/react-reconciler/src/ReactFiberHooks.old.js b/packages/react-reconciler/src/ReactFiberHooks.old.js index 47cd196a676e..6cddf8894cbc 100644 --- a/packages/react-reconciler/src/ReactFiberHooks.old.js +++ b/packages/react-reconciler/src/ReactFiberHooks.old.js @@ -17,7 +17,7 @@ import type { ReactScopeMethods, } from 'shared/ReactTypes'; import type {Fiber, Dispatcher} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {HookEffectTag} from './ReactHookEffectTags'; import type {SuspenseConfig} from './ReactFiberSuspenseConfig'; import type {ReactPriorityLevel} from './ReactInternalTypes'; @@ -33,7 +33,7 @@ import ReactSharedInternals from 'shared/ReactSharedInternals'; import {enableUseEventAPI} from 'shared/ReactFeatureFlags'; import {markRootExpiredAtTime} from './ReactFiberRoot.old'; -import {NoWork, Sync} from './ReactFiberExpirationTime'; +import {NoWork, Sync} from './ReactFiberExpirationTime.old'; import {NoMode, BlockingMode} from './ReactTypeOfMode'; import {readContext} from './ReactFiberNewContext.old'; import {createDeprecatedResponderListener} from './ReactFiberDeprecatedEvents.old'; diff --git a/packages/react-reconciler/src/ReactFiberHotReloading.new.js b/packages/react-reconciler/src/ReactFiberHotReloading.new.js index 048476ff0f55..164637bfc4e9 100644 --- a/packages/react-reconciler/src/ReactFiberHotReloading.new.js +++ b/packages/react-reconciler/src/ReactFiberHotReloading.new.js @@ -20,7 +20,7 @@ import { } from './ReactFiberWorkLoop.new'; import {updateContainer, syncUpdates} from './ReactFiberReconciler.new'; import {emptyContextObject} from './ReactFiberContext.new'; -import {Sync} from './ReactFiberExpirationTime'; +import {Sync} from './ReactFiberExpirationTime.new'; import { ClassComponent, FunctionComponent, diff --git a/packages/react-reconciler/src/ReactFiberHotReloading.old.js b/packages/react-reconciler/src/ReactFiberHotReloading.old.js index fccb9f76c47c..4e2951b7d4a5 100644 --- a/packages/react-reconciler/src/ReactFiberHotReloading.old.js +++ b/packages/react-reconciler/src/ReactFiberHotReloading.old.js @@ -20,7 +20,7 @@ import { } from './ReactFiberWorkLoop.old'; import {updateContainer, syncUpdates} from './ReactFiberReconciler.old'; import {emptyContextObject} from './ReactFiberContext.old'; -import {Sync} from './ReactFiberExpirationTime'; +import {Sync} from './ReactFiberExpirationTime.old'; import { ClassComponent, FunctionComponent, diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.new.js b/packages/react-reconciler/src/ReactFiberHydrationContext.new.js index 419ba05d94b2..88d7511cef19 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.new.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.new.js @@ -55,7 +55,7 @@ import { didNotFindHydratableSuspenseInstance, } from './ReactFiberHostConfig'; import {enableSuspenseServerRenderer} from 'shared/ReactFeatureFlags'; -import {Never, NoWork} from './ReactFiberExpirationTime'; +import {Never, NoWork} from './ReactFiberExpirationTime.new'; // The deepest Fiber on the stack involved in a hydration context. // This may have been an insertion or a hydration. diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.old.js b/packages/react-reconciler/src/ReactFiberHydrationContext.old.js index 617c0d422e60..f8bb2a575537 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.old.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.old.js @@ -55,7 +55,7 @@ import { didNotFindHydratableSuspenseInstance, } from './ReactFiberHostConfig'; import {enableSuspenseServerRenderer} from 'shared/ReactFeatureFlags'; -import {Never, NoWork} from './ReactFiberExpirationTime'; +import {Never, NoWork} from './ReactFiberExpirationTime.old'; // The deepest Fiber on the stack involved in a hydration context. // This may have been an insertion or a hydration. diff --git a/packages/react-reconciler/src/ReactFiberNewContext.new.js b/packages/react-reconciler/src/ReactFiberNewContext.new.js index adf863706cb1..c6273bb9faa2 100644 --- a/packages/react-reconciler/src/ReactFiberNewContext.new.js +++ b/packages/react-reconciler/src/ReactFiberNewContext.new.js @@ -10,7 +10,7 @@ import type {ReactContext} from 'shared/ReactTypes'; import type {Fiber, ContextDependency} from './ReactInternalTypes'; import type {StackCursor} from './ReactFiberStack.new'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import {isPrimaryRenderer} from './ReactFiberHostConfig'; import {createCursor, push, pop} from './ReactFiberStack.new'; @@ -24,7 +24,7 @@ import { import invariant from 'shared/invariant'; import is from 'shared/objectIs'; import {createUpdate, enqueueUpdate, ForceUpdate} from './ReactUpdateQueue.new'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.new'; import {markWorkInProgressReceivedUpdate} from './ReactFiberBeginWork.new'; import {enableSuspenseServerRenderer} from 'shared/ReactFeatureFlags'; diff --git a/packages/react-reconciler/src/ReactFiberNewContext.old.js b/packages/react-reconciler/src/ReactFiberNewContext.old.js index c7b3a5a2a321..87ac52a731f6 100644 --- a/packages/react-reconciler/src/ReactFiberNewContext.old.js +++ b/packages/react-reconciler/src/ReactFiberNewContext.old.js @@ -10,7 +10,7 @@ import type {ReactContext} from 'shared/ReactTypes'; import type {Fiber, ContextDependency} from './ReactInternalTypes'; import type {StackCursor} from './ReactFiberStack.old'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import {isPrimaryRenderer} from './ReactFiberHostConfig'; import {createCursor, push, pop} from './ReactFiberStack.old'; @@ -24,7 +24,7 @@ import { import invariant from 'shared/invariant'; import is from 'shared/objectIs'; import {createUpdate, enqueueUpdate, ForceUpdate} from './ReactUpdateQueue.old'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.old'; import {markWorkInProgressReceivedUpdate} from './ReactFiberBeginWork.old'; import {enableSuspenseServerRenderer} from 'shared/ReactFeatureFlags'; diff --git a/packages/react-reconciler/src/ReactFiberReconciler.new.js b/packages/react-reconciler/src/ReactFiberReconciler.new.js index 1b80d50c480d..7206599b5b1b 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.new.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.new.js @@ -19,7 +19,7 @@ import type { import type {RendererInspectionConfig} from './ReactFiberHostConfig'; import {FundamentalComponent} from './ReactWorkTags'; import type {ReactNodeList, Thenable} from 'shared/ReactTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {SuspenseState} from './ReactFiberSuspenseComponent.new'; import { @@ -76,7 +76,7 @@ import { Sync, ContinuousHydration, computeInteractiveExpiration, -} from './ReactFiberExpirationTime'; +} from './ReactFiberExpirationTime.new'; import {requestCurrentSuspenseConfig} from './ReactFiberSuspenseConfig'; import { scheduleRefresh, diff --git a/packages/react-reconciler/src/ReactFiberReconciler.old.js b/packages/react-reconciler/src/ReactFiberReconciler.old.js index bb8c25a16ac3..a47101d432cf 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.old.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.old.js @@ -19,7 +19,7 @@ import type { import type {RendererInspectionConfig} from './ReactFiberHostConfig'; import {FundamentalComponent} from './ReactWorkTags'; import type {ReactNodeList, Thenable} from 'shared/ReactTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {SuspenseState} from './ReactFiberSuspenseComponent.old'; import { @@ -76,7 +76,7 @@ import { Sync, ContinuousHydration, computeInteractiveExpiration, -} from './ReactFiberExpirationTime'; +} from './ReactFiberExpirationTime.old'; import {requestCurrentSuspenseConfig} from './ReactFiberSuspenseConfig'; import { scheduleRefresh, diff --git a/packages/react-reconciler/src/ReactFiberRoot.new.js b/packages/react-reconciler/src/ReactFiberRoot.new.js index 35fff92dc2fc..1b338f12e327 100644 --- a/packages/react-reconciler/src/ReactFiberRoot.new.js +++ b/packages/react-reconciler/src/ReactFiberRoot.new.js @@ -8,12 +8,12 @@ */ import type {FiberRoot, SuspenseHydrationCallbacks} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {RootTag} from './ReactRootTags'; import {noTimeout} from './ReactFiberHostConfig'; import {createHostRootFiber} from './ReactFiber.new'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.new'; import { enableSchedulerTracing, enableSuspenseCallback, diff --git a/packages/react-reconciler/src/ReactFiberRoot.old.js b/packages/react-reconciler/src/ReactFiberRoot.old.js index 6c18bc6bc8bf..10e0180bf60e 100644 --- a/packages/react-reconciler/src/ReactFiberRoot.old.js +++ b/packages/react-reconciler/src/ReactFiberRoot.old.js @@ -8,12 +8,12 @@ */ import type {FiberRoot, SuspenseHydrationCallbacks} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {RootTag} from './ReactRootTags'; import {noTimeout} from './ReactFiberHostConfig'; import {createHostRootFiber} from './ReactFiber.old'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.old'; import { enableSchedulerTracing, enableSuspenseCallback, diff --git a/packages/react-reconciler/src/ReactFiberSuspenseComponent.new.js b/packages/react-reconciler/src/ReactFiberSuspenseComponent.new.js index 94ebb2feb248..a8bc2b43d9e6 100644 --- a/packages/react-reconciler/src/ReactFiberSuspenseComponent.new.js +++ b/packages/react-reconciler/src/ReactFiberSuspenseComponent.new.js @@ -9,7 +9,7 @@ import type {Fiber} from './ReactInternalTypes'; import type {SuspenseInstance} from './ReactFiberHostConfig'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import {SuspenseComponent, SuspenseListComponent} from './ReactWorkTags'; import {NoEffect, DidCapture} from './ReactSideEffectTags'; import { diff --git a/packages/react-reconciler/src/ReactFiberSuspenseComponent.old.js b/packages/react-reconciler/src/ReactFiberSuspenseComponent.old.js index 94ebb2feb248..7ad17efd0c1e 100644 --- a/packages/react-reconciler/src/ReactFiberSuspenseComponent.old.js +++ b/packages/react-reconciler/src/ReactFiberSuspenseComponent.old.js @@ -9,7 +9,7 @@ import type {Fiber} from './ReactInternalTypes'; import type {SuspenseInstance} from './ReactFiberHostConfig'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import {SuspenseComponent, SuspenseListComponent} from './ReactWorkTags'; import {NoEffect, DidCapture} from './ReactSideEffectTags'; import { diff --git a/packages/react-reconciler/src/ReactFiberThrow.new.js b/packages/react-reconciler/src/ReactFiberThrow.new.js index 3e3586eed2f3..bb87a4b0041a 100644 --- a/packages/react-reconciler/src/ReactFiberThrow.new.js +++ b/packages/react-reconciler/src/ReactFiberThrow.new.js @@ -9,7 +9,7 @@ import type {Fiber} from './ReactInternalTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {CapturedValue} from './ReactCapturedValue'; import type {Update} from './ReactUpdateQueue.new'; import type {Wakeable} from 'shared/ReactTypes'; @@ -56,7 +56,7 @@ import { } from './ReactFiberWorkLoop.new'; import {logCapturedError} from './ReactFiberErrorLogger'; -import {Sync} from './ReactFiberExpirationTime'; +import {Sync} from './ReactFiberExpirationTime.new'; const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map; diff --git a/packages/react-reconciler/src/ReactFiberThrow.old.js b/packages/react-reconciler/src/ReactFiberThrow.old.js index 62de3309c820..d9f09ad36210 100644 --- a/packages/react-reconciler/src/ReactFiberThrow.old.js +++ b/packages/react-reconciler/src/ReactFiberThrow.old.js @@ -9,7 +9,7 @@ import type {Fiber} from './ReactInternalTypes'; import type {FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {CapturedValue} from './ReactCapturedValue'; import type {Update} from './ReactUpdateQueue.old'; import type {Wakeable} from 'shared/ReactTypes'; @@ -56,7 +56,7 @@ import { } from './ReactFiberWorkLoop.old'; import {logCapturedError} from './ReactFiberErrorLogger'; -import {Sync} from './ReactFiberExpirationTime'; +import {Sync} from './ReactFiberExpirationTime.old'; const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map; diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.new.js b/packages/react-reconciler/src/ReactFiberUnwindWork.new.js index 47c82b688c0c..fd6f010b2255 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.new.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.new.js @@ -8,7 +8,7 @@ */ import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {SuspenseState} from './ReactFiberSuspenseComponent.new'; import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource.new'; diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.old.js b/packages/react-reconciler/src/ReactFiberUnwindWork.old.js index 3aed4ec48263..5a1c42707d6c 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.old.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.old.js @@ -8,7 +8,7 @@ */ import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {SuspenseState} from './ReactFiberSuspenseComponent.old'; import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource.old'; diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js index d09901de4bdb..86eb5a6b361a 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js @@ -9,7 +9,7 @@ import type {Wakeable} from 'shared/ReactTypes'; import type {Fiber, FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {ReactPriorityLevel} from './ReactInternalTypes'; import type {Interaction} from 'scheduler/src/Tracing'; import type {SuspenseConfig} from './ReactFiberSuspenseConfig'; @@ -124,7 +124,7 @@ import { LOW_PRIORITY_EXPIRATION, Batched, Idle, -} from './ReactFiberExpirationTime'; +} from './ReactFiberExpirationTime.new'; import {beginWork as originalBeginWork} from './ReactFiberBeginWork.new'; import {completeWork} from './ReactFiberCompleteWork.new'; import {unwindWork, unwindInterruptedWork} from './ReactFiberUnwindWork.new'; diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js index 46bce77a359b..6d0876290910 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js @@ -9,7 +9,7 @@ import type {Wakeable} from 'shared/ReactTypes'; import type {Fiber, FiberRoot} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {ReactPriorityLevel} from './ReactInternalTypes'; import type {Interaction} from 'scheduler/src/Tracing'; import type {SuspenseConfig} from './ReactFiberSuspenseConfig'; @@ -124,7 +124,7 @@ import { LOW_PRIORITY_EXPIRATION, Batched, Idle, -} from './ReactFiberExpirationTime'; +} from './ReactFiberExpirationTime.old'; import {beginWork as originalBeginWork} from './ReactFiberBeginWork.old'; import {completeWork} from './ReactFiberCompleteWork.old'; import {unwindWork, unwindInterruptedWork} from './ReactFiberUnwindWork.old'; diff --git a/packages/react-reconciler/src/ReactInternalTypes.js b/packages/react-reconciler/src/ReactInternalTypes.js index 2dbc9e5160bd..1c37422388dc 100644 --- a/packages/react-reconciler/src/ReactInternalTypes.js +++ b/packages/react-reconciler/src/ReactInternalTypes.js @@ -25,7 +25,7 @@ import type { import type {WorkTag} from './ReactWorkTags'; import type {TypeOfMode} from './ReactTypeOfMode'; import type {SideEffectTag} from './ReactSideEffectTags'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; // import type {UpdateQueue} from './ReactUpdateQueue.old'; import type {HookType} from './ReactFiberHooks.old'; import type {RootTag} from './ReactRootTags'; diff --git a/packages/react-reconciler/src/ReactMutableSource.new.js b/packages/react-reconciler/src/ReactMutableSource.new.js index be7561ca2c21..929bb67c4f5e 100644 --- a/packages/react-reconciler/src/ReactMutableSource.new.js +++ b/packages/react-reconciler/src/ReactMutableSource.new.js @@ -7,12 +7,12 @@ * @flow */ -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {FiberRoot} from './ReactInternalTypes'; import type {MutableSource, MutableSourceVersion} from 'shared/ReactTypes'; import {isPrimaryRenderer} from './ReactFiberHostConfig'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.new'; // Work in progress version numbers only apply to a single render, // and should be reset before starting a new render. diff --git a/packages/react-reconciler/src/ReactMutableSource.old.js b/packages/react-reconciler/src/ReactMutableSource.old.js index be7561ca2c21..f0658bea5592 100644 --- a/packages/react-reconciler/src/ReactMutableSource.old.js +++ b/packages/react-reconciler/src/ReactMutableSource.old.js @@ -7,12 +7,12 @@ * @flow */ -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {FiberRoot} from './ReactInternalTypes'; import type {MutableSource, MutableSourceVersion} from 'shared/ReactTypes'; import {isPrimaryRenderer} from './ReactFiberHostConfig'; -import {NoWork} from './ReactFiberExpirationTime'; +import {NoWork} from './ReactFiberExpirationTime.old'; // Work in progress version numbers only apply to a single render, // and should be reset before starting a new render. diff --git a/packages/react-reconciler/src/ReactUpdateQueue.new.js b/packages/react-reconciler/src/ReactUpdateQueue.new.js index f85e4dec2af0..19195fea45fa 100644 --- a/packages/react-reconciler/src/ReactUpdateQueue.new.js +++ b/packages/react-reconciler/src/ReactUpdateQueue.new.js @@ -85,11 +85,11 @@ // resources, but the final state is always the same. import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.new'; import type {SuspenseConfig} from './ReactFiberSuspenseConfig'; import type {ReactPriorityLevel} from './ReactInternalTypes'; -import {NoWork, Sync} from './ReactFiberExpirationTime'; +import {NoWork, Sync} from './ReactFiberExpirationTime.new'; import { enterDisallowedContextReadInDEV, exitDisallowedContextReadInDEV, diff --git a/packages/react-reconciler/src/ReactUpdateQueue.old.js b/packages/react-reconciler/src/ReactUpdateQueue.old.js index 7f1e07bd7c3c..1c974c8af9b8 100644 --- a/packages/react-reconciler/src/ReactUpdateQueue.old.js +++ b/packages/react-reconciler/src/ReactUpdateQueue.old.js @@ -85,11 +85,11 @@ // resources, but the final state is always the same. import type {Fiber} from './ReactInternalTypes'; -import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {ExpirationTime} from './ReactFiberExpirationTime.old'; import type {SuspenseConfig} from './ReactFiberSuspenseConfig'; import type {ReactPriorityLevel} from './ReactInternalTypes'; -import {NoWork, Sync} from './ReactFiberExpirationTime'; +import {NoWork, Sync} from './ReactFiberExpirationTime.old'; import { enterDisallowedContextReadInDEV, exitDisallowedContextReadInDEV,