From f101c2d0d3a6cb5a788a3d91faef48462e45f515 Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Thu, 1 Dec 2022 23:19:13 -0500 Subject: [PATCH] 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 | 2 +- packages/react-art/src/ReactARTHostConfig.js | 2 +- .../src/client/ReactDOMFloatClient.js | 2 +- .../src/client/ReactDOMHostConfig.js | 4 +- .../src/events/ReactDOMEventListener.js | 4 +- .../src/events/ReactDOMEventReplaying.js | 4 +- packages/react-dom/src/client/ReactDOM.js | 4 +- .../react-dom/src/client/ReactDOMLegacy.js | 2 +- packages/react-dom/src/client/ReactDOMRoot.js | 2 +- .../react-dom/unstable_testing.classic.fb.js | 2 +- .../unstable_testing.experimental.js | 2 +- packages/react-dom/unstable_testing.js | 2 +- .../react-dom/unstable_testing.modern.fb.js | 2 +- .../react-native-renderer/src/ReactFabric.js | 2 +- .../src/ReactFabricHostConfig.js | 2 +- .../src/ReactNativeHostConfig.js | 2 +- .../src/ReactNativeRenderer.js | 2 +- packages/react-reconciler/index.js | 2 +- packages/react-reconciler/src/DebugTracing.js | 2 +- ...ctChildFiber.old.js => ReactChildFiber.js} | 10 +-- ...orities.old.js => ReactEventPriorities.js} | 4 +- .../src/{ReactFiber.old.js => ReactFiber.js} | 16 ++--- ...{ReactFiberAct.old.js => ReactFiberAct.js} | 2 +- ...eginWork.old.js => ReactFiberBeginWork.js} | 68 +++++++++---------- ...ctFiberCache.old.js => ReactFiberCache.js} | 6 +- ...ent.old.js => ReactFiberCacheComponent.js} | 2 +- ...ent.old.js => ReactFiberClassComponent.js} | 20 +++--- ...e.old.js => ReactFiberClassUpdateQueue.js} | 12 ++-- ...mitWork.old.js => ReactFiberCommitWork.js} | 32 ++++----- ...eWork.old.js => ReactFiberCompleteWork.js} | 44 ++++++------ ....old.js => ReactFiberConcurrentUpdates.js} | 15 ++-- ...berContext.old.js => ReactFiberContext.js} | 4 +- ...sHook.old.js => ReactFiberDevToolsHook.js} | 11 ++- ...text.old.js => ReactFiberHiddenContext.js} | 10 +-- ...ctFiberHooks.old.js => ReactFiberHooks.js} | 30 ++++---- ...ontext.old.js => ReactFiberHostContext.js} | 4 +- ...ading.old.js => ReactFiberHotReloading.js} | 10 +-- ...t.old.js => ReactFiberHydrationContext.js} | 17 ++--- ...eactFiberLane.old.js => ReactFiberLane.js} | 6 +- ...nent.old.js => ReactFiberLazyComponent.js} | 0 ...Context.old.js => ReactFiberNewContext.js} | 14 ++-- .../src/ReactFiberOffscreenComponent.js | 6 +- ...onciler.old.js => ReactFiberReconciler.js} | 24 +++---- ...eactFiberRoot.old.js => ReactFiberRoot.js} | 10 +-- ...ctFiberScope.old.js => ReactFiberScope.js} | 0 .../src/ReactFiberShellHydration.js | 2 +- ...ctFiberStack.old.js => ReactFiberStack.js} | 0 ....old.js => ReactFiberSuspenseComponent.js} | 4 +- ...xt.old.js => ReactFiberSuspenseContext.js} | 11 ++- ...ueue.old.js => ReactFiberSyncTaskQueue.js} | 2 +- ...rThenable.old.js => ReactFiberThenable.js} | 0 ...ctFiberThrow.old.js => ReactFiberThrow.js} | 20 +++--- ...js => ReactFiberTracingMarkerComponent.js} | 6 +- ...nsition.old.js => ReactFiberTransition.js} | 14 ++-- ...ontext.old.js => ReactFiberTreeContext.js} | 2 +- .../src/ReactFiberTreeReflection.js | 2 +- ...indWork.old.js => ReactFiberUnwindWork.js} | 32 ++++----- ...rWorkLoop.old.js => ReactFiberWorkLoop.js} | 66 ++++++++---------- .../src/ReactInternalTypes.js | 8 +-- ...bleSource.old.js => ReactMutableSource.js} | 0 ...ilerTimer.old.js => ReactProfilerTimer.js} | 0 .../src/ReactReconcilerConstants.js | 2 +- ...ings.old.js => ReactStrictModeWarnings.js} | 0 .../ReactFiberHostContext-test.internal.js | 2 +- ...actIncrementalErrorReplay-test.internal.js | 2 +- .../__tests__/ReactUpdaters-test.internal.js | 2 +- .../src/forks/ReactFiberErrorDialog.native.js | 2 +- .../src/forks/ReactFiberErrorDialog.www.js | 2 +- .../react-refresh/src/ReactFreshRuntime.js | 2 +- .../src/ReactTestHostConfig.js | 2 +- .../src/ReactTestRenderer.js | 2 +- packages/react/src/ReactCurrentBatchConfig.js | 2 +- 72 files changed, 296 insertions(+), 316 deletions(-) rename packages/react-reconciler/src/{ReactChildFiber.old.js => ReactChildFiber.js} (99%) rename packages/react-reconciler/src/{ReactEventPriorities.old.js => ReactEventPriorities.js} (95%) rename packages/react-reconciler/src/{ReactFiber.old.js => ReactFiber.js} (98%) rename packages/react-reconciler/src/{ReactFiberAct.old.js => ReactFiberAct.js} (97%) rename packages/react-reconciler/src/{ReactFiberBeginWork.old.js => ReactFiberBeginWork.js} (98%) rename packages/react-reconciler/src/{ReactFiberCache.old.js => ReactFiberCache.js} (85%) rename packages/react-reconciler/src/{ReactFiberCacheComponent.old.js => ReactFiberCacheComponent.js} (98%) rename packages/react-reconciler/src/{ReactFiberClassComponent.old.js => ReactFiberClassComponent.js} (98%) rename packages/react-reconciler/src/{ReactFiberClassUpdateQueue.old.js => ReactFiberClassUpdateQueue.js} (99%) rename packages/react-reconciler/src/{ReactFiberCommitWork.old.js => ReactFiberCommitWork.js} (99%) rename packages/react-reconciler/src/{ReactFiberCompleteWork.old.js => ReactFiberCompleteWork.js} (98%) rename packages/react-reconciler/src/{ReactFiberConcurrentUpdates.old.js => ReactFiberConcurrentUpdates.js} (97%) rename packages/react-reconciler/src/{ReactFiberContext.old.js => ReactFiberContext.js} (98%) rename packages/react-reconciler/src/{ReactFiberDevToolsHook.old.js => ReactFiberDevToolsHook.js} (98%) rename packages/react-reconciler/src/{ReactFiberHiddenContext.old.js => ReactFiberHiddenContext.js} (91%) rename packages/react-reconciler/src/{ReactFiberHooks.old.js => ReactFiberHooks.js} (99%) rename packages/react-reconciler/src/{ReactFiberHostContext.old.js => ReactFiberHostContext.js} (96%) rename packages/react-reconciler/src/{ReactFiberHotReloading.old.js => ReactFiberHotReloading.js} (98%) rename packages/react-reconciler/src/{ReactFiberHydrationContext.old.js => ReactFiberHydrationContext.js} (98%) rename packages/react-reconciler/src/{ReactFiberLane.old.js => ReactFiberLane.js} (99%) rename packages/react-reconciler/src/{ReactFiberLazyComponent.old.js => ReactFiberLazyComponent.js} (100%) rename packages/react-reconciler/src/{ReactFiberNewContext.old.js => ReactFiberNewContext.js} (98%) rename packages/react-reconciler/src/{ReactFiberReconciler.old.js => ReactFiberReconciler.js} (98%) rename packages/react-reconciler/src/{ReactFiberRoot.old.js => ReactFiberRoot.js} (97%) rename packages/react-reconciler/src/{ReactFiberScope.old.js => ReactFiberScope.js} (100%) rename packages/react-reconciler/src/{ReactFiberStack.old.js => ReactFiberStack.js} (100%) rename packages/react-reconciler/src/{ReactFiberSuspenseComponent.old.js => ReactFiberSuspenseComponent.js} (97%) rename packages/react-reconciler/src/{ReactFiberSuspenseContext.old.js => ReactFiberSuspenseContext.js} (95%) rename packages/react-reconciler/src/{ReactFiberSyncTaskQueue.old.js => ReactFiberSyncTaskQueue.js} (98%) rename packages/react-reconciler/src/{ReactFiberThenable.old.js => ReactFiberThenable.js} (100%) rename packages/react-reconciler/src/{ReactFiberThrow.old.js => ReactFiberThrow.js} (97%) rename packages/react-reconciler/src/{ReactFiberTracingMarkerComponent.old.js => ReactFiberTracingMarkerComponent.js} (98%) rename packages/react-reconciler/src/{ReactFiberTransition.old.js => ReactFiberTransition.js} (95%) rename packages/react-reconciler/src/{ReactFiberTreeContext.old.js => ReactFiberTreeContext.js} (99%) rename packages/react-reconciler/src/{ReactFiberUnwindWork.old.js => ReactFiberUnwindWork.js} (91%) rename packages/react-reconciler/src/{ReactFiberWorkLoop.old.js => ReactFiberWorkLoop.js} (99%) rename packages/react-reconciler/src/{ReactMutableSource.old.js => ReactMutableSource.js} (100%) rename packages/react-reconciler/src/{ReactProfilerTimer.old.js => ReactProfilerTimer.js} (100%) rename packages/react-reconciler/src/{ReactStrictModeWarnings.old.js => ReactStrictModeWarnings.js} (100%) diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js index 6ad1dfb6753c2..2bd66260f6d78 100644 --- a/packages/react-art/src/ReactART.js +++ b/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'; diff --git a/packages/react-art/src/ReactARTHostConfig.js b/packages/react-art/src/ReactARTHostConfig.js index 101f8213bd325..493d2521ce5a5 100644 --- a/packages/react-art/src/ReactARTHostConfig.js +++ b/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(); diff --git a/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js b/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js index 6e8e737070e6e..b09789d436fb7 100644 --- a/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js +++ b/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 diff --git a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js b/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js index e10a8772d04aa..db42f2ed243a3 100644 --- a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js +++ b/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'; diff --git a/packages/react-dom-bindings/src/events/ReactDOMEventListener.js b/packages/react-dom-bindings/src/events/ReactDOMEventListener.js index 241a7a1e48f82..2eca510571f12 100644 --- a/packages/react-dom-bindings/src/events/ReactDOMEventListener.js +++ b/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'; diff --git a/packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js b/packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js index 8157f9d3f07bd..a10524fdb4966 100644 --- a/packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js +++ b/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; diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index 316c4c5e0338e..2da511119aec1 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/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'; diff --git a/packages/react-dom/src/client/ReactDOMLegacy.js b/packages/react-dom/src/client/ReactDOMLegacy.js index 80e3315114ccb..39e00ffc89a68 100644 --- a/packages/react-dom/src/client/ReactDOMLegacy.js +++ b/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'; diff --git a/packages/react-dom/src/client/ReactDOMRoot.js b/packages/react-dom/src/client/ReactDOMRoot.js index a2b4994952a12..a4b901d156d78 100644 --- a/packages/react-dom/src/client/ReactDOMRoot.js +++ b/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 */ diff --git a/packages/react-dom/unstable_testing.classic.fb.js b/packages/react-dom/unstable_testing.classic.fb.js index 4c4700f6aa7b5..2f623787958d3 100644 --- a/packages/react-dom/unstable_testing.classic.fb.js +++ b/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'; diff --git a/packages/react-dom/unstable_testing.experimental.js b/packages/react-dom/unstable_testing.experimental.js index dc12b7042c38b..3ed081d85b9b1 100644 --- a/packages/react-dom/unstable_testing.experimental.js +++ b/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'; diff --git a/packages/react-dom/unstable_testing.js b/packages/react-dom/unstable_testing.js index aaa570ca28985..fdad56d13c77d 100644 --- a/packages/react-dom/unstable_testing.js +++ b/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'; diff --git a/packages/react-dom/unstable_testing.modern.fb.js b/packages/react-dom/unstable_testing.modern.fb.js index cb9a8309d8e1a..c0a0e45ad79ca 100644 --- a/packages/react-dom/unstable_testing.modern.fb.js +++ b/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'; diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js index fa26a33099228..1e3d299ece9e8 100644 --- a/packages/react-native-renderer/src/ReactFabric.js +++ b/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'; diff --git a/packages/react-native-renderer/src/ReactFabricHostConfig.js b/packages/react-native-renderer/src/ReactFabricHostConfig.js index 43bb2f646d3cd..078bf1f11ac6f 100644 --- a/packages/react-native-renderer/src/ReactFabricHostConfig.js +++ b/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 { diff --git a/packages/react-native-renderer/src/ReactNativeHostConfig.js b/packages/react-native-renderer/src/ReactNativeHostConfig.js index ae3ce588559be..03cfa415f6937 100644 --- a/packages/react-native-renderer/src/ReactNativeHostConfig.js +++ b/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; diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index 802cd831dd215..d9577a6eb6d58 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/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'; diff --git a/packages/react-reconciler/index.js b/packages/react-reconciler/index.js index 0e41352a8c4e4..afffd715cffe5 100644 --- a/packages/react-reconciler/index.js +++ b/packages/react-reconciler/index.js @@ -7,4 +7,4 @@ * @flow */ -export * from './src/ReactFiberReconciler.old'; +export * from './src/ReactFiberReconciler'; diff --git a/packages/react-reconciler/src/DebugTracing.js b/packages/react-reconciler/src/DebugTracing.js index 17ab53ff86e70..e2162892fd7f6 100644 --- a/packages/react-reconciler/src/DebugTracing.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactChildFiber.old.js b/packages/react-reconciler/src/ReactChildFiber.js similarity index 99% rename from packages/react-reconciler/src/ReactChildFiber.old.js rename to packages/react-reconciler/src/ReactChildFiber.js index 9ced326c55960..b3d2fe0239f8b 100644 --- a/packages/react-reconciler/src/ReactChildFiber.old.js +++ b/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; diff --git a/packages/react-reconciler/src/ReactEventPriorities.old.js b/packages/react-reconciler/src/ReactEventPriorities.js similarity index 95% rename from packages/react-reconciler/src/ReactEventPriorities.old.js rename to packages/react-reconciler/src/ReactEventPriorities.js index 9223b2e745306..6ae2f85f4b6ed 100644 --- a/packages/react-reconciler/src/ReactEventPriorities.old.js +++ b/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; diff --git a/packages/react-reconciler/src/ReactFiber.old.js b/packages/react-reconciler/src/ReactFiber.js similarity index 98% rename from packages/react-reconciler/src/ReactFiber.old.js rename to packages/react-reconciler/src/ReactFiber.js index 64297701cd472..78c0794d432c2 100644 --- a/packages/react-reconciler/src/ReactFiber.old.js +++ b/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}; diff --git a/packages/react-reconciler/src/ReactFiberAct.old.js b/packages/react-reconciler/src/ReactFiberAct.js similarity index 97% rename from packages/react-reconciler/src/ReactFiberAct.old.js rename to packages/react-reconciler/src/ReactFiberAct.js index 9512d0b4e615a..0e9171ce9d868 100644 --- a/packages/react-reconciler/src/ReactFiberAct.old.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.old.js b/packages/react-reconciler/src/ReactFiberBeginWork.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberBeginWork.old.js rename to packages/react-reconciler/src/ReactFiberBeginWork.js index 6a017a83343a2..bde65936f1c01 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.old.js +++ b/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; diff --git a/packages/react-reconciler/src/ReactFiberCache.old.js b/packages/react-reconciler/src/ReactFiberCache.js similarity index 85% rename from packages/react-reconciler/src/ReactFiberCache.old.js rename to packages/react-reconciler/src/ReactFiberCache.js index 80eac934e304f..5e03bb1a40879 100644 --- a/packages/react-reconciler/src/ReactFiberCache.old.js +++ b/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) { diff --git a/packages/react-reconciler/src/ReactFiberCacheComponent.old.js b/packages/react-reconciler/src/ReactFiberCacheComponent.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberCacheComponent.old.js rename to packages/react-reconciler/src/ReactFiberCacheComponent.js index 19e4144ec8147..7a898cf738d86 100644 --- a/packages/react-reconciler/src/ReactFiberCacheComponent.old.js +++ b/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) diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.old.js b/packages/react-reconciler/src/ReactFiberClassComponent.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberClassComponent.old.js rename to packages/react-reconciler/src/ReactFiberClassComponent.js index 295367d7a906b..f8a80f7ffbeb1 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.old.js +++ b/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 = {}; diff --git a/packages/react-reconciler/src/ReactFiberClassUpdateQueue.old.js b/packages/react-reconciler/src/ReactFiberClassUpdateQueue.js similarity index 99% rename from packages/react-reconciler/src/ReactFiberClassUpdateQueue.old.js rename to packages/react-reconciler/src/ReactFiberClassUpdateQueue.js index c008976d54095..1b3897029522e 100644 --- a/packages/react-reconciler/src/ReactFiberClassUpdateQueue.old.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.js similarity index 99% rename from packages/react-reconciler/src/ReactFiberCommitWork.old.js rename to packages/react-reconciler/src/ReactFiberCommitWork.js index be4d5cfb8d5d9..e394f5671a733 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.old.js +++ b/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 | null = null; if (__DEV__) { diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.old.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberCompleteWork.old.js rename to packages/react-reconciler/src/ReactFiberCompleteWork.js index 8ec8b3e4e927f..5ea22d07feae2 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.old.js +++ b/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 diff --git a/packages/react-reconciler/src/ReactFiberConcurrentUpdates.old.js b/packages/react-reconciler/src/ReactFiberConcurrentUpdates.js similarity index 97% rename from packages/react-reconciler/src/ReactFiberConcurrentUpdates.old.js rename to packages/react-reconciler/src/ReactFiberConcurrentUpdates.js index e83e061e5d3a8..faf1664beb9bc 100644 --- a/packages/react-reconciler/src/ReactFiberConcurrentUpdates.old.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactFiberContext.old.js b/packages/react-reconciler/src/ReactFiberContext.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberContext.old.js rename to packages/react-reconciler/src/ReactFiberContext.js index 1dd26c7fb12e6..0f1a5219c09c3 100644 --- a/packages/react-reconciler/src/ReactFiberContext.old.js +++ b/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; diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.old.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberDevToolsHook.old.js rename to packages/react-reconciler/src/ReactFiberDevToolsHook.js index cea093b18fc53..9594508cf0dde 100644 --- a/packages/react-reconciler/src/ReactFiberDevToolsHook.old.js +++ b/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, diff --git a/packages/react-reconciler/src/ReactFiberHiddenContext.old.js b/packages/react-reconciler/src/ReactFiberHiddenContext.js similarity index 91% rename from packages/react-reconciler/src/ReactFiberHiddenContext.old.js rename to packages/react-reconciler/src/ReactFiberHiddenContext.js index 46f86c046cfcc..8dacaa9942a12 100644 --- a/packages/react-reconciler/src/ReactFiberHiddenContext.old.js +++ b/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 = { diff --git a/packages/react-reconciler/src/ReactFiberHooks.old.js b/packages/react-reconciler/src/ReactFiberHooks.js similarity index 99% rename from packages/react-reconciler/src/ReactFiberHooks.old.js rename to packages/react-reconciler/src/ReactFiberHooks.js index 3f3a617531aa1..8332587a1d444 100644 --- a/packages/react-reconciler/src/ReactFiberHooks.old.js +++ b/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; diff --git a/packages/react-reconciler/src/ReactFiberHostContext.old.js b/packages/react-reconciler/src/ReactFiberHostContext.js similarity index 96% rename from packages/react-reconciler/src/ReactFiberHostContext.old.js rename to packages/react-reconciler/src/ReactFiberHostContext.js index 6d80d8acaed4c..2b1abcd702ef8 100644 --- a/packages/react-reconciler/src/ReactFiberHostContext.old.js +++ b/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 = createCursor(null); const contextFiberStackCursor: StackCursor = createCursor(null); diff --git a/packages/react-reconciler/src/ReactFiberHotReloading.old.js b/packages/react-reconciler/src/ReactFiberHotReloading.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberHotReloading.old.js rename to packages/react-reconciler/src/ReactFiberHotReloading.js index 1d282869d3fe9..d82e130320c73 100644 --- a/packages/react-reconciler/src/ReactFiberHotReloading.old.js +++ b/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, diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.old.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberHydrationContext.old.js rename to packages/react-reconciler/src/ReactFiberHydrationContext.js index b3224ac7d8401..4b5bc198a5e9f 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.old.js +++ b/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. diff --git a/packages/react-reconciler/src/ReactFiberLane.old.js b/packages/react-reconciler/src/ReactFiberLane.js similarity index 99% rename from packages/react-reconciler/src/ReactFiberLane.old.js rename to packages/react-reconciler/src/ReactFiberLane.js index 110893a036530..97a28f88099e0 100644 --- a/packages/react-reconciler/src/ReactFiberLane.old.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactFiberLazyComponent.old.js b/packages/react-reconciler/src/ReactFiberLazyComponent.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberLazyComponent.old.js rename to packages/react-reconciler/src/ReactFiberLazyComponent.js diff --git a/packages/react-reconciler/src/ReactFiberNewContext.old.js b/packages/react-reconciler/src/ReactFiberNewContext.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberNewContext.old.js rename to packages/react-reconciler/src/ReactFiberNewContext.js index e2c13368371d7..acaafbce15266 100644 --- a/packages/react-reconciler/src/ReactFiberNewContext.old.js +++ b/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, diff --git a/packages/react-reconciler/src/ReactFiberOffscreenComponent.js b/packages/react-reconciler/src/ReactFiberOffscreenComponent.js index 1a2038a43010f..e6445fd66840a 100644 --- a/packages/react-reconciler/src/ReactFiberOffscreenComponent.js +++ b/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 diff --git a/packages/react-reconciler/src/ReactFiberReconciler.old.js b/packages/react-reconciler/src/ReactFiberReconciler.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberReconciler.old.js rename to packages/react-reconciler/src/ReactFiberReconciler.js index 56088b75e05a8..32ffad44a79e4 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.old.js +++ b/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, diff --git a/packages/react-reconciler/src/ReactFiberRoot.old.js b/packages/react-reconciler/src/ReactFiberRoot.js similarity index 97% rename from packages/react-reconciler/src/ReactFiberRoot.old.js rename to packages/react-reconciler/src/ReactFiberRoot.js index f19ec89ff8f9f..8ffec15b3a942 100644 --- a/packages/react-reconciler/src/ReactFiberRoot.old.js +++ b/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, diff --git a/packages/react-reconciler/src/ReactFiberScope.old.js b/packages/react-reconciler/src/ReactFiberScope.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberScope.old.js rename to packages/react-reconciler/src/ReactFiberScope.js diff --git a/packages/react-reconciler/src/ReactFiberShellHydration.js b/packages/react-reconciler/src/ReactFiberShellHydration.js index 8afe36cc2637e..6e89763aeed1b 100644 --- a/packages/react-reconciler/src/ReactFiberShellHydration.js +++ b/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 diff --git a/packages/react-reconciler/src/ReactFiberStack.old.js b/packages/react-reconciler/src/ReactFiberStack.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberStack.old.js rename to packages/react-reconciler/src/ReactFiberStack.js diff --git a/packages/react-reconciler/src/ReactFiberSuspenseComponent.old.js b/packages/react-reconciler/src/ReactFiberSuspenseComponent.js similarity index 97% rename from packages/react-reconciler/src/ReactFiberSuspenseComponent.old.js rename to packages/react-reconciler/src/ReactFiberSuspenseComponent.js index 2ce9c2adf261b..0efbf5592bf14 100644 --- a/packages/react-reconciler/src/ReactFiberSuspenseComponent.old.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactFiberSuspenseContext.old.js b/packages/react-reconciler/src/ReactFiberSuspenseContext.js similarity index 95% rename from packages/react-reconciler/src/ReactFiberSuspenseContext.old.js rename to packages/react-reconciler/src/ReactFiberSuspenseContext.js index 025de9bf94457..c9e520e276558 100644 --- a/packages/react-reconciler/src/ReactFiberSuspenseContext.old.js +++ b/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 diff --git a/packages/react-reconciler/src/ReactFiberSyncTaskQueue.old.js b/packages/react-reconciler/src/ReactFiberSyncTaskQueue.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberSyncTaskQueue.old.js rename to packages/react-reconciler/src/ReactFiberSyncTaskQueue.js index d185eb911b452..273de09874789 100644 --- a/packages/react-reconciler/src/ReactFiberSyncTaskQueue.old.js +++ b/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 | null = null; diff --git a/packages/react-reconciler/src/ReactFiberThenable.old.js b/packages/react-reconciler/src/ReactFiberThenable.js similarity index 100% rename from packages/react-reconciler/src/ReactFiberThenable.old.js rename to packages/react-reconciler/src/ReactFiberThenable.js diff --git a/packages/react-reconciler/src/ReactFiberThrow.old.js b/packages/react-reconciler/src/ReactFiberThrow.js similarity index 97% rename from packages/react-reconciler/src/ReactFiberThrow.old.js rename to packages/react-reconciler/src/ReactFiberThrow.js index 032b61e87a688..d425175eabb55 100644 --- a/packages/react-reconciler/src/ReactFiberThrow.old.js +++ b/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( diff --git a/packages/react-reconciler/src/ReactFiberTracingMarkerComponent.old.js b/packages/react-reconciler/src/ReactFiberTracingMarkerComponent.js similarity index 98% rename from packages/react-reconciler/src/ReactFiberTracingMarkerComponent.old.js rename to packages/react-reconciler/src/ReactFiberTracingMarkerComponent.js index 189cb8ce7e6bf..ff7fbb1dcca8b 100644 --- a/packages/react-reconciler/src/ReactFiberTracingMarkerComponent.old.js +++ b/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}; diff --git a/packages/react-reconciler/src/ReactFiberTransition.old.js b/packages/react-reconciler/src/ReactFiberTransition.js similarity index 95% rename from packages/react-reconciler/src/ReactFiberTransition.old.js rename to packages/react-reconciler/src/ReactFiberTransition.js index 7d8be86b6319b..126cfa01fa48a 100644 --- a/packages/react-reconciler/src/ReactFiberTransition.old.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactFiberTreeContext.old.js b/packages/react-reconciler/src/ReactFiberTreeContext.js similarity index 99% rename from packages/react-reconciler/src/ReactFiberTreeContext.old.js rename to packages/react-reconciler/src/ReactFiberTreeContext.js index 164cc4216cd02..00e8313b03ef2 100644 --- a/packages/react-reconciler/src/ReactFiberTreeContext.old.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js index 7a8e6854acb80..ed10c62f99844 100644 --- a/packages/react-reconciler/src/ReactFiberTreeReflection.js +++ b/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'; diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.old.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js similarity index 91% rename from packages/react-reconciler/src/ReactFiberUnwindWork.old.js rename to packages/react-reconciler/src/ReactFiberUnwindWork.js index 2268b86067bb7..d6e7e500b5293 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.old.js +++ b/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, diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.js similarity index 99% rename from packages/react-reconciler/src/ReactFiberWorkLoop.old.js rename to packages/react-reconciler/src/ReactFiberWorkLoop.js index 01753af76c871..5046d38b589c2 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js +++ b/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; diff --git a/packages/react-reconciler/src/ReactInternalTypes.js b/packages/react-reconciler/src/ReactInternalTypes.js index 478a77d6f1fac..4974f64d9a5cb 100644 --- a/packages/react-reconciler/src/ReactInternalTypes.js +++ b/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 = diff --git a/packages/react-reconciler/src/ReactMutableSource.old.js b/packages/react-reconciler/src/ReactMutableSource.js similarity index 100% rename from packages/react-reconciler/src/ReactMutableSource.old.js rename to packages/react-reconciler/src/ReactMutableSource.js diff --git a/packages/react-reconciler/src/ReactProfilerTimer.old.js b/packages/react-reconciler/src/ReactProfilerTimer.js similarity index 100% rename from packages/react-reconciler/src/ReactProfilerTimer.old.js rename to packages/react-reconciler/src/ReactProfilerTimer.js diff --git a/packages/react-reconciler/src/ReactReconcilerConstants.js b/packages/react-reconciler/src/ReactReconcilerConstants.js index 5a905e4aa3f18..3e9b1c7009da9 100644 --- a/packages/react-reconciler/src/ReactReconcilerConstants.js +++ b/packages/react-reconciler/src/ReactReconcilerConstants.js @@ -15,5 +15,5 @@ export { ContinuousEventPriority, DefaultEventPriority, IdleEventPriority, -} from './ReactEventPriorities.old'; +} from './ReactEventPriorities'; export {ConcurrentRoot, LegacyRoot} from './ReactRootTags'; diff --git a/packages/react-reconciler/src/ReactStrictModeWarnings.old.js b/packages/react-reconciler/src/ReactStrictModeWarnings.js similarity index 100% rename from packages/react-reconciler/src/ReactStrictModeWarnings.old.js rename to packages/react-reconciler/src/ReactStrictModeWarnings.js diff --git a/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js b/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js index 59510939e99e7..07fc29552b4f0 100644 --- a/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js +++ b/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; }); diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.internal.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.internal.js index 78b8c68f05aae..9b4c2462fad79 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.internal.js +++ b/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(
).root._currentFiber(); diff --git a/packages/react-reconciler/src/__tests__/ReactUpdaters-test.internal.js b/packages/react-reconciler/src/__tests__/ReactUpdaters-test.internal.js index 35e33a7e4441f..d377f081af951 100644 --- a/packages/react-reconciler/src/__tests__/ReactUpdaters-test.internal.js +++ b/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, ); diff --git a/packages/react-reconciler/src/forks/ReactFiberErrorDialog.native.js b/packages/react-reconciler/src/forks/ReactFiberErrorDialog.native.js index df4e89db315a3..9883128cc2623 100644 --- a/packages/react-reconciler/src/forks/ReactFiberErrorDialog.native.js +++ b/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'; diff --git a/packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js b/packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js index b85f6037679e9..0f7eaef803f38 100644 --- a/packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js +++ b/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'; diff --git a/packages/react-refresh/src/ReactFreshRuntime.js b/packages/react-refresh/src/ReactFreshRuntime.js index 68a615044f90a..6a936513a1e12 100644 --- a/packages/react-refresh/src/ReactFreshRuntime.js +++ b/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'; diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactTestHostConfig.js index e2adfb201d037..a3230a541aa36 100644 --- a/packages/react-test-renderer/src/ReactTestHostConfig.js +++ b/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; diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index ae6834d0b6dc4..4645047977113 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/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, diff --git a/packages/react/src/ReactCurrentBatchConfig.js b/packages/react/src/ReactCurrentBatchConfig.js index 88068338f82b2..67d59a6a012d6 100644 --- a/packages/react/src/ReactCurrentBatchConfig.js +++ b/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,