Remove Reconciler fork (2/2) (#25775)

We've heard from multiple contributors that the Reconciler forking
mechanism was confusing and/or annoying to deal with. Since it's
currently unused and there's no immediate plans to start using it again,
this removes the forking.

Fully removing the fork is split into 2 steps to preserve file history:

**#25774 previous PR that did the bulk of the work:**
- remove `enableNewReconciler` feature flag.
- remove `unstable_isNewReconciler` export
- remove eslint rules for cross fork imports
- remove `*.new.js` files and update imports
- merge non-suffixed files into `*.old` files where both exist
(sometimes types were defined there)

**This PR**
- rename `*.old` files

packages/react-art/src/ReactART.js

@@ -12,7 +12,7 @@ import {
   createContainer,
   updateContainer,
   injectIntoDevTools,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';
 import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
 import FastNoSideEffects from 'art/modes/fast-noSideEffects';

packages/react-art/src/ReactARTHostConfig.js

@@ -10,7 +10,7 @@ import Mode from 'art/modes/current';
 
 import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
 
-import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
+import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
 
 const pooledTransform = new Transform();
 

packages/react-dom-bindings/src/client/ReactDOMFloatClient.js

@@ -29,7 +29,7 @@ import {
   markNodeAsResource,
 } from './ReactDOMComponentTree';
 import {HTML_NAMESPACE, SVG_NAMESPACE} from '../shared/DOMNamespaces';
-import {getCurrentRootHostContainer} from 'react-reconciler/src/ReactFiberHostContext.old';
+import {getCurrentRootHostContainer} from 'react-reconciler/src/ReactFiberHostContext';
 
 // The resource types we support. currently they match the form for the as argument.
 // In the future this may need to change, especially when modules / scripts are supported

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

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
+import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
 import type {DOMEventName} from '../events/DOMEventNames';
 import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
 import type {
@@ -81,7 +81,7 @@ import {
 } from 'react-reconciler/src/ReactWorkTags';
 import {listenToAllSupportedEvents} from '../events/DOMPluginEventSystem';
 
-import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
+import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
 
 // TODO: Remove this deep import when we delete the legacy root API
 import {ConcurrentMode, NoMode} from 'react-reconciler/src/ReactTypeOfMode';

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

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
+import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
 import type {AnyNativeEvent} from '../events/PluginModuleType';
 import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
 import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
@@ -52,7 +52,7 @@ import {
   IdleEventPriority,
   getCurrentUpdatePriority,
   setCurrentUpdatePriority,
-} from 'react-reconciler/src/ReactEventPriorities.old';
+} from 'react-reconciler/src/ReactEventPriorities';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import {isRootDehydrated} from 'react-reconciler/src/ReactFiberShellHydration';
 

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

@@ -12,7 +12,7 @@ import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
 import type {DOMEventName} from '../events/DOMEventNames';
 import type {EventSystemFlags} from './EventSystemFlags';
 import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
-import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
+import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
 
 import {enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay} from 'shared/ReactFeatureFlags';
 import {
@@ -35,7 +35,7 @@ import {
   getClosestInstanceFromNode,
 } from '../client/ReactDOMComponentTree';
 import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags';
-import {isHigherEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
+import {isHigherEventPriority} from 'react-reconciler/src/ReactEventPriorities';
 import {isRootDehydrated} from 'react-reconciler/src/ReactFiberShellHydration';
 
 let _attemptSynchronousHydration: (fiber: Object) => void;

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

@@ -43,11 +43,11 @@ import {
   attemptDiscreteHydration,
   attemptContinuousHydration,
   attemptHydrationAtCurrentPriority,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';
 import {
   runWithPriority,
   getCurrentUpdatePriority,
-} from 'react-reconciler/src/ReactEventPriorities.old';
+} from 'react-reconciler/src/ReactEventPriorities';
 import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
 import {canUseDOM} from 'shared/ExecutionEnvironment';
 import ReactVersion from 'shared/ReactVersion';

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

@@ -37,7 +37,7 @@ import {
   getPublicRootInstance,
   findHostInstance,
   findHostInstanceWithWarning,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';
 import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
 import getComponentNameFromType from 'shared/getComponentNameFromType';
 import ReactSharedInternals from 'shared/ReactSharedInternals';

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

@@ -76,7 +76,7 @@ import {
   registerMutableSourceForHydration,
   flushSync,
   isAlreadyRendering,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';
 import {ConcurrentRoot} from 'react-reconciler/src/ReactRootTags';
 
 /* global reportError */

packages/react-dom/unstable_testing.classic.fb.js

@@ -19,4 +19,4 @@ export {
   findBoundingRects,
   focusWithin,
   observeVisibleRects,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-dom/unstable_testing.experimental.js

@@ -19,4 +19,4 @@ export {
   findBoundingRects,
   focusWithin,
   observeVisibleRects,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-dom/unstable_testing.js

@@ -19,4 +19,4 @@ export {
   findBoundingRects,
   focusWithin,
   observeVisibleRects,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-dom/unstable_testing.modern.fb.js

@@ -19,4 +19,4 @@ export {
   findBoundingRects,
   focusWithin,
   observeVisibleRects,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';

packages/react-native-renderer/src/ReactFabric.js

@@ -22,7 +22,7 @@ import {
   updateContainer,
   injectIntoDevTools,
   getPublicRootInstance,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';
 
 import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
 import {setBatchingImplementation} from './legacy-events/ReactGenericBatching';

packages/react-native-renderer/src/ReactFabricHostConfig.js

@@ -26,7 +26,7 @@ import {dispatchEvent} from './ReactFabricEventEmitter';
 import {
   DefaultEventPriority,
   DiscreteEventPriority,
-} from 'react-reconciler/src/ReactEventPriorities.old';
+} from 'react-reconciler/src/ReactEventPriorities';
 
 // Modules provided by RN:
 import {

packages/react-native-renderer/src/ReactNativeHostConfig.js

@@ -24,7 +24,7 @@ import {
 } from './ReactNativeComponentTree';
 import ReactNativeFiberHostComponent from './ReactNativeFiberHostComponent';
 
-import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
+import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
 
 const {get: getViewConfigForType} = ReactNativeViewConfigRegistry;
 

packages/react-native-renderer/src/ReactNativeRenderer.js

@@ -22,7 +22,7 @@ import {
   updateContainer,
   injectIntoDevTools,
   getPublicRootInstance,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 import {getStackByFiberInDevAndProd} from 'react-reconciler/src/ReactFiberComponentStack';
 import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';

packages/react-reconciler/index.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFiberReconciler.old';
+export * from './src/ReactFiberReconciler';

packages/react-reconciler/src/DebugTracing.js

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {Lane, Lanes} from './ReactFiberLane.old';
+import type {Lane, Lanes} from './ReactFiberLane';
 import type {Wakeable} from 'shared/ReactTypes';
 
 import {enableDebugTracing} from 'shared/ReactFeatureFlags';

packages/react-reconciler/src/ReactChildFiber.js

@@ -10,7 +10,7 @@
 import type {ReactElement} from 'shared/ReactElementType';
 import type {ReactPortal} from 'shared/ReactTypes';
 import type {Fiber} from './ReactInternalTypes';
-import type {Lanes} from './ReactFiberLane.old';
+import type {Lanes} from './ReactFiberLane';
 
 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
 import {
@@ -38,11 +38,11 @@ import {
   createFiberFromFragment,
   createFiberFromText,
   createFiberFromPortal,
-} from './ReactFiber.old';
-import {isCompatibleFamilyForHotReloading} from './ReactFiberHotReloading.old';
+} from './ReactFiber';
+import {isCompatibleFamilyForHotReloading} from './ReactFiberHotReloading';
 import {StrictLegacyMode} from './ReactTypeOfMode';
-import {getIsHydrating} from './ReactFiberHydrationContext.old';
-import {pushTreeFork} from './ReactFiberTreeContext.old';
+import {getIsHydrating} from './ReactFiberHydrationContext';
+import {pushTreeFork} from './ReactFiberTreeContext';
 
 let didWarnAboutMaps;
 let didWarnAboutGenerators;

packages/react-reconciler/src/ReactEventPriorities.js

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {Lane, Lanes} from './ReactFiberLane.old';
+import type {Lane, Lanes} from './ReactFiberLane';
 
 import {
   NoLane,
@@ -17,7 +17,7 @@ import {
   IdleLane,
   getHighestPriorityLane,
   includesNonIdleWork,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 
 export opaque type EventPriority = Lane;
 

packages/react-reconciler/src/ReactFiber.js

@@ -13,13 +13,13 @@ import type {Fiber} from './ReactInternalTypes';
 import type {RootTag} from './ReactRootTags';
 import type {WorkTag} from './ReactWorkTags';
 import type {TypeOfMode} from './ReactTypeOfMode';
-import type {Lanes} from './ReactFiberLane.old';
+import type {Lanes} from './ReactFiberLane';
 import type {SuspenseInstance} from './ReactFiberHostConfig';
 import type {
   OffscreenProps,
   OffscreenInstance,
 } from './ReactFiberOffscreenComponent';
-import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent.old';
+import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
 
 import {
   supportsResources,
@@ -72,13 +72,13 @@ import {
 } from './ReactWorkTags';
 import {OffscreenVisible} from './ReactFiberOffscreenComponent';
 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
-import {isDevToolsPresent} from './ReactFiberDevToolsHook.old';
+import {isDevToolsPresent} from './ReactFiberDevToolsHook';
 import {
   resolveClassForHotReloading,
   resolveFunctionForHotReloading,
   resolveForwardRefForHotReloading,
-} from './ReactFiberHotReloading.old';
-import {NoLanes} from './ReactFiberLane.old';
+} from './ReactFiberHotReloading';
+import {NoLanes} from './ReactFiberLane';
 import {
   NoMode,
   ConcurrentMode,
@@ -106,9 +106,9 @@ import {
   REACT_CACHE_TYPE,
   REACT_TRACING_MARKER_TYPE,
 } from 'shared/ReactSymbols';
-import {TransitionTracingMarker} from './ReactFiberTracingMarkerComponent.old';
-import {detachOffscreenInstance} from './ReactFiberCommitWork.old';
-import {getHostContext} from './ReactFiberHostContext.old';
+import {TransitionTracingMarker} from './ReactFiberTracingMarkerComponent';
+import {detachOffscreenInstance} from './ReactFiberCommitWork';
+import {getHostContext} from './ReactFiberHostContext';
 
 export type {Fiber};
 

packages/react-reconciler/src/ReactFiberAct.js

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {Fiber} from './ReactFiber.old';
+import type {Fiber} from './ReactFiber';
 
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 

packages/react-reconciler/src/ReactFiberBeginWork.js

@@ -16,13 +16,13 @@ import type {
 import type {LazyComponent as LazyComponentType} from 'react/src/ReactLazy';
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
 import type {TypeOfMode} from './ReactTypeOfMode';
-import type {Lanes, Lane} from './ReactFiberLane.old';
+import type {Lanes, Lane} from './ReactFiberLane';
 import type {
   SuspenseState,
   SuspenseListRenderState,
   SuspenseListTailMode,
-} from './ReactFiberSuspenseComponent.old';
-import type {SuspenseContext} from './ReactFiberSuspenseContext.old';
+} from './ReactFiberSuspenseComponent';
+import type {SuspenseContext} from './ReactFiberSuspenseContext';
 import type {
   OffscreenProps,
   OffscreenState,
@@ -34,17 +34,17 @@ import type {
   Cache,
   CacheComponentState,
   SpawnedCachePool,
-} from './ReactFiberCacheComponent.old';
-import type {UpdateQueue} from './ReactFiberClassUpdateQueue.old';
-import type {RootState} from './ReactFiberRoot.old';
-import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberCacheComponent';
+import type {UpdateQueue} from './ReactFiberClassUpdateQueue';
+import type {RootState} from './ReactFiberRoot';
+import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
 
 import checkPropTypes from 'shared/checkPropTypes';
 import {
   markComponentRenderStarted,
   markComponentRenderStopped,
   setIsStrictModeForDevtools,
-} from './ReactFiberDevToolsHook.old';
+} from './ReactFiberDevToolsHook';
 import {
   IndeterminateComponent,
   FunctionComponent,
@@ -113,7 +113,7 @@ import isArray from 'shared/isArray';
 import shallowEqual from 'shared/shallowEqual';
 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
 import getComponentNameFromType from 'shared/getComponentNameFromType';
-import ReactStrictModeWarnings from './ReactStrictModeWarnings.old';
+import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {REACT_LAZY_TYPE, getIteratorFn} from 'shared/ReactSymbols';
 import {
   getCurrentFiberOwnerNameInDevOrNull,
@@ -123,19 +123,19 @@ import {
   resolveFunctionForHotReloading,
   resolveForwardRefForHotReloading,
   resolveClassForHotReloading,
-} from './ReactFiberHotReloading.old';
+} from './ReactFiberHotReloading';
 
 import {
   mountChildFibers,
   reconcileChildFibers,
   cloneChildFibers,
-} from './ReactChildFiber.old';
+} from './ReactChildFiber';
 import {
   processUpdateQueue,
   cloneUpdateQueue,
   initializeUpdateQueue,
   enqueueCapturedUpdate,
-} from './ReactFiberClassUpdateQueue.old';
+} from './ReactFiberClassUpdateQueue';
 import {
   NoLane,
   NoLanes,
@@ -150,7 +150,7 @@ import {
   mergeLanes,
   getBumpedLaneForHydration,
   pickArbitraryLane,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 import {
   ConcurrentMode,
   NoMode,
@@ -170,8 +170,8 @@ import {
   getResource,
 } from './ReactFiberHostConfig';
 import type {SuspenseInstance} from './ReactFiberHostConfig';
-import {shouldError, shouldSuspend} from './ReactFiberReconciler.old';
-import {pushHostContext, pushHostContainer} from './ReactFiberHostContext.old';
+import {shouldError, shouldSuspend} from './ReactFiberReconciler';
+import {pushHostContext, pushHostContainer} from './ReactFiberHostContext';
 import {
   suspenseStackCursor,
   pushSuspenseListContext,
@@ -184,12 +184,12 @@ import {
   pushOffscreenSuspenseHandler,
   reuseSuspenseHandlerOnStack,
   popSuspenseHandler,
-} from './ReactFiberSuspenseContext.old';
+} from './ReactFiberSuspenseContext';
 import {
   pushHiddenContext,
   reuseHiddenContextOnStack,
-} from './ReactFiberHiddenContext.old';
-import {findFirstSuspended} from './ReactFiberSuspenseComponent.old';
+} from './ReactFiberHiddenContext';
+import {findFirstSuspended} from './ReactFiberSuspenseComponent';
 import {
   pushProvider,
   propagateContextChange,
@@ -199,14 +199,14 @@ import {
   readContext,
   prepareToReadContext,
   scheduleContextWorkOnParentPath,
-} from './ReactFiberNewContext.old';
+} from './ReactFiberNewContext';
 import {
   renderWithHooks,
   checkDidRenderIdHook,
   bailoutHooks,
   replaySuspendedComponentWithHooks,
-} from './ReactFiberHooks.old';
-import {stopProfilerTimerIfRunning} from './ReactProfilerTimer.old';
+} from './ReactFiberHooks';
+import {stopProfilerTimerIfRunning} from './ReactProfilerTimer';
 import {
   getMaskedContext,
   getUnmaskedContext,
@@ -215,7 +215,7 @@ import {
   isContextProvider as isLegacyContextProvider,
   pushTopLevelContextObject,
   invalidateContextProvider,
-} from './ReactFiberContext.old';
+} from './ReactFiberContext';
 import {
   getIsHydrating,
   enterHydrationState,
@@ -225,15 +225,15 @@ import {
   tryToClaimNextHydratableInstance,
   warnIfHydrating,
   queueHydrationError,
-} from './ReactFiberHydrationContext.old';
+} from './ReactFiberHydrationContext';
 import {
   adoptClassInstance,
   constructClassInstance,
   mountClassInstance,
   resumeMountClassInstance,
   updateClassInstance,
-} from './ReactFiberClassComponent.old';
-import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
+} from './ReactFiberClassComponent';
+import {resolveDefaultProps} from './ReactFiberLazyComponent';
 import {
   resolveLazyComponentTag,
   createFiberFromTypeAndProps,
@@ -241,30 +241,30 @@ import {
   createFiberFromOffscreen,
   createWorkInProgress,
   isSimpleFunctionComponent,
-} from './ReactFiber.old';
+} from './ReactFiber';
 import {
   retryDehydratedSuspenseBoundary,
   scheduleUpdateOnFiber,
   renderDidSuspendDelayIfPossible,
   markSkippedUpdateLanes,
   getWorkInProgressRoot,
-} from './ReactFiberWorkLoop.old';
-import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates.old';
-import {setWorkInProgressVersion} from './ReactMutableSource.old';
-import {pushCacheProvider, CacheContext} from './ReactFiberCacheComponent.old';
+} from './ReactFiberWorkLoop';
+import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates';
+import {setWorkInProgressVersion} from './ReactMutableSource';
+import {pushCacheProvider, CacheContext} from './ReactFiberCacheComponent';
 import {
   createCapturedValue,
   createCapturedValueAtFiber,
   type CapturedValue,
 } from './ReactCapturedValue';
-import {createClassErrorUpdate} from './ReactFiberThrow.old';
+import {createClassErrorUpdate} from './ReactFiberThrow';
 import is from 'shared/objectIs';
 import {
   getForksAtLevel,
   isForkedChild,
   pushTreeId,
   pushMaterializedTreeId,
-} from './ReactFiberTreeContext.old';
+} from './ReactFiberTreeContext';
 import {
   requestCacheFromPool,
   pushRootTransition,
@@ -272,13 +272,13 @@ import {
   pushTransition,
   getOffscreenDeferredCache,
   getPendingTransitions,
-} from './ReactFiberTransition.old';
+} from './ReactFiberTransition';
 import {
   getMarkerInstances,
   pushMarkerInstance,
   pushRootMarkerInstance,
   TransitionTracingMarker,
-} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberTracingMarkerComponent';
 
 const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 

packages/react-reconciler/src/ReactFiberCache.js

@@ -8,11 +8,11 @@
  */
 
 import type {CacheDispatcher} from './ReactInternalTypes';
-import type {Cache} from './ReactFiberCacheComponent.old';
+import type {Cache} from './ReactFiberCacheComponent';
 
 import {enableCache} from 'shared/ReactFeatureFlags';
-import {readContext} from './ReactFiberNewContext.old';
-import {CacheContext} from './ReactFiberCacheComponent.old';
+import {readContext} from './ReactFiberNewContext';
+import {CacheContext} from './ReactFiberCacheComponent';
 
 function getCacheSignal(): AbortSignal {
   if (!enableCache) {

packages/react-reconciler/src/ReactFiberCacheComponent.js

@@ -13,7 +13,7 @@ import type {Fiber} from 'react-reconciler/src/ReactInternalTypes';
 import {enableCache} from 'shared/ReactFeatureFlags';
 import {REACT_CONTEXT_TYPE} from 'shared/ReactSymbols';
 
-import {pushProvider, popProvider} from './ReactFiberNewContext.old';
+import {pushProvider, popProvider} from './ReactFiberNewContext';
 import * as Scheduler from 'scheduler';
 
 // In environments without AbortController (e.g. tests)

packages/react-reconciler/src/ReactFiberClassComponent.js

@@ -8,8 +8,8 @@
  */
 
 import type {Fiber} from './ReactInternalTypes';
-import type {Lanes} from './ReactFiberLane.old';
-import type {UpdateQueue} from './ReactFiberClassUpdateQueue.old';
+import type {Lanes} from './ReactFiberLane';
+import type {UpdateQueue} from './ReactFiberClassUpdateQueue';
 import type {Flags} from './ReactFiberFlags';
 
 import {
@@ -26,7 +26,7 @@ import {
   warnAboutDeprecatedLifecycles,
   enableLazyContextPropagation,
 } from 'shared/ReactFeatureFlags';
-import ReactStrictModeWarnings from './ReactStrictModeWarnings.old';
+import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {isMounted} from './ReactFiberTreeReflection';
 import {get as getInstance, set as setInstance} from 'shared/ReactInstanceMap';
 import shallowEqual from 'shared/shallowEqual';
@@ -36,7 +36,7 @@ import assign from 'shared/assign';
 import isArray from 'shared/isArray';
 import {REACT_CONTEXT_TYPE, REACT_PROVIDER_TYPE} from 'shared/ReactSymbols';
 
-import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
+import {resolveDefaultProps} from './ReactFiberLazyComponent';
 import {
   DebugTracingMode,
   NoMode,
@@ -55,27 +55,27 @@ import {
   ForceUpdate,
   initializeUpdateQueue,
   cloneUpdateQueue,
-} from './ReactFiberClassUpdateQueue.old';
-import {NoLanes} from './ReactFiberLane.old';
+} from './ReactFiberClassUpdateQueue';
+import {NoLanes} from './ReactFiberLane';
 import {
   cacheContext,
   getMaskedContext,
   getUnmaskedContext,
   hasContextChanged,
   emptyContextObject,
-} from './ReactFiberContext.old';
-import {readContext, checkIfContextChanged} from './ReactFiberNewContext.old';
+} from './ReactFiberContext';
+import {readContext, checkIfContextChanged} from './ReactFiberNewContext';
 import {
   requestEventTime,
   requestUpdateLane,
   scheduleUpdateOnFiber,
-} from './ReactFiberWorkLoop.old';
+} from './ReactFiberWorkLoop';
 import {logForceUpdateScheduled, logStateUpdateScheduled} from './DebugTracing';
 import {
   markForceUpdateScheduled,
   markStateUpdateScheduled,
   setIsStrictModeForDevtools,
-} from './ReactFiberDevToolsHook.old';
+} from './ReactFiberDevToolsHook';
 
 const fakeInternalInstance = {};
 

packages/react-reconciler/src/ReactFiberClassUpdateQueue.js

@@ -85,7 +85,7 @@
 // resources, but the final state is always the same.
 
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
-import type {Lanes, Lane} from './ReactFiberLane.old';
+import type {Lanes, Lane} from './ReactFiberLane';
 
 import {
   NoLane,
@@ -97,11 +97,11 @@ import {
   isTransitionLane,
   intersectLanes,
   markRootEntangled,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 import {
   enterDisallowedContextReadInDEV,
   exitDisallowedContextReadInDEV,
-} from './ReactFiberNewContext.old';
+} from './ReactFiberNewContext';
 import {
   Callback,
   Visibility,
@@ -116,12 +116,12 @@ import {
   markSkippedUpdateLanes,
   isUnsafeClassRenderPhaseUpdate,
   getWorkInProgressRootRenderLanes,
-} from './ReactFiberWorkLoop.old';
+} from './ReactFiberWorkLoop';
 import {
   enqueueConcurrentClassUpdate,
   unsafe_markUpdateLaneFromFiberToRoot,
-} from './ReactFiberConcurrentUpdates.old';
-import {setIsStrictModeForDevtools} from './ReactFiberDevToolsHook.old';
+} from './ReactFiberConcurrentUpdates';
+import {setIsStrictModeForDevtools} from './ReactFiberDevToolsHook';
 
 import assign from 'shared/assign';
 

packages/react-reconciler/src/ReactFiberCommitWork.js

@@ -16,10 +16,10 @@ import type {
   UpdatePayload,
 } from './ReactFiberHostConfig';
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
-import type {Lanes} from './ReactFiberLane.old';
-import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
-import type {UpdateQueue} from './ReactFiberClassUpdateQueue.old';
-import type {FunctionComponentUpdateQueue} from './ReactFiberHooks.old';
+import type {Lanes} from './ReactFiberLane';
+import type {SuspenseState} from './ReactFiberSuspenseComponent';
+import type {UpdateQueue} from './ReactFiberClassUpdateQueue';
+import type {FunctionComponentUpdateQueue} from './ReactFiberHooks';
 import type {Wakeable} from 'shared/ReactTypes';
 import {isOffscreenManual} from './ReactFiberOffscreenComponent';
 import type {
@@ -29,13 +29,13 @@ import type {
   OffscreenProps,
 } from './ReactFiberOffscreenComponent';
 import type {HookFlags} from './ReactHookEffectTags';
-import type {Cache} from './ReactFiberCacheComponent.old';
-import type {RootState} from './ReactFiberRoot.old';
+import type {Cache} from './ReactFiberCacheComponent';
+import type {RootState} from './ReactFiberRoot';
 import type {
   Transition,
   TracingMarkerInstance,
   TransitionAbort,
-} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberTracingMarkerComponent';
 
 import {
   enableCreateEventHandleAPI,
@@ -100,7 +100,7 @@ import {
   setCurrentFiber as setCurrentDebugFiberInDEV,
   getCurrentFiber as getCurrentDebugFiberInDEV,
 } from './ReactCurrentFiber';
-import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
+import {resolveDefaultProps} from './ReactFiberLazyComponent';
 import {
   isCurrentUpdateNested,
   getCommitTime,
@@ -108,13 +108,13 @@ import {
   startLayoutEffectTimer,
   recordPassiveEffectDuration,
   startPassiveEffectTimer,
-} from './ReactProfilerTimer.old';
+} from './ReactProfilerTimer';
 import {ConcurrentMode, NoMode, ProfileMode} from './ReactTypeOfMode';
 import {
   deferHiddenCallbacks,
   commitHiddenCallbacks,
   commitCallbacks,
-} from './ReactFiberClassUpdateQueue.old';
+} from './ReactFiberClassUpdateQueue';
 import {
   getPublicInstance,
   supportsMutation,
@@ -171,7 +171,7 @@ import {
   CommitContext,
   RenderContext,
   NoContext,
-} from './ReactFiberWorkLoop.old';
+} from './ReactFiberWorkLoop';
 import {
   NoFlags as NoHookEffect,
   HasEffect as HookHasEffect,
@@ -179,7 +179,7 @@ import {
   Insertion as HookInsertion,
   Passive as HookPassive,
 } from './ReactHookEffectTags';
-import {didWarnAboutReassigningProps} from './ReactFiberBeginWork.old';
+import {didWarnAboutReassigningProps} from './ReactFiberBeginWork';
 import {doesFiberContain} from './ReactFiberTreeReflection';
 import {invokeGuardedCallback, clearCaughtError} from 'shared/ReactErrorUtils';
 import {
@@ -193,9 +193,9 @@ import {
   markComponentLayoutEffectUnmountStarted,
   markComponentLayoutEffectUnmountStopped,
   onCommitUnmount,
-} from './ReactFiberDevToolsHook.old';
-import {releaseCache, retainCache} from './ReactFiberCacheComponent.old';
-import {clearTransitionsForLanes} from './ReactFiberLane.old';
+} from './ReactFiberDevToolsHook';
+import {releaseCache, retainCache} from './ReactFiberCacheComponent';
+import {clearTransitionsForLanes} from './ReactFiberLane';
 import {
   OffscreenVisible,
   OffscreenDetached,
@@ -204,7 +204,7 @@ import {
 import {
   TransitionRoot,
   TransitionTracingMarker,
-} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberTracingMarkerComponent';
 
 let didWarnAboutUndefinedSnapshotBeforeUpdate: Set<mixed> | null = null;
 if (__DEV__) {

packages/react-reconciler/src/ReactFiberCompleteWork.js

@@ -8,8 +8,8 @@
  */
 
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
-import type {RootState} from './ReactFiberRoot.old';
-import type {Lanes, Lane} from './ReactFiberLane.old';
+import type {RootState} from './ReactFiberRoot';
+import type {Lanes, Lane} from './ReactFiberLane';
 import type {
   ReactScopeInstance,
   ReactContext,
@@ -25,11 +25,11 @@ import type {
 import type {
   SuspenseState,
   SuspenseListRenderState,
-} from './ReactFiberSuspenseComponent.old';
+} from './ReactFiberSuspenseComponent';
 import {isOffscreenManual} from './ReactFiberOffscreenComponent';
 import type {OffscreenState} from './ReactFiberOffscreenComponent';
-import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent.old';
-import type {Cache} from './ReactFiberCacheComponent.old';
+import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
+import type {Cache} from './ReactFiberCacheComponent';
 import {
   enableLegacyHidden,
   enableHostSingletons,
@@ -41,7 +41,7 @@ import {
   enableFloat,
 } from 'shared/ReactFeatureFlags';
 
-import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource.old';
+import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource';
 
 import {now} from './Scheduler';
 
@@ -117,7 +117,7 @@ import {
   popHostContext,
   getHostContext,
   popHostContainer,
-} from './ReactFiberHostContext.old';
+} from './ReactFiberHostContext';
 import {
   suspenseStackCursor,
   popSuspenseListContext,
@@ -127,15 +127,15 @@ import {
   ForceSuspenseFallback,
   setDefaultShallowSuspenseListContext,
   isBadSuspenseFallback,
-} from './ReactFiberSuspenseContext.old';
-import {popHiddenContext} from './ReactFiberHiddenContext.old';
-import {findFirstSuspended} from './ReactFiberSuspenseComponent.old';
+} from './ReactFiberSuspenseContext';
+import {popHiddenContext} from './ReactFiberHiddenContext';
+import {findFirstSuspended} from './ReactFiberSuspenseComponent';
 import {
   isContextProvider as isLegacyContextProvider,
   popContext as popLegacyContext,
   popTopLevelContextObject as popTopLevelLegacyContextObject,
-} from './ReactFiberContext.old';
-import {popProvider} from './ReactFiberNewContext.old';
+} from './ReactFiberContext';
+import {popProvider} from './ReactFiberNewContext';
 import {
   prepareToHydrateHostInstance,
   prepareToHydrateHostTextInstance,
@@ -146,31 +146,31 @@ import {
   getIsHydrating,
   hasUnhydratedTailNodes,
   upgradeHydrationErrorsToRecoverable,
-} from './ReactFiberHydrationContext.old';
+} from './ReactFiberHydrationContext';
 import {
   renderDidSuspend,
   renderDidSuspendDelayIfPossible,
   renderHasNotSuspendedYet,
   getRenderTargetTime,
   getWorkInProgressTransitions,
-} from './ReactFiberWorkLoop.old';
+} from './ReactFiberWorkLoop';
 import {
   OffscreenLane,
   SomeRetryLane,
   NoLanes,
   includesSomeLane,
   mergeLanes,
-} from './ReactFiberLane.old';
-import {resetChildFibers} from './ReactChildFiber.old';
-import {createScopeInstance} from './ReactFiberScope.old';
-import {transferActualDuration} from './ReactProfilerTimer.old';
-import {popCacheProvider} from './ReactFiberCacheComponent.old';
-import {popTreeContext} from './ReactFiberTreeContext.old';
-import {popRootTransition, popTransition} from './ReactFiberTransition.old';
+} from './ReactFiberLane';
+import {resetChildFibers} from './ReactChildFiber';
+import {createScopeInstance} from './ReactFiberScope';
+import {transferActualDuration} from './ReactProfilerTimer';
+import {popCacheProvider} from './ReactFiberCacheComponent';
+import {popTreeContext} from './ReactFiberTreeContext';
+import {popRootTransition, popTransition} from './ReactFiberTransition';
 import {
   popMarkerInstance,
   popRootMarkerInstance,
-} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberTracingMarkerComponent';
 
 function markUpdate(workInProgress: Fiber) {
   // Tag the fiber with an update effect. This turns a Placement into

packages/react-reconciler/src/ReactFiberConcurrentUpdates.js

@@ -11,25 +11,20 @@ import type {Fiber, FiberRoot} from './ReactInternalTypes';
 import type {
   UpdateQueue as HookQueue,
   Update as HookUpdate,
-} from './ReactFiberHooks.old';
+} from './ReactFiberHooks';
 import type {
   SharedQueue as ClassQueue,
   Update as ClassUpdate,
-} from './ReactFiberClassUpdateQueue.old';
-import type {Lane, Lanes} from './ReactFiberLane.old';
+} from './ReactFiberClassUpdateQueue';
+import type {Lane, Lanes} from './ReactFiberLane';
 import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
 
 import {
   warnAboutUpdateOnNotYetMountedFiberInDEV,
   throwIfInfiniteUpdateLoopDetected,
   getWorkInProgressRoot,
-} from './ReactFiberWorkLoop.old';
-import {
-  NoLane,
-  NoLanes,
-  mergeLanes,
-  markHiddenUpdate,
-} from './ReactFiberLane.old';
+} from './ReactFiberWorkLoop';
+import {NoLane, NoLanes, mergeLanes, markHiddenUpdate} from './ReactFiberLane';
 import {NoFlags, Placement, Hydrating} from './ReactFiberFlags';
 import {HostRoot, OffscreenComponent} from './ReactWorkTags';
 import {OffscreenVisible} from './ReactFiberOffscreenComponent';

packages/react-reconciler/src/ReactFiberContext.js

@@ -8,7 +8,7 @@
  */
 
 import type {Fiber} from './ReactInternalTypes';
-import type {StackCursor} from './ReactFiberStack.old';
+import type {StackCursor} from './ReactFiberStack';
 
 import {isFiberMounted} from './ReactFiberTreeReflection';
 import {disableLegacyContext} from 'shared/ReactFeatureFlags';
@@ -16,7 +16,7 @@ import {ClassComponent, HostRoot} from './ReactWorkTags';
 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
 import checkPropTypes from 'shared/checkPropTypes';
 
-import {createCursor, push, pop} from './ReactFiberStack.old';
+import {createCursor, push, pop} from './ReactFiberStack';
 
 let warnedAboutMissingGetChildContext;
 

packages/react-reconciler/src/ReactFiberDevToolsHook.js

@@ -7,20 +7,17 @@
  * @flow
  */
 
-import type {Lane, Lanes} from './ReactFiberLane.old';
+import type {Lane, Lanes} from './ReactFiberLane';
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
 import type {ReactNodeList, Wakeable} from 'shared/ReactTypes';
-import type {EventPriority} from './ReactEventPriorities.old';
+import type {EventPriority} from './ReactEventPriorities';
 // import type {DevToolsProfilingHooks} from 'react-devtools-shared/src/backend/types';
 // TODO: This import doesn't work because the DevTools depend on the DOM version of React
 // and to properly type check against DOM React we can't also type check again non-DOM
 // React which this hook might be in.
 type DevToolsProfilingHooks = any;
 
-import {
-  getLabelForLane,
-  TotalLanes,
-} from 'react-reconciler/src/ReactFiberLane.old';
+import {getLabelForLane, TotalLanes} from 'react-reconciler/src/ReactFiberLane';
 import {DidCapture} from './ReactFiberFlags';
 import {
   consoleManagedByDevToolsDuringStrictMode,
@@ -32,7 +29,7 @@ import {
   ContinuousEventPriority,
   DefaultEventPriority,
   IdleEventPriority,
-} from './ReactEventPriorities.old';
+} from './ReactEventPriorities';
 import {
   ImmediatePriority as ImmediateSchedulerPriority,
   UserBlockingPriority as UserBlockingSchedulerPriority,

packages/react-reconciler/src/ReactFiberHiddenContext.js

@@ -8,13 +8,13 @@
  */
 
 import type {Fiber} from './ReactInternalTypes';
-import type {StackCursor} from './ReactFiberStack.old';
-import type {Lanes} from './ReactFiberLane.old';
+import type {StackCursor} from './ReactFiberStack';
+import type {Lanes} from './ReactFiberLane';
 
-import {createCursor, push, pop} from './ReactFiberStack.old';
+import {createCursor, push, pop} from './ReactFiberStack';
 
-import {getRenderLanes, setRenderLanes} from './ReactFiberWorkLoop.old';
-import {NoLanes, mergeLanes} from './ReactFiberLane.old';
+import {getRenderLanes, setRenderLanes} from './ReactFiberWorkLoop';
+import {NoLanes, mergeLanes} from './ReactFiberLane';
 
 // TODO: Remove `renderLanes` context in favor of hidden context
 type HiddenContext = {

packages/react-reconciler/src/ReactFiberHooks.js

@@ -23,7 +23,7 @@ import type {
   HookType,
   MemoCache,
 } from './ReactInternalTypes';
-import type {Lanes, Lane} from './ReactFiberLane.old';
+import type {Lanes, Lane} from './ReactFiberLane';
 import type {HookFlags} from './ReactHookEffectTags';
 import type {Flags} from './ReactFiberFlags';
 
@@ -71,14 +71,14 @@ import {
   markRootEntangled,
   markRootMutableRead,
   NoTimestamp,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 import {
   ContinuousEventPriority,
   getCurrentUpdatePriority,
   setCurrentUpdatePriority,
   higherEventPriority,
-} from './ReactEventPriorities.old';
-import {readContext, checkIfContextChanged} from './ReactFiberNewContext.old';
+} from './ReactEventPriorities';
+import {readContext, checkIfContextChanged} from './ReactFiberNewContext';
 import {HostRoot, CacheComponent} from './ReactWorkTags';
 import {
   LayoutStatic as LayoutStaticEffect,
@@ -104,7 +104,7 @@ import {
   requestEventTime,
   markSkippedUpdateLanes,
   isInvalidExecutionContextForEventFunction,
-} from './ReactFiberWorkLoop.old';
+} from './ReactFiberWorkLoop';
 
 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
 import is from 'shared/objectIs';
@@ -112,38 +112,38 @@ import isArray from 'shared/isArray';
 import {
   markWorkInProgressReceivedUpdate,
   checkIfWorkInProgressReceivedUpdate,
-} from './ReactFiberBeginWork.old';
-import {getIsHydrating} from './ReactFiberHydrationContext.old';
+} from './ReactFiberBeginWork';
+import {getIsHydrating} from './ReactFiberHydrationContext';
 import {
   getWorkInProgressVersion,
   markSourceAsDirty,
   setWorkInProgressVersion,
   warnAboutMultipleRenderersDEV,
-} from './ReactMutableSource.old';
+} from './ReactMutableSource';
 import {logStateUpdateScheduled} from './DebugTracing';
 import {
   markStateUpdateScheduled,
   setIsStrictModeForDevtools,
-} from './ReactFiberDevToolsHook.old';
-import {createCache} from './ReactFiberCacheComponent.old';
+} from './ReactFiberDevToolsHook';
+import {createCache} from './ReactFiberCacheComponent';
 import {
   createUpdate as createLegacyQueueUpdate,
   enqueueUpdate as enqueueLegacyQueueUpdate,
   entangleTransitions as entangleLegacyQueueTransitions,
-} from './ReactFiberClassUpdateQueue.old';
+} from './ReactFiberClassUpdateQueue';
 import {
   enqueueConcurrentHookUpdate,
   enqueueConcurrentHookUpdateAndEagerlyBailout,
   enqueueConcurrentRenderForLane,
-} from './ReactFiberConcurrentUpdates.old';
-import {getTreeId} from './ReactFiberTreeContext.old';
+} from './ReactFiberConcurrentUpdates';
+import {getTreeId} from './ReactFiberTreeContext';
 import {now} from './Scheduler';
 import {
   trackUsedThenable,
   checkIfUseWrappedInTryCatch,
   createThenableState,
-} from './ReactFiberThenable.old';
-import type {ThenableState} from './ReactFiberThenable.old';
+} from './ReactFiberThenable';
+import type {ThenableState} from './ReactFiberThenable';
 
 const {ReactCurrentDispatcher, ReactCurrentBatchConfig} = ReactSharedInternals;
 

packages/react-reconciler/src/ReactFiberHostContext.js

@@ -8,11 +8,11 @@
  */
 
 import type {Fiber} from './ReactInternalTypes';
-import type {StackCursor} from './ReactFiberStack.old';
+import type {StackCursor} from './ReactFiberStack';
 import type {Container, HostContext} from './ReactFiberHostConfig';
 
 import {getChildHostContext, getRootHostContext} from './ReactFiberHostConfig';
-import {createCursor, push, pop} from './ReactFiberStack.old';
+import {createCursor, push, pop} from './ReactFiberStack';
 
 const contextStackCursor: StackCursor<HostContext | null> = createCursor(null);
 const contextFiberStackCursor: StackCursor<Fiber | null> = createCursor(null);

packages/react-reconciler/src/ReactFiberHotReloading.js

@@ -19,11 +19,11 @@ import {
   flushSync,
   scheduleUpdateOnFiber,
   flushPassiveEffects,
-} from './ReactFiberWorkLoop.old';
-import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates.old';
-import {updateContainer} from './ReactFiberReconciler.old';
-import {emptyContextObject} from './ReactFiberContext.old';
-import {SyncLane, NoTimestamp} from './ReactFiberLane.old';
+} from './ReactFiberWorkLoop';
+import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates';
+import {updateContainer} from './ReactFiberReconciler';
+import {emptyContextObject} from './ReactFiberContext';
+import {SyncLane, NoTimestamp} from './ReactFiberLane';
 import {
   ClassComponent,
   FunctionComponent,

packages/react-reconciler/src/ReactFiberHydrationContext.js

@@ -17,8 +17,8 @@ import type {
   Container,
   HostContext,
 } from './ReactFiberHostConfig';
-import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
-import type {TreeContext} from './ReactFiberTreeContext.old';
+import type {SuspenseState} from './ReactFiberSuspenseComponent';
+import type {TreeContext} from './ReactFiberTreeContext';
 import type {CapturedValue} from './ReactCapturedValue';
 
 import {
@@ -40,7 +40,7 @@ import {enableHostSingletons, enableFloat} from 'shared/ReactFeatureFlags';
 import {
   createFiberFromHostInstanceForDeletion,
   createFiberFromDehydratedFragment,
-} from './ReactFiber.old';
+} from './ReactFiber';
 import {
   shouldSetTextContent,
   supportsHydration,
@@ -74,16 +74,13 @@ import {
   didNotFindHydratableSuspenseInstance,
   resolveSingletonInstance,
 } from './ReactFiberHostConfig';
-import {OffscreenLane} from './ReactFiberLane.old';
+import {OffscreenLane} from './ReactFiberLane';
 import {
   getSuspendedTreeContext,
   restoreSuspendedTreeContext,
-} from './ReactFiberTreeContext.old';
-import {queueRecoverableErrors} from './ReactFiberWorkLoop.old';
-import {
-  getRootHostContainer,
-  getHostContext,
-} from './ReactFiberHostContext.old';
+} from './ReactFiberTreeContext';
+import {queueRecoverableErrors} from './ReactFiberWorkLoop';
+import {getRootHostContainer, getHostContext} from './ReactFiberHostContext';
 
 // The deepest Fiber on the stack involved in a hydration context.
 // This may have been an insertion or a hydration.

packages/react-reconciler/src/ReactFiberLane.js

@@ -8,8 +8,8 @@
  */
 
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
-import type {Transition} from './ReactFiberTracingMarkerComponent.old';
-import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates.old';
+import type {Transition} from './ReactFiberTracingMarkerComponent';
+import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates';
 
 // TODO: Ideally these types would be opaque but that doesn't work well with
 // our reconciler fork infra, since these leak into non-reconciler packages.
@@ -24,7 +24,7 @@ import {
   allowConcurrentByDefault,
   enableTransitionTracing,
 } from 'shared/ReactFeatureFlags';
-import {isDevToolsPresent} from './ReactFiberDevToolsHook.old';
+import {isDevToolsPresent} from './ReactFiberDevToolsHook';
 import {ConcurrentUpdatesByDefaultMode, NoMode} from './ReactTypeOfMode';
 import {clz32} from './clz32';
 

packages/react-reconciler/src/ReactFiberNewContext.js

@@ -13,12 +13,12 @@ import type {
   ContextDependency,
   Dependencies,
 } from './ReactInternalTypes';
-import type {StackCursor} from './ReactFiberStack.old';
-import type {Lanes} from './ReactFiberLane.old';
-import type {SharedQueue} from './ReactFiberClassUpdateQueue.old';
+import type {StackCursor} from './ReactFiberStack';
+import type {Lanes} from './ReactFiberLane';
+import type {SharedQueue} from './ReactFiberClassUpdateQueue';
 
 import {isPrimaryRenderer} from './ReactFiberHostConfig';
-import {createCursor, push, pop} from './ReactFiberStack.old';
+import {createCursor, push, pop} from './ReactFiberStack';
 import {
   ContextProvider,
   ClassComponent,
@@ -31,7 +31,7 @@ import {
   includesSomeLane,
   mergeLanes,
   pickArbitraryLane,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 import {
   NoFlags,
   DidPropagateContext,
@@ -39,8 +39,8 @@ import {
 } from './ReactFiberFlags';
 
 import is from 'shared/objectIs';
-import {createUpdate, ForceUpdate} from './ReactFiberClassUpdateQueue.old';
-import {markWorkInProgressReceivedUpdate} from './ReactFiberBeginWork.old';
+import {createUpdate, ForceUpdate} from './ReactFiberClassUpdateQueue';
+import {markWorkInProgressReceivedUpdate} from './ReactFiberBeginWork';
 import {
   enableLazyContextPropagation,
   enableServerContext,

packages/react-reconciler/src/ReactFiberOffscreenComponent.js

@@ -8,13 +8,13 @@
  */
 
 import type {ReactNodeList, OffscreenMode, Wakeable} from 'shared/ReactTypes';
-import type {Lanes} from './ReactFiberLane.old';
-import type {SpawnedCachePool} from './ReactFiberCacheComponent.old';
+import type {Lanes} from './ReactFiberLane';
+import type {SpawnedCachePool} from './ReactFiberCacheComponent';
 import type {Fiber} from './ReactInternalTypes';
 import type {
   Transition,
   TracingMarkerInstance,
-} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberTracingMarkerComponent';
 
 export type OffscreenProps = {
   // TODO: Pick an API before exposing the Offscreen type. I've chosen an enum

packages/react-reconciler/src/ReactFiberReconciler.js

@@ -22,8 +22,8 @@ import type {
   RendererInspectionConfig,
 } from './ReactFiberHostConfig';
 import type {ReactNodeList} from 'shared/ReactTypes';
-import type {Lane} from './ReactFiberLane.old';
-import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
+import type {Lane} from './ReactFiberLane';
+import type {SuspenseState} from './ReactFiberSuspenseComponent';
 
 import {
   findCurrentHostFiber,
@@ -47,14 +47,14 @@ import {
   processChildContext,
   emptyContextObject,
   isContextProvider as isLegacyContextProvider,
-} from './ReactFiberContext.old';
-import {createFiberRoot} from './ReactFiberRoot.old';
+} from './ReactFiberContext';
+import {createFiberRoot} from './ReactFiberRoot';
 import {isRootDehydrated} from './ReactFiberShellHydration';
 import {
   injectInternals,
   markRenderScheduled,
   onScheduleRoot,
-} from './ReactFiberDevToolsHook.old';
+} from './ReactFiberDevToolsHook';
 import {
   requestEventTime,
   requestUpdateLane,
@@ -68,13 +68,13 @@ import {
   deferredUpdates,
   discreteUpdates,
   flushPassiveEffects,
-} from './ReactFiberWorkLoop.old';
-import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates.old';
+} from './ReactFiberWorkLoop';
+import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates';
 import {
   createUpdate,
   enqueueUpdate,
   entangleTransitions,
-} from './ReactFiberClassUpdateQueue.old';
+} from './ReactFiberClassUpdateQueue';
 import {
   isRendering as ReactCurrentFiberIsRendering,
   current as ReactCurrentFiberCurrent,
@@ -88,19 +88,19 @@ import {
   NoTimestamp,
   getHighestPriorityPendingLanes,
   higherPriorityLane,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 import {
   getCurrentUpdatePriority,
   runWithPriority,
-} from './ReactEventPriorities.old';
+} from './ReactEventPriorities';
 import {
   scheduleRefresh,
   scheduleRoot,
   setRefreshHandler,
   findHostInstancesForRefresh,
-} from './ReactFiberHotReloading.old';
+} from './ReactFiberHotReloading';
 import ReactVersion from 'shared/ReactVersion';
-export {registerMutableSourceForHydration} from './ReactMutableSource.old';
+export {registerMutableSourceForHydration} from './ReactMutableSource';
 export {createPortal} from './ReactPortal';
 export {
   createComponentSelector,

packages/react-reconciler/src/ReactFiberRoot.js

@@ -14,18 +14,18 @@ import type {
   TransitionTracingCallbacks,
 } from './ReactInternalTypes';
 import type {RootTag} from './ReactRootTags';
-import type {Cache} from './ReactFiberCacheComponent.old';
+import type {Cache} from './ReactFiberCacheComponent';
 import type {Container} from './ReactFiberHostConfig';
 
 import {noTimeout, supportsHydration} from './ReactFiberHostConfig';
-import {createHostRootFiber} from './ReactFiber.old';
+import {createHostRootFiber} from './ReactFiber';
 import {
   NoLane,
   NoLanes,
   NoTimestamp,
   TotalLanes,
   createLaneMap,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 import {
   enableSuspenseCallback,
   enableCache,
@@ -34,9 +34,9 @@ import {
   enableUpdaterTracking,
   enableTransitionTracing,
 } from 'shared/ReactFeatureFlags';
-import {initializeUpdateQueue} from './ReactFiberClassUpdateQueue.old';
+import {initializeUpdateQueue} from './ReactFiberClassUpdateQueue';
 import {LegacyRoot, ConcurrentRoot} from './ReactRootTags';
-import {createCache, retainCache} from './ReactFiberCacheComponent.old';
+import {createCache, retainCache} from './ReactFiberCacheComponent';
 
 export type RootState = {
   element: any,

packages/react-reconciler/src/ReactFiberShellHydration.js

@@ -8,7 +8,7 @@
  */
 
 import type {FiberRoot} from './ReactInternalTypes';
-import type {RootState} from './ReactFiberRoot.old';
+import type {RootState} from './ReactFiberRoot';
 
 // This is imported by the event replaying implementation in React DOM. It's
 // in a separate file to break a circular dependency between the renderer and

packages/react-reconciler/src/ReactFiberSuspenseComponent.js

@@ -10,8 +10,8 @@
 import type {ReactNodeList, Wakeable} from 'shared/ReactTypes';
 import type {Fiber} from './ReactInternalTypes';
 import type {SuspenseInstance} from './ReactFiberHostConfig';
-import type {Lane} from './ReactFiberLane.old';
-import type {TreeContext} from './ReactFiberTreeContext.old';
+import type {Lane} from './ReactFiberLane';
+import type {TreeContext} from './ReactFiberTreeContext';
 
 import {SuspenseComponent, SuspenseListComponent} from './ReactWorkTags';
 import {NoFlags, DidCapture} from './ReactFiberFlags';

packages/react-reconciler/src/ReactFiberSuspenseContext.js

@@ -8,15 +8,12 @@
  */
 
 import type {Fiber} from './ReactInternalTypes';
-import type {StackCursor} from './ReactFiberStack.old';
-import type {
-  SuspenseState,
-  SuspenseProps,
-} from './ReactFiberSuspenseComponent.old';
+import type {StackCursor} from './ReactFiberStack';
+import type {SuspenseState, SuspenseProps} from './ReactFiberSuspenseComponent';
 
 import {enableSuspenseAvoidThisFallback} from 'shared/ReactFeatureFlags';
-import {createCursor, push, pop} from './ReactFiberStack.old';
-import {isCurrentTreeHidden} from './ReactFiberHiddenContext.old';
+import {createCursor, push, pop} from './ReactFiberStack';
+import {isCurrentTreeHidden} from './ReactFiberHiddenContext';
 import {SuspenseComponent, OffscreenComponent} from './ReactWorkTags';
 
 // The Suspense handler is the boundary that should capture if something

packages/react-reconciler/src/ReactFiberSyncTaskQueue.js

@@ -13,7 +13,7 @@ import {
   DiscreteEventPriority,
   getCurrentUpdatePriority,
   setCurrentUpdatePriority,
-} from './ReactEventPriorities.old';
+} from './ReactEventPriorities';
 import {ImmediatePriority, scheduleCallback} from './Scheduler';
 
 let syncQueue: Array<SchedulerCallback> | null = null;

packages/react-reconciler/src/ReactFiberThrow.js

@@ -8,9 +8,9 @@
  */
 
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
-import type {Lane, Lanes} from './ReactFiberLane.old';
+import type {Lane, Lanes} from './ReactFiberLane';
 import type {CapturedValue} from './ReactCapturedValue';
-import type {Update} from './ReactFiberClassUpdateQueue.old';
+import type {Update} from './ReactFiberClassUpdateQueue';
 import type {Wakeable} from 'shared/ReactTypes';
 import type {OffscreenQueue} from './ReactFiberOffscreenComponent';
 
@@ -47,9 +47,9 @@ import {
   CaptureUpdate,
   ForceUpdate,
   enqueueUpdate,
-} from './ReactFiberClassUpdateQueue.old';
-import {markFailedErrorBoundaryForHotReloading} from './ReactFiberHotReloading.old';
-import {getSuspenseHandler} from './ReactFiberSuspenseContext.old';
+} from './ReactFiberClassUpdateQueue';
+import {markFailedErrorBoundaryForHotReloading} from './ReactFiberHotReloading';
+import {getSuspenseHandler} from './ReactFiberSuspenseContext';
 import {
   renderDidError,
   renderDidSuspendDelayIfPossible,
@@ -58,23 +58,23 @@ import {
   isAlreadyFailedLegacyErrorBoundary,
   attachPingListener,
   restorePendingUpdaters,
-} from './ReactFiberWorkLoop.old';
-import {propagateParentContextChangesToDeferredTree} from './ReactFiberNewContext.old';
+} from './ReactFiberWorkLoop';
+import {propagateParentContextChangesToDeferredTree} from './ReactFiberNewContext';
 import {logCapturedError} from './ReactFiberErrorLogger';
 import {logComponentSuspended} from './DebugTracing';
-import {isDevToolsPresent} from './ReactFiberDevToolsHook.old';
+import {isDevToolsPresent} from './ReactFiberDevToolsHook';
 import {
   SyncLane,
   NoTimestamp,
   includesSomeLane,
   mergeLanes,
   pickArbitraryLane,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 import {
   getIsHydrating,
   markDidThrowWhileHydratingDEV,
   queueHydrationError,
-} from './ReactFiberHydrationContext.old';
+} from './ReactFiberHydrationContext';
 import {ConcurrentRoot} from './ReactRootTags';
 
 function createRootErrorUpdate(

packages/react-reconciler/src/ReactFiberTracingMarkerComponent.js

@@ -13,11 +13,11 @@ import type {
   FiberRoot,
 } from './ReactInternalTypes';
 import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
-import type {StackCursor} from './ReactFiberStack.old';
+import type {StackCursor} from './ReactFiberStack';
 
 import {enableTransitionTracing} from 'shared/ReactFeatureFlags';
-import {createCursor, push, pop} from './ReactFiberStack.old';
-import {getWorkInProgressTransitions} from './ReactFiberWorkLoop.old';
+import {createCursor, push, pop} from './ReactFiberStack';
+import {getWorkInProgressTransitions} from './ReactFiberWorkLoop';
 
 export type SuspenseInfo = {name: string | null};
 

packages/react-reconciler/src/ReactFiberTransition.js

@@ -7,23 +7,23 @@
  * @flow
  */
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
-import type {Lanes} from './ReactFiberLane.old';
-import type {StackCursor} from './ReactFiberStack.old';
-import type {Cache, SpawnedCachePool} from './ReactFiberCacheComponent.old';
-import type {Transition} from './ReactFiberTracingMarkerComponent.old';
+import type {Lanes} from './ReactFiberLane';
+import type {StackCursor} from './ReactFiberStack';
+import type {Cache, SpawnedCachePool} from './ReactFiberCacheComponent';
+import type {Transition} from './ReactFiberTracingMarkerComponent';
 
 import {enableCache, enableTransitionTracing} from 'shared/ReactFeatureFlags';
 import {isPrimaryRenderer} from './ReactFiberHostConfig';
-import {createCursor, push, pop} from './ReactFiberStack.old';
+import {createCursor, push, pop} from './ReactFiberStack';
 import {
   getWorkInProgressRoot,
   getWorkInProgressTransitions,
-} from './ReactFiberWorkLoop.old';
+} from './ReactFiberWorkLoop';
 import {
   createCache,
   retainCache,
   CacheContext,
-} from './ReactFiberCacheComponent.old';
+} from './ReactFiberCacheComponent';
 
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 

packages/react-reconciler/src/ReactFiberTreeContext.js

@@ -62,7 +62,7 @@
 
 import type {Fiber} from 'react-reconciler/src/ReactInternalTypes';
 
-import {getIsHydrating} from './ReactFiberHydrationContext.old';
+import {getIsHydrating} from './ReactFiberHydrationContext';
 import {clz32} from './clz32';
 import {Forked, NoFlags} from './ReactFiberFlags';
 

packages/react-reconciler/src/ReactFiberTreeReflection.js

@@ -9,7 +9,7 @@
 
 import type {Fiber} from './ReactInternalTypes';
 import type {Container, SuspenseInstance} from './ReactFiberHostConfig';
-import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
+import type {SuspenseState} from './ReactFiberSuspenseComponent';
 
 import {get as getInstance} from 'shared/ReactInstanceMap';
 import ReactSharedInternals from 'shared/ReactSharedInternals';

packages/react-reconciler/src/ReactFiberUnwindWork.js

@@ -9,12 +9,12 @@
 
 import type {ReactContext} from 'shared/ReactTypes';
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
-import type {Lanes} from './ReactFiberLane.old';
-import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
-import type {Cache} from './ReactFiberCacheComponent.old';
-import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent.old';
+import type {Lanes} from './ReactFiberLane';
+import type {SuspenseState} from './ReactFiberSuspenseComponent';
+import type {Cache} from './ReactFiberCacheComponent';
+import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
 
-import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource.old';
+import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource';
 import {
   ClassComponent,
   HostRoot,
@@ -38,27 +38,27 @@ import {
   enableTransitionTracing,
 } from 'shared/ReactFeatureFlags';
 
-import {popHostContainer, popHostContext} from './ReactFiberHostContext.old';
+import {popHostContainer, popHostContext} from './ReactFiberHostContext';
 import {
   popSuspenseListContext,
   popSuspenseHandler,
-} from './ReactFiberSuspenseContext.old';
-import {popHiddenContext} from './ReactFiberHiddenContext.old';
-import {resetHydrationState} from './ReactFiberHydrationContext.old';
+} from './ReactFiberSuspenseContext';
+import {popHiddenContext} from './ReactFiberHiddenContext';
+import {resetHydrationState} from './ReactFiberHydrationContext';
 import {
   isContextProvider as isLegacyContextProvider,
   popContext as popLegacyContext,
   popTopLevelContextObject as popTopLevelLegacyContextObject,
-} from './ReactFiberContext.old';
-import {popProvider} from './ReactFiberNewContext.old';
-import {popCacheProvider} from './ReactFiberCacheComponent.old';
-import {transferActualDuration} from './ReactProfilerTimer.old';
-import {popTreeContext} from './ReactFiberTreeContext.old';
-import {popRootTransition, popTransition} from './ReactFiberTransition.old';
+} from './ReactFiberContext';
+import {popProvider} from './ReactFiberNewContext';
+import {popCacheProvider} from './ReactFiberCacheComponent';
+import {transferActualDuration} from './ReactProfilerTimer';
+import {popTreeContext} from './ReactFiberTreeContext';
+import {popRootTransition, popTransition} from './ReactFiberTransition';
 import {
   popMarkerInstance,
   popRootMarkerInstance,
-} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberTracingMarkerComponent';
 
 function unwindWork(
   current: Fiber | null,

packages/react-reconciler/src/ReactFiberWorkLoop.js

@@ -11,19 +11,16 @@ import {REACT_STRICT_MODE_TYPE} from 'shared/ReactSymbols';
 
 import type {Wakeable, Thenable} from 'shared/ReactTypes';
 import type {Fiber, FiberRoot} from './ReactInternalTypes';
-import type {Lanes, Lane} from './ReactFiberLane.old';
-import type {
-  SuspenseProps,
-  SuspenseState,
-} from './ReactFiberSuspenseComponent.old';
-import type {FunctionComponentUpdateQueue} from './ReactFiberHooks.old';
-import type {EventPriority} from './ReactEventPriorities.old';
+import type {Lanes, Lane} from './ReactFiberLane';
+import type {SuspenseProps, SuspenseState} from './ReactFiberSuspenseComponent';
+import type {FunctionComponentUpdateQueue} from './ReactFiberHooks';
+import type {EventPriority} from './ReactEventPriorities';
 import type {
   PendingTransitionCallbacks,
   PendingBoundaries,
   Transition,
   TransitionAbort,
-} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberTracingMarkerComponent';
 import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
 
 import {
@@ -64,7 +61,7 @@ import {
   flushSyncCallbacksOnlyInLegacyMode,
   scheduleSyncCallback,
   scheduleLegacySyncCallback,
-} from './ReactFiberSyncTaskQueue.old';
+} from './ReactFiberSyncTaskQueue';
 import {
   logCommitStarted,
   logCommitStopped,
@@ -94,9 +91,9 @@ import {
   createWorkInProgress,
   assignFiberPropertiesInDEV,
   resetWorkInProgress,
-} from './ReactFiber.old';
+} from './ReactFiber';
 import {isRootDehydrated} from './ReactFiberShellHydration';
-import {didSuspendOrErrorWhileHydratingDEV} from './ReactFiberHydrationContext.old';
+import {didSuspendOrErrorWhileHydratingDEV} from './ReactFiberHydrationContext';
 import {
   NoMode,
   ProfileMode,
@@ -165,7 +162,7 @@ import {
   movePendingFibersToMemoized,
   addTransitionToLanesMap,
   getTransitionsForLanes,
-} from './ReactFiberLane.old';
+} from './ReactFiberLane';
 import {
   DiscreteEventPriority,
   ContinuousEventPriority,
@@ -175,23 +172,20 @@ import {
   setCurrentUpdatePriority,
   lowerEventPriority,
   lanesToEventPriority,
-} from './ReactEventPriorities.old';
-import {
-  requestCurrentTransition,
-  NoTransition,
-} from './ReactFiberTransition.old';
+} from './ReactEventPriorities';
+import {requestCurrentTransition, NoTransition} from './ReactFiberTransition';
 import {
   SelectiveHydrationException,
   beginWork as originalBeginWork,
   replayFunctionComponent,
-} from './ReactFiberBeginWork.old';
-import {completeWork} from './ReactFiberCompleteWork.old';
-import {unwindWork, unwindInterruptedWork} from './ReactFiberUnwindWork.old';
+} from './ReactFiberBeginWork';
+import {completeWork} from './ReactFiberCompleteWork';
+import {unwindWork, unwindInterruptedWork} from './ReactFiberUnwindWork';
 import {
   throwException,
   createRootErrorUpdate,
   createClassErrorUpdate,
-} from './ReactFiberThrow.old';
+} from './ReactFiberThrow';
 import {
   commitBeforeMutationEffects,
   commitLayoutEffects,
@@ -208,15 +202,15 @@ import {
   invokePassiveEffectMountInDEV,
   invokeLayoutEffectUnmountInDEV,
   invokePassiveEffectUnmountInDEV,
-} from './ReactFiberCommitWork.old';
-import {enqueueUpdate} from './ReactFiberClassUpdateQueue.old';
-import {resetContextDependencies} from './ReactFiberNewContext.old';
+} from './ReactFiberCommitWork';
+import {enqueueUpdate} from './ReactFiberClassUpdateQueue';
+import {resetContextDependencies} from './ReactFiberNewContext';
 import {
   resetHooksAfterThrow,
   resetHooksOnUnwind,
   ContextOnlyDispatcher,
-} from './ReactFiberHooks.old';
-import {DefaultCacheDispatcher} from './ReactFiberCache.old';
+} from './ReactFiberHooks';
+import {DefaultCacheDispatcher} from './ReactFiberCache';
 import {
   createCapturedValueAtFiber,
   type CapturedValue,
@@ -225,7 +219,7 @@ import {
   enqueueConcurrentRenderForLane,
   finishQueueingConcurrentUpdates,
   getConcurrentlyUpdatedLanes,
-} from './ReactFiberConcurrentUpdates.old';
+} from './ReactFiberConcurrentUpdates';
 
 import {
   markNestedUpdateScheduled,
@@ -234,11 +228,11 @@ import {
   startProfilerTimer,
   stopProfilerTimerIfRunningAndRecordDelta,
   syncNestedUpdateFlag,
-} from './ReactProfilerTimer.old';
+} from './ReactProfilerTimer';
 
 // DEV stuff
 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
-import ReactStrictModeWarnings from './ReactStrictModeWarnings.old';
+import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {
   isRendering as ReactCurrentDebugFiberIsRenderingInDEV,
   current as ReactCurrentFiberCurrent,
@@ -266,25 +260,25 @@ import {
   markRenderStopped,
   onCommitRoot as onCommitRootDevTools,
   onPostCommitRoot as onPostCommitRootDevTools,
-} from './ReactFiberDevToolsHook.old';
+} from './ReactFiberDevToolsHook';
 import {onCommitRoot as onCommitRootTestSelector} from './ReactTestSelectors';
-import {releaseCache} from './ReactFiberCacheComponent.old';
+import {releaseCache} from './ReactFiberCacheComponent';
 import {
   isLegacyActEnvironment,
   isConcurrentActEnvironment,
-} from './ReactFiberAct.old';
-import {processTransitionCallbacks} from './ReactFiberTracingMarkerComponent.old';
+} from './ReactFiberAct';
+import {processTransitionCallbacks} from './ReactFiberTracingMarkerComponent';
 import {
   SuspenseException,
   getSuspendedThenable,
   isThenableResolved,
-} from './ReactFiberThenable.old';
+} from './ReactFiberThenable';
 import {schedulePostPaintCallback} from './ReactPostPaintCallback';
 import {
   getSuspenseHandler,
   isBadSuspenseFallback,
-} from './ReactFiberSuspenseContext.old';
-import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
+} from './ReactFiberSuspenseContext';
+import {resolveDefaultProps} from './ReactFiberLazyComponent';
 
 const ceil = Math.ceil;
 

packages/react-reconciler/src/ReactInternalTypes.js

@@ -22,7 +22,7 @@ import type {
 import type {WorkTag} from './ReactWorkTags';
 import type {TypeOfMode} from './ReactTypeOfMode';
 import type {Flags} from './ReactFiberFlags';
-import type {Lane, Lanes, LaneMap} from './ReactFiberLane.old';
+import type {Lane, Lanes, LaneMap} from './ReactFiberLane';
 import type {RootTag} from './ReactRootTags';
 import type {
   Container,
@@ -30,12 +30,12 @@ import type {
   NoTimeout,
   SuspenseInstance,
 } from './ReactFiberHostConfig';
-import type {Cache} from './ReactFiberCacheComponent.old';
+import type {Cache} from './ReactFiberCacheComponent';
 import type {
   TracingMarkerInstance,
   Transition,
-} from './ReactFiberTracingMarkerComponent.old';
-import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates.old';
+} from './ReactFiberTracingMarkerComponent';
+import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates';
 
 // Unwind Circular: moved from ReactFiberHooks.old
 export type HookType =

packages/react-reconciler/src/ReactReconcilerConstants.js

@@ -15,5 +15,5 @@ export {
   ContinuousEventPriority,
   DefaultEventPriority,
   IdleEventPriority,
-} from './ReactEventPriorities.old';
+} from './ReactEventPriorities';
 export {ConcurrentRoot, LegacyRoot} from './ReactRootTags';

packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js

@@ -24,7 +24,7 @@ describe('ReactFiberHostContext', () => {
     ReactFiberReconciler = require('react-reconciler');
     ConcurrentRoot = require('react-reconciler/src/ReactRootTags')
       .ConcurrentRoot;
-    DefaultEventPriority = require('react-reconciler/src/ReactEventPriorities.old')
+    DefaultEventPriority = require('react-reconciler/src/ReactEventPriorities')
       .DefaultEventPriority;
   });
 

packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.internal.js

@@ -21,7 +21,7 @@ describe('ReactIncrementalErrorReplay-test', () => {
 
     // This is the method we're going to test.
     // If this is no longer used, you can delete this test file.;
-    const {assignFiberPropertiesInDEV} = require('../ReactFiber.old');
+    const {assignFiberPropertiesInDEV} = require('../ReactFiber');
 
     // Get a real fiber.
     const realFiber = ReactTestRenderer.create(<div />).root._currentFiber();

packages/react-reconciler/src/__tests__/ReactUpdaters-test.internal.js

@@ -81,7 +81,7 @@ describe('updaters', () => {
     };
 
     jest.mock(
-      'react-reconciler/src/ReactFiberDevToolsHook.old',
+      'react-reconciler/src/ReactFiberDevToolsHook',
       () => mockDevToolsHook,
     );
 

packages/react-reconciler/src/forks/ReactFiberErrorDialog.native.js

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {Fiber} from '../ReactFiber.old';
+import type {Fiber} from '../ReactFiber';
 import type {CapturedValue} from '../ReactCapturedValue';
 
 import {ClassComponent} from '../ReactWorkTags';

packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {Fiber} from '../ReactFiber.old';
+import type {Fiber} from '../ReactFiber';
 import type {CapturedValue} from '../ReactCapturedValue';
 
 import {ClassComponent} from '../ReactWorkTags';

packages/react-refresh/src/ReactFreshRuntime.js

@@ -16,7 +16,7 @@ import type {
   ScheduleRoot,
   FindHostInstancesForRefresh,
   SetRefreshHandler,
-} from 'react-reconciler/src/ReactFiberHotReloading.old';
+} from 'react-reconciler/src/ReactFiberHotReloading';
 import type {ReactNodeList} from 'shared/ReactTypes';
 
 import {REACT_MEMO_TYPE, REACT_FORWARD_REF_TYPE} from 'shared/ReactSymbols';

packages/react-test-renderer/src/ReactTestHostConfig.js

@@ -8,7 +8,7 @@
  */
 
 import isArray from 'shared/isArray';
-import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
+import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
 
 export type Type = string;
 export type Props = Object;

packages/react-test-renderer/src/ReactTestRenderer.js

@@ -23,7 +23,7 @@ import {
   flushSync,
   injectIntoDevTools,
   batchedUpdates,
-} from 'react-reconciler/src/ReactFiberReconciler.old';
+} from 'react-reconciler/src/ReactFiberReconciler';
 import {findCurrentFiberUsingSlowPath} from 'react-reconciler/src/ReactFiberTreeReflection';
 import {
   Fragment,

packages/react/src/ReactCurrentBatchConfig.js

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {BatchConfigTransition} from 'react-reconciler/src/ReactFiberTracingMarkerComponent.old';
+import type {BatchConfigTransition} from 'react-reconciler/src/ReactFiberTracingMarkerComponent';
 
 type BatchConfig = {
   transition: BatchConfigTransition | null,