@samitouri / QOS-React-2 / commits / f101c2d0d3

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

Jan Kassens committed Dec 1, 2022 at 23:19 UTC f101c2d0d3a6cb5a788a3d91faef48462e45f515
72 files changed +296 -316
packages/react-art/src/ReactART.js
+1 -1
@@ -12,7 +12,7 @@ import {
12 createContainer,
13 updateContainer,
14 injectIntoDevTools,
15 -} from 'react-reconciler/src/ReactFiberReconciler.old';
15 +} from 'react-reconciler/src/ReactFiberReconciler';
16 import Transform from 'art/core/transform';
17 import Mode from 'art/modes/current';
18 import FastNoSideEffects from 'art/modes/fast-noSideEffects';
packages/react-art/src/ReactARTHostConfig.js
+1 -1
@@ -10,7 +10,7 @@ import Mode from 'art/modes/current';
10
11 import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
12
13 -import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
13 +import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
14
15 const pooledTransform = new Transform();
16
packages/react-dom-bindings/src/client/ReactDOMFloatClient.js
+1 -1
@@ -29,7 +29,7 @@ import {
29 markNodeAsResource,
30 } from './ReactDOMComponentTree';
31 import {HTML_NAMESPACE, SVG_NAMESPACE} from '../shared/DOMNamespaces';
32 -import {getCurrentRootHostContainer} from 'react-reconciler/src/ReactFiberHostContext.old';
32 +import {getCurrentRootHostContainer} from 'react-reconciler/src/ReactFiberHostContext';
33
34 // The resource types we support. currently they match the form for the as argument.
35 // In the future this may need to change, especially when modules / scripts are supported
packages/react-dom-bindings/src/client/ReactDOMHostConfig.js
+2 -2
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
10 +import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
11 import type {DOMEventName} from '../events/DOMEventNames';
12 import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
13 import type {
@@ -81,7 +81,7 @@ import {
81 } from 'react-reconciler/src/ReactWorkTags';
82 import {listenToAllSupportedEvents} from '../events/DOMPluginEventSystem';
83
84 -import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
84 +import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
85
86 // TODO: Remove this deep import when we delete the legacy root API
87 import {ConcurrentMode, NoMode} from 'react-reconciler/src/ReactTypeOfMode';
packages/react-dom-bindings/src/events/ReactDOMEventListener.js
+2 -2
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
10 +import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
11 import type {AnyNativeEvent} from '../events/PluginModuleType';
12 import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
13 import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
@@ -52,7 +52,7 @@ import {
52 IdleEventPriority,
53 getCurrentUpdatePriority,
54 setCurrentUpdatePriority,
55 -} from 'react-reconciler/src/ReactEventPriorities.old';
55 +} from 'react-reconciler/src/ReactEventPriorities';
56 import ReactSharedInternals from 'shared/ReactSharedInternals';
57 import {isRootDehydrated} from 'react-reconciler/src/ReactFiberShellHydration';
58
packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js
+2 -2
@@ -12,7 +12,7 @@ import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
12 import type {DOMEventName} from '../events/DOMEventNames';
13 import type {EventSystemFlags} from './EventSystemFlags';
14 import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
15 -import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
15 +import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
16
17 import {enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay} from 'shared/ReactFeatureFlags';
18 import {
@@ -35,7 +35,7 @@ import {
35 getClosestInstanceFromNode,
36 } from '../client/ReactDOMComponentTree';
37 import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags';
38 -import {isHigherEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
38 +import {isHigherEventPriority} from 'react-reconciler/src/ReactEventPriorities';
39 import {isRootDehydrated} from 'react-reconciler/src/ReactFiberShellHydration';
40
41 let _attemptSynchronousHydration: (fiber: Object) => void;
packages/react-dom/src/client/ReactDOM.js
+2 -2
@@ -43,11 +43,11 @@ import {
43 attemptDiscreteHydration,
44 attemptContinuousHydration,
45 attemptHydrationAtCurrentPriority,
46 -} from 'react-reconciler/src/ReactFiberReconciler.old';
46 +} from 'react-reconciler/src/ReactFiberReconciler';
47 import {
48 runWithPriority,
49 getCurrentUpdatePriority,
50 -} from 'react-reconciler/src/ReactEventPriorities.old';
50 +} from 'react-reconciler/src/ReactEventPriorities';
51 import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
52 import {canUseDOM} from 'shared/ExecutionEnvironment';
53 import ReactVersion from 'shared/ReactVersion';
packages/react-dom/src/client/ReactDOMLegacy.js
+1 -1
@@ -37,7 +37,7 @@ import {
37 getPublicRootInstance,
38 findHostInstance,
39 findHostInstanceWithWarning,
40 -} from 'react-reconciler/src/ReactFiberReconciler.old';
40 +} from 'react-reconciler/src/ReactFiberReconciler';
41 import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
42 import getComponentNameFromType from 'shared/getComponentNameFromType';
43 import ReactSharedInternals from 'shared/ReactSharedInternals';
packages/react-dom/src/client/ReactDOMRoot.js
+1 -1
@@ -76,7 +76,7 @@ import {
76 registerMutableSourceForHydration,
77 flushSync,
78 isAlreadyRendering,
79 -} from 'react-reconciler/src/ReactFiberReconciler.old';
79 +} from 'react-reconciler/src/ReactFiberReconciler';
80 import {ConcurrentRoot} from 'react-reconciler/src/ReactRootTags';
81
82 /* global reportError */
packages/react-dom/unstable_testing.classic.fb.js
+1 -1
@@ -19,4 +19,4 @@ export {
19 findBoundingRects,
20 focusWithin,
21 observeVisibleRects,
22 -} from 'react-reconciler/src/ReactFiberReconciler.old';
22 +} from 'react-reconciler/src/ReactFiberReconciler';
packages/react-dom/unstable_testing.experimental.js
+1 -1
@@ -19,4 +19,4 @@ export {
19 findBoundingRects,
20 focusWithin,
21 observeVisibleRects,
22 -} from 'react-reconciler/src/ReactFiberReconciler.old';
22 +} from 'react-reconciler/src/ReactFiberReconciler';
packages/react-dom/unstable_testing.js
+1 -1
@@ -19,4 +19,4 @@ export {
19 findBoundingRects,
20 focusWithin,
21 observeVisibleRects,
22 -} from 'react-reconciler/src/ReactFiberReconciler.old';
22 +} from 'react-reconciler/src/ReactFiberReconciler';
packages/react-dom/unstable_testing.modern.fb.js
+1 -1
@@ -19,4 +19,4 @@ export {
19 findBoundingRects,
20 focusWithin,
21 observeVisibleRects,
22 -} from 'react-reconciler/src/ReactFiberReconciler.old';
22 +} from 'react-reconciler/src/ReactFiberReconciler';
packages/react-native-renderer/src/ReactFabric.js
+1 -1
@@ -22,7 +22,7 @@ import {
22 updateContainer,
23 injectIntoDevTools,
24 getPublicRootInstance,
25 -} from 'react-reconciler/src/ReactFiberReconciler.old';
25 +} from 'react-reconciler/src/ReactFiberReconciler';
26
27 import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
28 import {setBatchingImplementation} from './legacy-events/ReactGenericBatching';
packages/react-native-renderer/src/ReactFabricHostConfig.js
+1 -1
@@ -26,7 +26,7 @@ import {dispatchEvent} from './ReactFabricEventEmitter';
26 import {
27 DefaultEventPriority,
28 DiscreteEventPriority,
29 -} from 'react-reconciler/src/ReactEventPriorities.old';
29 +} from 'react-reconciler/src/ReactEventPriorities';
30
31 // Modules provided by RN:
32 import {
packages/react-native-renderer/src/ReactNativeHostConfig.js
+1 -1
@@ -24,7 +24,7 @@ import {
24 } from './ReactNativeComponentTree';
25 import ReactNativeFiberHostComponent from './ReactNativeFiberHostComponent';
26
27 -import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
27 +import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
28
29 const {get: getViewConfigForType} = ReactNativeViewConfigRegistry;
30
packages/react-native-renderer/src/ReactNativeRenderer.js
+1 -1
@@ -22,7 +22,7 @@ import {
22 updateContainer,
23 injectIntoDevTools,
24 getPublicRootInstance,
25 -} from 'react-reconciler/src/ReactFiberReconciler.old';
25 +} from 'react-reconciler/src/ReactFiberReconciler';
26 // TODO: direct imports like some-package/src/* are bad. Fix me.
27 import {getStackByFiberInDevAndProd} from 'react-reconciler/src/ReactFiberComponentStack';
28 import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
packages/react-reconciler/index.js
+1 -1
@@ -7,4 +7,4 @@
7 * @flow
8 */
9
10 -export * from './src/ReactFiberReconciler.old';
10 +export * from './src/ReactFiberReconciler';
packages/react-reconciler/src/DebugTracing.js
+1 -1
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {Lane, Lanes} from './ReactFiberLane.old';
10 +import type {Lane, Lanes} from './ReactFiberLane';
11 import type {Wakeable} from 'shared/ReactTypes';
12
13 import {enableDebugTracing} from 'shared/ReactFeatureFlags';
packages/react-reconciler/src/ReactChildFiber.js renamed
+5 -5
@@ -10,7 +10,7 @@
10 import type {ReactElement} from 'shared/ReactElementType';
11 import type {ReactPortal} from 'shared/ReactTypes';
12 import type {Fiber} from './ReactInternalTypes';
13 -import type {Lanes} from './ReactFiberLane.old';
13 +import type {Lanes} from './ReactFiberLane';
14
15 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
16 import {
@@ -38,11 +38,11 @@ import {
38 createFiberFromFragment,
39 createFiberFromText,
40 createFiberFromPortal,
41 -} from './ReactFiber.old';
42 -import {isCompatibleFamilyForHotReloading} from './ReactFiberHotReloading.old';
41 +} from './ReactFiber';
42 +import {isCompatibleFamilyForHotReloading} from './ReactFiberHotReloading';
43 import {StrictLegacyMode} from './ReactTypeOfMode';
44 -import {getIsHydrating} from './ReactFiberHydrationContext.old';
45 -import {pushTreeFork} from './ReactFiberTreeContext.old';
44 +import {getIsHydrating} from './ReactFiberHydrationContext';
45 +import {pushTreeFork} from './ReactFiberTreeContext';
46
47 let didWarnAboutMaps;
48 let didWarnAboutGenerators;
packages/react-reconciler/src/ReactEventPriorities.js renamed
+2 -2
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {Lane, Lanes} from './ReactFiberLane.old';
10 +import type {Lane, Lanes} from './ReactFiberLane';
11
12 import {
13 NoLane,
@@ -17,7 +17,7 @@ import {
17 IdleLane,
18 getHighestPriorityLane,
19 includesNonIdleWork,
20 -} from './ReactFiberLane.old';
20 +} from './ReactFiberLane';
21
22 export opaque type EventPriority = Lane;
23
packages/react-reconciler/src/ReactFiber.js renamed
+8 -8
@@ -13,13 +13,13 @@ import type {Fiber} from './ReactInternalTypes';
13 import type {RootTag} from './ReactRootTags';
14 import type {WorkTag} from './ReactWorkTags';
15 import type {TypeOfMode} from './ReactTypeOfMode';
16 -import type {Lanes} from './ReactFiberLane.old';
16 +import type {Lanes} from './ReactFiberLane';
17 import type {SuspenseInstance} from './ReactFiberHostConfig';
18 import type {
19 OffscreenProps,
20 OffscreenInstance,
21 } from './ReactFiberOffscreenComponent';
22 -import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent.old';
22 +import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
23
24 import {
25 supportsResources,
@@ -72,13 +72,13 @@ import {
72 } from './ReactWorkTags';
73 import {OffscreenVisible} from './ReactFiberOffscreenComponent';
74 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
75 -import {isDevToolsPresent} from './ReactFiberDevToolsHook.old';
75 +import {isDevToolsPresent} from './ReactFiberDevToolsHook';
76 import {
77 resolveClassForHotReloading,
78 resolveFunctionForHotReloading,
79 resolveForwardRefForHotReloading,
80 -} from './ReactFiberHotReloading.old';
81 -import {NoLanes} from './ReactFiberLane.old';
80 +} from './ReactFiberHotReloading';
81 +import {NoLanes} from './ReactFiberLane';
82 import {
83 NoMode,
84 ConcurrentMode,
@@ -106,9 +106,9 @@ import {
106 REACT_CACHE_TYPE,
107 REACT_TRACING_MARKER_TYPE,
108 } from 'shared/ReactSymbols';
109 -import {TransitionTracingMarker} from './ReactFiberTracingMarkerComponent.old';
110 -import {detachOffscreenInstance} from './ReactFiberCommitWork.old';
111 -import {getHostContext} from './ReactFiberHostContext.old';
109 +import {TransitionTracingMarker} from './ReactFiberTracingMarkerComponent';
110 +import {detachOffscreenInstance} from './ReactFiberCommitWork';
111 +import {getHostContext} from './ReactFiberHostContext';
112
113 export type {Fiber};
114
packages/react-reconciler/src/ReactFiberAct.js renamed
+1 -1
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {Fiber} from './ReactFiber.old';
10 +import type {Fiber} from './ReactFiber';
11
12 import ReactSharedInternals from 'shared/ReactSharedInternals';
13
packages/react-reconciler/src/ReactFiberBeginWork.js renamed
+34 -34
@@ -16,13 +16,13 @@ import type {
16 import type {LazyComponent as LazyComponentType} from 'react/src/ReactLazy';
17 import type {Fiber, FiberRoot} from './ReactInternalTypes';
18 import type {TypeOfMode} from './ReactTypeOfMode';
19 -import type {Lanes, Lane} from './ReactFiberLane.old';
19 +import type {Lanes, Lane} from './ReactFiberLane';
20 import type {
21 SuspenseState,
22 SuspenseListRenderState,
23 SuspenseListTailMode,
24 -} from './ReactFiberSuspenseComponent.old';
25 -import type {SuspenseContext} from './ReactFiberSuspenseContext.old';
24 +} from './ReactFiberSuspenseComponent';
25 +import type {SuspenseContext} from './ReactFiberSuspenseContext';
26 import type {
27 OffscreenProps,
28 OffscreenState,
@@ -34,17 +34,17 @@ import type {
34 Cache,
35 CacheComponentState,
36 SpawnedCachePool,
37 -} from './ReactFiberCacheComponent.old';
38 -import type {UpdateQueue} from './ReactFiberClassUpdateQueue.old';
39 -import type {RootState} from './ReactFiberRoot.old';
40 -import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent.old';
37 +} from './ReactFiberCacheComponent';
38 +import type {UpdateQueue} from './ReactFiberClassUpdateQueue';
39 +import type {RootState} from './ReactFiberRoot';
40 +import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
41
42 import checkPropTypes from 'shared/checkPropTypes';
43 import {
44 markComponentRenderStarted,
45 markComponentRenderStopped,
46 setIsStrictModeForDevtools,
47 -} from './ReactFiberDevToolsHook.old';
47 +} from './ReactFiberDevToolsHook';
48 import {
49 IndeterminateComponent,
50 FunctionComponent,
@@ -113,7 +113,7 @@ import isArray from 'shared/isArray';
113 import shallowEqual from 'shared/shallowEqual';
114 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
115 import getComponentNameFromType from 'shared/getComponentNameFromType';
116 -import ReactStrictModeWarnings from './ReactStrictModeWarnings.old';
116 +import ReactStrictModeWarnings from './ReactStrictModeWarnings';
117 import {REACT_LAZY_TYPE, getIteratorFn} from 'shared/ReactSymbols';
118 import {
119 getCurrentFiberOwnerNameInDevOrNull,
@@ -123,19 +123,19 @@ import {
123 resolveFunctionForHotReloading,
124 resolveForwardRefForHotReloading,
125 resolveClassForHotReloading,
126 -} from './ReactFiberHotReloading.old';
126 +} from './ReactFiberHotReloading';
127
128 import {
129 mountChildFibers,
130 reconcileChildFibers,
131 cloneChildFibers,
132 -} from './ReactChildFiber.old';
132 +} from './ReactChildFiber';
133 import {
134 processUpdateQueue,
135 cloneUpdateQueue,
136 initializeUpdateQueue,
137 enqueueCapturedUpdate,
138 -} from './ReactFiberClassUpdateQueue.old';
138 +} from './ReactFiberClassUpdateQueue';
139 import {
140 NoLane,
141 NoLanes,
@@ -150,7 +150,7 @@ import {
150 mergeLanes,
151 getBumpedLaneForHydration,
152 pickArbitraryLane,
153 -} from './ReactFiberLane.old';
153 +} from './ReactFiberLane';
154 import {
155 ConcurrentMode,
156 NoMode,
@@ -170,8 +170,8 @@ import {
170 getResource,
171 } from './ReactFiberHostConfig';
172 import type {SuspenseInstance} from './ReactFiberHostConfig';
173 -import {shouldError, shouldSuspend} from './ReactFiberReconciler.old';
174 -import {pushHostContext, pushHostContainer} from './ReactFiberHostContext.old';
173 +import {shouldError, shouldSuspend} from './ReactFiberReconciler';
174 +import {pushHostContext, pushHostContainer} from './ReactFiberHostContext';
175 import {
176 suspenseStackCursor,
177 pushSuspenseListContext,
@@ -184,12 +184,12 @@ import {
184 pushOffscreenSuspenseHandler,
185 reuseSuspenseHandlerOnStack,
186 popSuspenseHandler,
187 -} from './ReactFiberSuspenseContext.old';
187 +} from './ReactFiberSuspenseContext';
188 import {
189 pushHiddenContext,
190 reuseHiddenContextOnStack,
191 -} from './ReactFiberHiddenContext.old';
192 -import {findFirstSuspended} from './ReactFiberSuspenseComponent.old';
191 +} from './ReactFiberHiddenContext';
192 +import {findFirstSuspended} from './ReactFiberSuspenseComponent';
193 import {
194 pushProvider,
195 propagateContextChange,
@@ -199,14 +199,14 @@ import {
199 readContext,
200 prepareToReadContext,
201 scheduleContextWorkOnParentPath,
202 -} from './ReactFiberNewContext.old';
202 +} from './ReactFiberNewContext';
203 import {
204 renderWithHooks,
205 checkDidRenderIdHook,
206 bailoutHooks,
207 replaySuspendedComponentWithHooks,
208 -} from './ReactFiberHooks.old';
209 -import {stopProfilerTimerIfRunning} from './ReactProfilerTimer.old';
208 +} from './ReactFiberHooks';
209 +import {stopProfilerTimerIfRunning} from './ReactProfilerTimer';
210 import {
211 getMaskedContext,
212 getUnmaskedContext,
@@ -215,7 +215,7 @@ import {
215 isContextProvider as isLegacyContextProvider,
216 pushTopLevelContextObject,
217 invalidateContextProvider,
218 -} from './ReactFiberContext.old';
218 +} from './ReactFiberContext';
219 import {
220 getIsHydrating,
221 enterHydrationState,
@@ -225,15 +225,15 @@ import {
225 tryToClaimNextHydratableInstance,
226 warnIfHydrating,
227 queueHydrationError,
228 -} from './ReactFiberHydrationContext.old';
228 +} from './ReactFiberHydrationContext';
229 import {
230 adoptClassInstance,
231 constructClassInstance,
232 mountClassInstance,
233 resumeMountClassInstance,
234 updateClassInstance,
235 -} from './ReactFiberClassComponent.old';
236 -import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
235 +} from './ReactFiberClassComponent';
236 +import {resolveDefaultProps} from './ReactFiberLazyComponent';
237 import {
238 resolveLazyComponentTag,
239 createFiberFromTypeAndProps,
@@ -241,30 +241,30 @@ import {
241 createFiberFromOffscreen,
242 createWorkInProgress,
243 isSimpleFunctionComponent,
244 -} from './ReactFiber.old';
244 +} from './ReactFiber';
245 import {
246 retryDehydratedSuspenseBoundary,
247 scheduleUpdateOnFiber,
248 renderDidSuspendDelayIfPossible,
249 markSkippedUpdateLanes,
250 getWorkInProgressRoot,
251 -} from './ReactFiberWorkLoop.old';
252 -import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates.old';
253 -import {setWorkInProgressVersion} from './ReactMutableSource.old';
254 -import {pushCacheProvider, CacheContext} from './ReactFiberCacheComponent.old';
251 +} from './ReactFiberWorkLoop';
252 +import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates';
253 +import {setWorkInProgressVersion} from './ReactMutableSource';
254 +import {pushCacheProvider, CacheContext} from './ReactFiberCacheComponent';
255 import {
256 createCapturedValue,
257 createCapturedValueAtFiber,
258 type CapturedValue,
259 } from './ReactCapturedValue';
260 -import {createClassErrorUpdate} from './ReactFiberThrow.old';
260 +import {createClassErrorUpdate} from './ReactFiberThrow';
261 import is from 'shared/objectIs';
262 import {
263 getForksAtLevel,
264 isForkedChild,
265 pushTreeId,
266 pushMaterializedTreeId,
267 -} from './ReactFiberTreeContext.old';
267 +} from './ReactFiberTreeContext';
268 import {
269 requestCacheFromPool,
270 pushRootTransition,
@@ -272,13 +272,13 @@ import {
272 pushTransition,
273 getOffscreenDeferredCache,
274 getPendingTransitions,
275 -} from './ReactFiberTransition.old';
275 +} from './ReactFiberTransition';
276 import {
277 getMarkerInstances,
278 pushMarkerInstance,
279 pushRootMarkerInstance,
280 TransitionTracingMarker,
281 -} from './ReactFiberTracingMarkerComponent.old';
281 +} from './ReactFiberTracingMarkerComponent';
282
283 const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
284
packages/react-reconciler/src/ReactFiberCache.js renamed
+3 -3
@@ -8,11 +8,11 @@
8 */
9
10 import type {CacheDispatcher} from './ReactInternalTypes';
11 -import type {Cache} from './ReactFiberCacheComponent.old';
11 +import type {Cache} from './ReactFiberCacheComponent';
12
13 import {enableCache} from 'shared/ReactFeatureFlags';
14 -import {readContext} from './ReactFiberNewContext.old';
15 -import {CacheContext} from './ReactFiberCacheComponent.old';
14 +import {readContext} from './ReactFiberNewContext';
15 +import {CacheContext} from './ReactFiberCacheComponent';
16
17 function getCacheSignal(): AbortSignal {
18 if (!enableCache) {
packages/react-reconciler/src/ReactFiberCacheComponent.js renamed
+1 -1
@@ -13,7 +13,7 @@ import type {Fiber} from 'react-reconciler/src/ReactInternalTypes';
13 import {enableCache} from 'shared/ReactFeatureFlags';
14 import {REACT_CONTEXT_TYPE} from 'shared/ReactSymbols';
15
16 -import {pushProvider, popProvider} from './ReactFiberNewContext.old';
16 +import {pushProvider, popProvider} from './ReactFiberNewContext';
17 import * as Scheduler from 'scheduler';
18
19 // In environments without AbortController (e.g. tests)
packages/react-reconciler/src/ReactFiberClassComponent.js renamed
+10 -10
@@ -8,8 +8,8 @@
8 */
9
10 import type {Fiber} from './ReactInternalTypes';
11 -import type {Lanes} from './ReactFiberLane.old';
12 -import type {UpdateQueue} from './ReactFiberClassUpdateQueue.old';
11 +import type {Lanes} from './ReactFiberLane';
12 +import type {UpdateQueue} from './ReactFiberClassUpdateQueue';
13 import type {Flags} from './ReactFiberFlags';
14
15 import {
@@ -26,7 +26,7 @@ import {
26 warnAboutDeprecatedLifecycles,
27 enableLazyContextPropagation,
28 } from 'shared/ReactFeatureFlags';
29 -import ReactStrictModeWarnings from './ReactStrictModeWarnings.old';
29 +import ReactStrictModeWarnings from './ReactStrictModeWarnings';
30 import {isMounted} from './ReactFiberTreeReflection';
31 import {get as getInstance, set as setInstance} from 'shared/ReactInstanceMap';
32 import shallowEqual from 'shared/shallowEqual';
@@ -36,7 +36,7 @@ import assign from 'shared/assign';
36 import isArray from 'shared/isArray';
37 import {REACT_CONTEXT_TYPE, REACT_PROVIDER_TYPE} from 'shared/ReactSymbols';
38
39 -import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
39 +import {resolveDefaultProps} from './ReactFiberLazyComponent';
40 import {
41 DebugTracingMode,
42 NoMode,
@@ -55,27 +55,27 @@ import {
55 ForceUpdate,
56 initializeUpdateQueue,
57 cloneUpdateQueue,
58 -} from './ReactFiberClassUpdateQueue.old';
59 -import {NoLanes} from './ReactFiberLane.old';
58 +} from './ReactFiberClassUpdateQueue';
59 +import {NoLanes} from './ReactFiberLane';
60 import {
61 cacheContext,
62 getMaskedContext,
63 getUnmaskedContext,
64 hasContextChanged,
65 emptyContextObject,
66 -} from './ReactFiberContext.old';
67 -import {readContext, checkIfContextChanged} from './ReactFiberNewContext.old';
66 +} from './ReactFiberContext';
67 +import {readContext, checkIfContextChanged} from './ReactFiberNewContext';
68 import {
69 requestEventTime,
70 requestUpdateLane,
71 scheduleUpdateOnFiber,
72 -} from './ReactFiberWorkLoop.old';
72 +} from './ReactFiberWorkLoop';
73 import {logForceUpdateScheduled, logStateUpdateScheduled} from './DebugTracing';
74 import {
75 markForceUpdateScheduled,
76 markStateUpdateScheduled,
77 setIsStrictModeForDevtools,
78 -} from './ReactFiberDevToolsHook.old';
78 +} from './ReactFiberDevToolsHook';
79
80 const fakeInternalInstance = {};
81
packages/react-reconciler/src/ReactFiberClassUpdateQueue.js renamed
+6 -6
@@ -85,7 +85,7 @@
85 // resources, but the final state is always the same.
86
87 import type {Fiber, FiberRoot} from './ReactInternalTypes';
88 -import type {Lanes, Lane} from './ReactFiberLane.old';
88 +import type {Lanes, Lane} from './ReactFiberLane';
89
90 import {
91 NoLane,
@@ -97,11 +97,11 @@ import {
97 isTransitionLane,
98 intersectLanes,
99 markRootEntangled,
100 -} from './ReactFiberLane.old';
100 +} from './ReactFiberLane';
101 import {
102 enterDisallowedContextReadInDEV,
103 exitDisallowedContextReadInDEV,
104 -} from './ReactFiberNewContext.old';
104 +} from './ReactFiberNewContext';
105 import {
106 Callback,
107 Visibility,
@@ -116,12 +116,12 @@ import {
116 markSkippedUpdateLanes,
117 isUnsafeClassRenderPhaseUpdate,
118 getWorkInProgressRootRenderLanes,
119 -} from './ReactFiberWorkLoop.old';
119 +} from './ReactFiberWorkLoop';
120 import {
121 enqueueConcurrentClassUpdate,
122 unsafe_markUpdateLaneFromFiberToRoot,
123 -} from './ReactFiberConcurrentUpdates.old';
124 -import {setIsStrictModeForDevtools} from './ReactFiberDevToolsHook.old';
123 +} from './ReactFiberConcurrentUpdates';
124 +import {setIsStrictModeForDevtools} from './ReactFiberDevToolsHook';
125
126 import assign from 'shared/assign';
127
packages/react-reconciler/src/ReactFiberCommitWork.js renamed
+16 -16
@@ -16,10 +16,10 @@ import type {
16 UpdatePayload,
17 } from './ReactFiberHostConfig';
18 import type {Fiber, FiberRoot} from './ReactInternalTypes';
19 -import type {Lanes} from './ReactFiberLane.old';
20 -import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
21 -import type {UpdateQueue} from './ReactFiberClassUpdateQueue.old';
22 -import type {FunctionComponentUpdateQueue} from './ReactFiberHooks.old';
19 +import type {Lanes} from './ReactFiberLane';
20 +import type {SuspenseState} from './ReactFiberSuspenseComponent';
21 +import type {UpdateQueue} from './ReactFiberClassUpdateQueue';
22 +import type {FunctionComponentUpdateQueue} from './ReactFiberHooks';
23 import type {Wakeable} from 'shared/ReactTypes';
24 import {isOffscreenManual} from './ReactFiberOffscreenComponent';
25 import type {
@@ -29,13 +29,13 @@ import type {
29 OffscreenProps,
30 } from './ReactFiberOffscreenComponent';
31 import type {HookFlags} from './ReactHookEffectTags';
32 -import type {Cache} from './ReactFiberCacheComponent.old';
33 -import type {RootState} from './ReactFiberRoot.old';
32 +import type {Cache} from './ReactFiberCacheComponent';
33 +import type {RootState} from './ReactFiberRoot';
34 import type {
35 Transition,
36 TracingMarkerInstance,
37 TransitionAbort,
38 -} from './ReactFiberTracingMarkerComponent.old';
38 +} from './ReactFiberTracingMarkerComponent';
39
40 import {
41 enableCreateEventHandleAPI,
@@ -100,7 +100,7 @@ import {
100 setCurrentFiber as setCurrentDebugFiberInDEV,
101 getCurrentFiber as getCurrentDebugFiberInDEV,
102 } from './ReactCurrentFiber';
103 -import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
103 +import {resolveDefaultProps} from './ReactFiberLazyComponent';
104 import {
105 isCurrentUpdateNested,
106 getCommitTime,
@@ -108,13 +108,13 @@ import {
108 startLayoutEffectTimer,
109 recordPassiveEffectDuration,
110 startPassiveEffectTimer,
111 -} from './ReactProfilerTimer.old';
111 +} from './ReactProfilerTimer';
112 import {ConcurrentMode, NoMode, ProfileMode} from './ReactTypeOfMode';
113 import {
114 deferHiddenCallbacks,
115 commitHiddenCallbacks,
116 commitCallbacks,
117 -} from './ReactFiberClassUpdateQueue.old';
117 +} from './ReactFiberClassUpdateQueue';
118 import {
119 getPublicInstance,
120 supportsMutation,
@@ -171,7 +171,7 @@ import {
171 CommitContext,
172 RenderContext,
173 NoContext,
174 -} from './ReactFiberWorkLoop.old';
174 +} from './ReactFiberWorkLoop';
175 import {
176 NoFlags as NoHookEffect,
177 HasEffect as HookHasEffect,
@@ -179,7 +179,7 @@ import {
179 Insertion as HookInsertion,
180 Passive as HookPassive,
181 } from './ReactHookEffectTags';
182 -import {didWarnAboutReassigningProps} from './ReactFiberBeginWork.old';
182 +import {didWarnAboutReassigningProps} from './ReactFiberBeginWork';
183 import {doesFiberContain} from './ReactFiberTreeReflection';
184 import {invokeGuardedCallback, clearCaughtError} from 'shared/ReactErrorUtils';
185 import {
@@ -193,9 +193,9 @@ import {
193 markComponentLayoutEffectUnmountStarted,
194 markComponentLayoutEffectUnmountStopped,
195 onCommitUnmount,
196 -} from './ReactFiberDevToolsHook.old';
197 -import {releaseCache, retainCache} from './ReactFiberCacheComponent.old';
198 -import {clearTransitionsForLanes} from './ReactFiberLane.old';
196 +} from './ReactFiberDevToolsHook';
197 +import {releaseCache, retainCache} from './ReactFiberCacheComponent';
198 +import {clearTransitionsForLanes} from './ReactFiberLane';
199 import {
200 OffscreenVisible,
201 OffscreenDetached,
@@ -204,7 +204,7 @@ import {
204 import {
205 TransitionRoot,
206 TransitionTracingMarker,
207 -} from './ReactFiberTracingMarkerComponent.old';
207 +} from './ReactFiberTracingMarkerComponent';
208
209 let didWarnAboutUndefinedSnapshotBeforeUpdate: Set<mixed> | null = null;
210 if (__DEV__) {
packages/react-reconciler/src/ReactFiberCompleteWork.js renamed
+22 -22
@@ -8,8 +8,8 @@
8 */
9
10 import type {Fiber, FiberRoot} from './ReactInternalTypes';
11 -import type {RootState} from './ReactFiberRoot.old';
12 -import type {Lanes, Lane} from './ReactFiberLane.old';
11 +import type {RootState} from './ReactFiberRoot';
12 +import type {Lanes, Lane} from './ReactFiberLane';
13 import type {
14 ReactScopeInstance,
15 ReactContext,
@@ -25,11 +25,11 @@ import type {
25 import type {
26 SuspenseState,
27 SuspenseListRenderState,
28 -} from './ReactFiberSuspenseComponent.old';
28 +} from './ReactFiberSuspenseComponent';
29 import {isOffscreenManual} from './ReactFiberOffscreenComponent';
30 import type {OffscreenState} from './ReactFiberOffscreenComponent';
31 -import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent.old';
32 -import type {Cache} from './ReactFiberCacheComponent.old';
31 +import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
32 +import type {Cache} from './ReactFiberCacheComponent';
33 import {
34 enableLegacyHidden,
35 enableHostSingletons,
@@ -41,7 +41,7 @@ import {
41 enableFloat,
42 } from 'shared/ReactFeatureFlags';
43
44 -import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource.old';
44 +import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource';
45
46 import {now} from './Scheduler';
47
@@ -117,7 +117,7 @@ import {
117 popHostContext,
118 getHostContext,
119 popHostContainer,
120 -} from './ReactFiberHostContext.old';
120 +} from './ReactFiberHostContext';
121 import {
122 suspenseStackCursor,
123 popSuspenseListContext,
@@ -127,15 +127,15 @@ import {
127 ForceSuspenseFallback,
128 setDefaultShallowSuspenseListContext,
129 isBadSuspenseFallback,
130 -} from './ReactFiberSuspenseContext.old';
131 -import {popHiddenContext} from './ReactFiberHiddenContext.old';
132 -import {findFirstSuspended} from './ReactFiberSuspenseComponent.old';
130 +} from './ReactFiberSuspenseContext';
131 +import {popHiddenContext} from './ReactFiberHiddenContext';
132 +import {findFirstSuspended} from './ReactFiberSuspenseComponent';
133 import {
134 isContextProvider as isLegacyContextProvider,
135 popContext as popLegacyContext,
136 popTopLevelContextObject as popTopLevelLegacyContextObject,
137 -} from './ReactFiberContext.old';
138 -import {popProvider} from './ReactFiberNewContext.old';
137 +} from './ReactFiberContext';
138 +import {popProvider} from './ReactFiberNewContext';
139 import {
140 prepareToHydrateHostInstance,
141 prepareToHydrateHostTextInstance,
@@ -146,31 +146,31 @@ import {
146 getIsHydrating,
147 hasUnhydratedTailNodes,
148 upgradeHydrationErrorsToRecoverable,
149 -} from './ReactFiberHydrationContext.old';
149 +} from './ReactFiberHydrationContext';
150 import {
151 renderDidSuspend,
152 renderDidSuspendDelayIfPossible,
153 renderHasNotSuspendedYet,
154 getRenderTargetTime,
155 getWorkInProgressTransitions,
156 -} from './ReactFiberWorkLoop.old';
156 +} from './ReactFiberWorkLoop';
157 import {
158 OffscreenLane,
159 SomeRetryLane,
160 NoLanes,
161 includesSomeLane,
162 mergeLanes,
163 -} from './ReactFiberLane.old';
164 -import {resetChildFibers} from './ReactChildFiber.old';
165 -import {createScopeInstance} from './ReactFiberScope.old';
166 -import {transferActualDuration} from './ReactProfilerTimer.old';
167 -import {popCacheProvider} from './ReactFiberCacheComponent.old';
168 -import {popTreeContext} from './ReactFiberTreeContext.old';
169 -import {popRootTransition, popTransition} from './ReactFiberTransition.old';
163 +} from './ReactFiberLane';
164 +import {resetChildFibers} from './ReactChildFiber';
165 +import {createScopeInstance} from './ReactFiberScope';
166 +import {transferActualDuration} from './ReactProfilerTimer';
167 +import {popCacheProvider} from './ReactFiberCacheComponent';
168 +import {popTreeContext} from './ReactFiberTreeContext';
169 +import {popRootTransition, popTransition} from './ReactFiberTransition';
170 import {
171 popMarkerInstance,
172 popRootMarkerInstance,
173 -} from './ReactFiberTracingMarkerComponent.old';
173 +} from './ReactFiberTracingMarkerComponent';
174
175 function markUpdate(workInProgress: Fiber) {
176 // Tag the fiber with an update effect. This turns a Placement into
packages/react-reconciler/src/ReactFiberConcurrentUpdates.js renamed
+5 -10
@@ -11,25 +11,20 @@ import type {Fiber, FiberRoot} from './ReactInternalTypes';
11 import type {
12 UpdateQueue as HookQueue,
13 Update as HookUpdate,
14 -} from './ReactFiberHooks.old';
14 +} from './ReactFiberHooks';
15 import type {
16 SharedQueue as ClassQueue,
17 Update as ClassUpdate,
18 -} from './ReactFiberClassUpdateQueue.old';
19 -import type {Lane, Lanes} from './ReactFiberLane.old';
18 +} from './ReactFiberClassUpdateQueue';
19 +import type {Lane, Lanes} from './ReactFiberLane';
20 import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
21
22 import {
23 warnAboutUpdateOnNotYetMountedFiberInDEV,
24 throwIfInfiniteUpdateLoopDetected,
25 getWorkInProgressRoot,
26 -} from './ReactFiberWorkLoop.old';
27 -import {
28 - NoLane,
29 - NoLanes,
30 - mergeLanes,
31 - markHiddenUpdate,
32 -} from './ReactFiberLane.old';
26 +} from './ReactFiberWorkLoop';
27 +import {NoLane, NoLanes, mergeLanes, markHiddenUpdate} from './ReactFiberLane';
28 import {NoFlags, Placement, Hydrating} from './ReactFiberFlags';
29 import {HostRoot, OffscreenComponent} from './ReactWorkTags';
30 import {OffscreenVisible} from './ReactFiberOffscreenComponent';
packages/react-reconciler/src/ReactFiberContext.js renamed
+2 -2
@@ -8,7 +8,7 @@
8 */
9
10 import type {Fiber} from './ReactInternalTypes';
11 -import type {StackCursor} from './ReactFiberStack.old';
11 +import type {StackCursor} from './ReactFiberStack';
12
13 import {isFiberMounted} from './ReactFiberTreeReflection';
14 import {disableLegacyContext} from 'shared/ReactFeatureFlags';
@@ -16,7 +16,7 @@ import {ClassComponent, HostRoot} from './ReactWorkTags';
16 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
17 import checkPropTypes from 'shared/checkPropTypes';
18
19 -import {createCursor, push, pop} from './ReactFiberStack.old';
19 +import {createCursor, push, pop} from './ReactFiberStack';
20
21 let warnedAboutMissingGetChildContext;
22
packages/react-reconciler/src/ReactFiberDevToolsHook.js renamed
+4 -7
@@ -7,20 +7,17 @@
7 * @flow
8 */
9
10 -import type {Lane, Lanes} from './ReactFiberLane.old';
10 +import type {Lane, Lanes} from './ReactFiberLane';
11 import type {Fiber, FiberRoot} from './ReactInternalTypes';
12 import type {ReactNodeList, Wakeable} from 'shared/ReactTypes';
13 -import type {EventPriority} from './ReactEventPriorities.old';
13 +import type {EventPriority} from './ReactEventPriorities';
14 // import type {DevToolsProfilingHooks} from 'react-devtools-shared/src/backend/types';
15 // TODO: This import doesn't work because the DevTools depend on the DOM version of React
16 // and to properly type check against DOM React we can't also type check again non-DOM
17 // React which this hook might be in.
18 type DevToolsProfilingHooks = any;
19
20 -import {
21 - getLabelForLane,
22 - TotalLanes,
23 -} from 'react-reconciler/src/ReactFiberLane.old';
20 +import {getLabelForLane, TotalLanes} from 'react-reconciler/src/ReactFiberLane';
21 import {DidCapture} from './ReactFiberFlags';
22 import {
23 consoleManagedByDevToolsDuringStrictMode,
@@ -32,7 +29,7 @@ import {
29 ContinuousEventPriority,
30 DefaultEventPriority,
31 IdleEventPriority,
35 -} from './ReactEventPriorities.old';
32 +} from './ReactEventPriorities';
33 import {
34 ImmediatePriority as ImmediateSchedulerPriority,
35 UserBlockingPriority as UserBlockingSchedulerPriority,
packages/react-reconciler/src/ReactFiberHiddenContext.js renamed
+5 -5
@@ -8,13 +8,13 @@
8 */
9
10 import type {Fiber} from './ReactInternalTypes';
11 -import type {StackCursor} from './ReactFiberStack.old';
12 -import type {Lanes} from './ReactFiberLane.old';
11 +import type {StackCursor} from './ReactFiberStack';
12 +import type {Lanes} from './ReactFiberLane';
13
14 -import {createCursor, push, pop} from './ReactFiberStack.old';
14 +import {createCursor, push, pop} from './ReactFiberStack';
15
16 -import {getRenderLanes, setRenderLanes} from './ReactFiberWorkLoop.old';
17 -import {NoLanes, mergeLanes} from './ReactFiberLane.old';
16 +import {getRenderLanes, setRenderLanes} from './ReactFiberWorkLoop';
17 +import {NoLanes, mergeLanes} from './ReactFiberLane';
18
19 // TODO: Remove `renderLanes` context in favor of hidden context
20 type HiddenContext = {
packages/react-reconciler/src/ReactFiberHooks.js renamed
+15 -15
@@ -23,7 +23,7 @@ import type {
23 HookType,
24 MemoCache,
25 } from './ReactInternalTypes';
26 -import type {Lanes, Lane} from './ReactFiberLane.old';
26 +import type {Lanes, Lane} from './ReactFiberLane';
27 import type {HookFlags} from './ReactHookEffectTags';
28 import type {Flags} from './ReactFiberFlags';
29
@@ -71,14 +71,14 @@ import {
71 markRootEntangled,
72 markRootMutableRead,
73 NoTimestamp,
74 -} from './ReactFiberLane.old';
74 +} from './ReactFiberLane';
75 import {
76 ContinuousEventPriority,
77 getCurrentUpdatePriority,
78 setCurrentUpdatePriority,
79 higherEventPriority,
80 -} from './ReactEventPriorities.old';
81 -import {readContext, checkIfContextChanged} from './ReactFiberNewContext.old';
80 +} from './ReactEventPriorities';
81 +import {readContext, checkIfContextChanged} from './ReactFiberNewContext';
82 import {HostRoot, CacheComponent} from './ReactWorkTags';
83 import {
84 LayoutStatic as LayoutStaticEffect,
@@ -104,7 +104,7 @@ import {
104 requestEventTime,
105 markSkippedUpdateLanes,
106 isInvalidExecutionContextForEventFunction,
107 -} from './ReactFiberWorkLoop.old';
107 +} from './ReactFiberWorkLoop';
108
109 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
110 import is from 'shared/objectIs';
@@ -112,38 +112,38 @@ import isArray from 'shared/isArray';
112 import {
113 markWorkInProgressReceivedUpdate,
114 checkIfWorkInProgressReceivedUpdate,
115 -} from './ReactFiberBeginWork.old';
116 -import {getIsHydrating} from './ReactFiberHydrationContext.old';
115 +} from './ReactFiberBeginWork';
116 +import {getIsHydrating} from './ReactFiberHydrationContext';
117 import {
118 getWorkInProgressVersion,
119 markSourceAsDirty,
120 setWorkInProgressVersion,
121 warnAboutMultipleRenderersDEV,
122 -} from './ReactMutableSource.old';
122 +} from './ReactMutableSource';
123 import {logStateUpdateScheduled} from './DebugTracing';
124 import {
125 markStateUpdateScheduled,
126 setIsStrictModeForDevtools,
127 -} from './ReactFiberDevToolsHook.old';
128 -import {createCache} from './ReactFiberCacheComponent.old';
127 +} from './ReactFiberDevToolsHook';
128 +import {createCache} from './ReactFiberCacheComponent';
129 import {
130 createUpdate as createLegacyQueueUpdate,
131 enqueueUpdate as enqueueLegacyQueueUpdate,
132 entangleTransitions as entangleLegacyQueueTransitions,
133 -} from './ReactFiberClassUpdateQueue.old';
133 +} from './ReactFiberClassUpdateQueue';
134 import {
135 enqueueConcurrentHookUpdate,
136 enqueueConcurrentHookUpdateAndEagerlyBailout,
137 enqueueConcurrentRenderForLane,
138 -} from './ReactFiberConcurrentUpdates.old';
139 -import {getTreeId} from './ReactFiberTreeContext.old';
138 +} from './ReactFiberConcurrentUpdates';
139 +import {getTreeId} from './ReactFiberTreeContext';
140 import {now} from './Scheduler';
141 import {
142 trackUsedThenable,
143 checkIfUseWrappedInTryCatch,
144 createThenableState,
145 -} from './ReactFiberThenable.old';
146 -import type {ThenableState} from './ReactFiberThenable.old';
145 +} from './ReactFiberThenable';
146 +import type {ThenableState} from './ReactFiberThenable';
147
148 const {ReactCurrentDispatcher, ReactCurrentBatchConfig} = ReactSharedInternals;
149
packages/react-reconciler/src/ReactFiberHostContext.js renamed
+2 -2
@@ -8,11 +8,11 @@
8 */
9
10 import type {Fiber} from './ReactInternalTypes';
11 -import type {StackCursor} from './ReactFiberStack.old';
11 +import type {StackCursor} from './ReactFiberStack';
12 import type {Container, HostContext} from './ReactFiberHostConfig';
13
14 import {getChildHostContext, getRootHostContext} from './ReactFiberHostConfig';
15 -import {createCursor, push, pop} from './ReactFiberStack.old';
15 +import {createCursor, push, pop} from './ReactFiberStack';
16
17 const contextStackCursor: StackCursor<HostContext | null> = createCursor(null);
18 const contextFiberStackCursor: StackCursor<Fiber | null> = createCursor(null);
packages/react-reconciler/src/ReactFiberHotReloading.js renamed
+5 -5
@@ -19,11 +19,11 @@ import {
19 flushSync,
20 scheduleUpdateOnFiber,
21 flushPassiveEffects,
22 -} from './ReactFiberWorkLoop.old';
23 -import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates.old';
24 -import {updateContainer} from './ReactFiberReconciler.old';
25 -import {emptyContextObject} from './ReactFiberContext.old';
26 -import {SyncLane, NoTimestamp} from './ReactFiberLane.old';
22 +} from './ReactFiberWorkLoop';
23 +import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates';
24 +import {updateContainer} from './ReactFiberReconciler';
25 +import {emptyContextObject} from './ReactFiberContext';
26 +import {SyncLane, NoTimestamp} from './ReactFiberLane';
27 import {
28 ClassComponent,
29 FunctionComponent,
packages/react-reconciler/src/ReactFiberHydrationContext.js renamed
+7 -10
@@ -17,8 +17,8 @@ import type {
17 Container,
18 HostContext,
19 } from './ReactFiberHostConfig';
20 -import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
21 -import type {TreeContext} from './ReactFiberTreeContext.old';
20 +import type {SuspenseState} from './ReactFiberSuspenseComponent';
21 +import type {TreeContext} from './ReactFiberTreeContext';
22 import type {CapturedValue} from './ReactCapturedValue';
23
24 import {
@@ -40,7 +40,7 @@ import {enableHostSingletons, enableFloat} from 'shared/ReactFeatureFlags';
40 import {
41 createFiberFromHostInstanceForDeletion,
42 createFiberFromDehydratedFragment,
43 -} from './ReactFiber.old';
43 +} from './ReactFiber';
44 import {
45 shouldSetTextContent,
46 supportsHydration,
@@ -74,16 +74,13 @@ import {
74 didNotFindHydratableSuspenseInstance,
75 resolveSingletonInstance,
76 } from './ReactFiberHostConfig';
77 -import {OffscreenLane} from './ReactFiberLane.old';
77 +import {OffscreenLane} from './ReactFiberLane';
78 import {
79 getSuspendedTreeContext,
80 restoreSuspendedTreeContext,
81 -} from './ReactFiberTreeContext.old';
82 -import {queueRecoverableErrors} from './ReactFiberWorkLoop.old';
83 -import {
84 - getRootHostContainer,
85 - getHostContext,
86 -} from './ReactFiberHostContext.old';
81 +} from './ReactFiberTreeContext';
82 +import {queueRecoverableErrors} from './ReactFiberWorkLoop';
83 +import {getRootHostContainer, getHostContext} from './ReactFiberHostContext';
84
85 // The deepest Fiber on the stack involved in a hydration context.
86 // This may have been an insertion or a hydration.
packages/react-reconciler/src/ReactFiberLane.js renamed
+3 -3
@@ -8,8 +8,8 @@
8 */
9
10 import type {Fiber, FiberRoot} from './ReactInternalTypes';
11 -import type {Transition} from './ReactFiberTracingMarkerComponent.old';
12 -import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates.old';
11 +import type {Transition} from './ReactFiberTracingMarkerComponent';
12 +import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates';
13
14 // TODO: Ideally these types would be opaque but that doesn't work well with
15 // our reconciler fork infra, since these leak into non-reconciler packages.
@@ -24,7 +24,7 @@ import {
24 allowConcurrentByDefault,
25 enableTransitionTracing,
26 } from 'shared/ReactFeatureFlags';
27 -import {isDevToolsPresent} from './ReactFiberDevToolsHook.old';
27 +import {isDevToolsPresent} from './ReactFiberDevToolsHook';
28 import {ConcurrentUpdatesByDefaultMode, NoMode} from './ReactTypeOfMode';
29 import {clz32} from './clz32';
30
packages/react-reconciler/src/ReactFiberLazyComponent.js renamed
packages/react-reconciler/src/ReactFiberNewContext.js renamed
+7 -7
@@ -13,12 +13,12 @@ import type {
13 ContextDependency,
14 Dependencies,
15 } from './ReactInternalTypes';
16 -import type {StackCursor} from './ReactFiberStack.old';
17 -import type {Lanes} from './ReactFiberLane.old';
18 -import type {SharedQueue} from './ReactFiberClassUpdateQueue.old';
16 +import type {StackCursor} from './ReactFiberStack';
17 +import type {Lanes} from './ReactFiberLane';
18 +import type {SharedQueue} from './ReactFiberClassUpdateQueue';
19
20 import {isPrimaryRenderer} from './ReactFiberHostConfig';
21 -import {createCursor, push, pop} from './ReactFiberStack.old';
21 +import {createCursor, push, pop} from './ReactFiberStack';
22 import {
23 ContextProvider,
24 ClassComponent,
@@ -31,7 +31,7 @@ import {
31 includesSomeLane,
32 mergeLanes,
33 pickArbitraryLane,
34 -} from './ReactFiberLane.old';
34 +} from './ReactFiberLane';
35 import {
36 NoFlags,
37 DidPropagateContext,
@@ -39,8 +39,8 @@ import {
39 } from './ReactFiberFlags';
40
41 import is from 'shared/objectIs';
42 -import {createUpdate, ForceUpdate} from './ReactFiberClassUpdateQueue.old';
43 -import {markWorkInProgressReceivedUpdate} from './ReactFiberBeginWork.old';
42 +import {createUpdate, ForceUpdate} from './ReactFiberClassUpdateQueue';
43 +import {markWorkInProgressReceivedUpdate} from './ReactFiberBeginWork';
44 import {
45 enableLazyContextPropagation,
46 enableServerContext,
packages/react-reconciler/src/ReactFiberOffscreenComponent.js
+3 -3
@@ -8,13 +8,13 @@
8 */
9
10 import type {ReactNodeList, OffscreenMode, Wakeable} from 'shared/ReactTypes';
11 -import type {Lanes} from './ReactFiberLane.old';
12 -import type {SpawnedCachePool} from './ReactFiberCacheComponent.old';
11 +import type {Lanes} from './ReactFiberLane';
12 +import type {SpawnedCachePool} from './ReactFiberCacheComponent';
13 import type {Fiber} from './ReactInternalTypes';
14 import type {
15 Transition,
16 TracingMarkerInstance,
17 -} from './ReactFiberTracingMarkerComponent.old';
17 +} from './ReactFiberTracingMarkerComponent';
18
19 export type OffscreenProps = {
20 // TODO: Pick an API before exposing the Offscreen type. I've chosen an enum
packages/react-reconciler/src/ReactFiberReconciler.js renamed
+12 -12
@@ -22,8 +22,8 @@ import type {
22 RendererInspectionConfig,
23 } from './ReactFiberHostConfig';
24 import type {ReactNodeList} from 'shared/ReactTypes';
25 -import type {Lane} from './ReactFiberLane.old';
26 -import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
25 +import type {Lane} from './ReactFiberLane';
26 +import type {SuspenseState} from './ReactFiberSuspenseComponent';
27
28 import {
29 findCurrentHostFiber,
@@ -47,14 +47,14 @@ import {
47 processChildContext,
48 emptyContextObject,
49 isContextProvider as isLegacyContextProvider,
50 -} from './ReactFiberContext.old';
51 -import {createFiberRoot} from './ReactFiberRoot.old';
50 +} from './ReactFiberContext';
51 +import {createFiberRoot} from './ReactFiberRoot';
52 import {isRootDehydrated} from './ReactFiberShellHydration';
53 import {
54 injectInternals,
55 markRenderScheduled,
56 onScheduleRoot,
57 -} from './ReactFiberDevToolsHook.old';
57 +} from './ReactFiberDevToolsHook';
58 import {
59 requestEventTime,
60 requestUpdateLane,
@@ -68,13 +68,13 @@ import {
68 deferredUpdates,
69 discreteUpdates,
70 flushPassiveEffects,
71 -} from './ReactFiberWorkLoop.old';
72 -import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates.old';
71 +} from './ReactFiberWorkLoop';
72 +import {enqueueConcurrentRenderForLane} from './ReactFiberConcurrentUpdates';
73 import {
74 createUpdate,
75 enqueueUpdate,
76 entangleTransitions,
77 -} from './ReactFiberClassUpdateQueue.old';
77 +} from './ReactFiberClassUpdateQueue';
78 import {
79 isRendering as ReactCurrentFiberIsRendering,
80 current as ReactCurrentFiberCurrent,
@@ -88,19 +88,19 @@ import {
88 NoTimestamp,
89 getHighestPriorityPendingLanes,
90 higherPriorityLane,
91 -} from './ReactFiberLane.old';
91 +} from './ReactFiberLane';
92 import {
93 getCurrentUpdatePriority,
94 runWithPriority,
95 -} from './ReactEventPriorities.old';
95 +} from './ReactEventPriorities';
96 import {
97 scheduleRefresh,
98 scheduleRoot,
99 setRefreshHandler,
100 findHostInstancesForRefresh,
101 -} from './ReactFiberHotReloading.old';
101 +} from './ReactFiberHotReloading';
102 import ReactVersion from 'shared/ReactVersion';
103 -export {registerMutableSourceForHydration} from './ReactMutableSource.old';
103 +export {registerMutableSourceForHydration} from './ReactMutableSource';
104 export {createPortal} from './ReactPortal';
105 export {
106 createComponentSelector,
packages/react-reconciler/src/ReactFiberRoot.js renamed
+5 -5
@@ -14,18 +14,18 @@ import type {
14 TransitionTracingCallbacks,
15 } from './ReactInternalTypes';
16 import type {RootTag} from './ReactRootTags';
17 -import type {Cache} from './ReactFiberCacheComponent.old';
17 +import type {Cache} from './ReactFiberCacheComponent';
18 import type {Container} from './ReactFiberHostConfig';
19
20 import {noTimeout, supportsHydration} from './ReactFiberHostConfig';
21 -import {createHostRootFiber} from './ReactFiber.old';
21 +import {createHostRootFiber} from './ReactFiber';
22 import {
23 NoLane,
24 NoLanes,
25 NoTimestamp,
26 TotalLanes,
27 createLaneMap,
28 -} from './ReactFiberLane.old';
28 +} from './ReactFiberLane';
29 import {
30 enableSuspenseCallback,
31 enableCache,
@@ -34,9 +34,9 @@ import {
34 enableUpdaterTracking,
35 enableTransitionTracing,
36 } from 'shared/ReactFeatureFlags';
37 -import {initializeUpdateQueue} from './ReactFiberClassUpdateQueue.old';
37 +import {initializeUpdateQueue} from './ReactFiberClassUpdateQueue';
38 import {LegacyRoot, ConcurrentRoot} from './ReactRootTags';
39 -import {createCache, retainCache} from './ReactFiberCacheComponent.old';
39 +import {createCache, retainCache} from './ReactFiberCacheComponent';
40
41 export type RootState = {
42 element: any,
packages/react-reconciler/src/ReactFiberScope.js renamed
packages/react-reconciler/src/ReactFiberShellHydration.js
+1 -1
@@ -8,7 +8,7 @@
8 */
9
10 import type {FiberRoot} from './ReactInternalTypes';
11 -import type {RootState} from './ReactFiberRoot.old';
11 +import type {RootState} from './ReactFiberRoot';
12
13 // This is imported by the event replaying implementation in React DOM. It's
14 // in a separate file to break a circular dependency between the renderer and
packages/react-reconciler/src/ReactFiberStack.js renamed
packages/react-reconciler/src/ReactFiberSuspenseComponent.js renamed
+2 -2
@@ -10,8 +10,8 @@
10 import type {ReactNodeList, Wakeable} from 'shared/ReactTypes';
11 import type {Fiber} from './ReactInternalTypes';
12 import type {SuspenseInstance} from './ReactFiberHostConfig';
13 -import type {Lane} from './ReactFiberLane.old';
14 -import type {TreeContext} from './ReactFiberTreeContext.old';
13 +import type {Lane} from './ReactFiberLane';
14 +import type {TreeContext} from './ReactFiberTreeContext';
15
16 import {SuspenseComponent, SuspenseListComponent} from './ReactWorkTags';
17 import {NoFlags, DidCapture} from './ReactFiberFlags';
packages/react-reconciler/src/ReactFiberSuspenseContext.js renamed
+4 -7
@@ -8,15 +8,12 @@
8 */
9
10 import type {Fiber} from './ReactInternalTypes';
11 -import type {StackCursor} from './ReactFiberStack.old';
12 -import type {
13 - SuspenseState,
14 - SuspenseProps,
15 -} from './ReactFiberSuspenseComponent.old';
11 +import type {StackCursor} from './ReactFiberStack';
12 +import type {SuspenseState, SuspenseProps} from './ReactFiberSuspenseComponent';
13
14 import {enableSuspenseAvoidThisFallback} from 'shared/ReactFeatureFlags';
18 -import {createCursor, push, pop} from './ReactFiberStack.old';
19 -import {isCurrentTreeHidden} from './ReactFiberHiddenContext.old';
15 +import {createCursor, push, pop} from './ReactFiberStack';
16 +import {isCurrentTreeHidden} from './ReactFiberHiddenContext';
17 import {SuspenseComponent, OffscreenComponent} from './ReactWorkTags';
18
19 // The Suspense handler is the boundary that should capture if something
packages/react-reconciler/src/ReactFiberSyncTaskQueue.js renamed
+1 -1
@@ -13,7 +13,7 @@ import {
13 DiscreteEventPriority,
14 getCurrentUpdatePriority,
15 setCurrentUpdatePriority,
16 -} from './ReactEventPriorities.old';
16 +} from './ReactEventPriorities';
17 import {ImmediatePriority, scheduleCallback} from './Scheduler';
18
19 let syncQueue: Array<SchedulerCallback> | null = null;
packages/react-reconciler/src/ReactFiberThenable.js renamed
packages/react-reconciler/src/ReactFiberThrow.js renamed
+10 -10
@@ -8,9 +8,9 @@
8 */
9
10 import type {Fiber, FiberRoot} from './ReactInternalTypes';
11 -import type {Lane, Lanes} from './ReactFiberLane.old';
11 +import type {Lane, Lanes} from './ReactFiberLane';
12 import type {CapturedValue} from './ReactCapturedValue';
13 -import type {Update} from './ReactFiberClassUpdateQueue.old';
13 +import type {Update} from './ReactFiberClassUpdateQueue';
14 import type {Wakeable} from 'shared/ReactTypes';
15 import type {OffscreenQueue} from './ReactFiberOffscreenComponent';
16
@@ -47,9 +47,9 @@ import {
47 CaptureUpdate,
48 ForceUpdate,
49 enqueueUpdate,
50 -} from './ReactFiberClassUpdateQueue.old';
51 -import {markFailedErrorBoundaryForHotReloading} from './ReactFiberHotReloading.old';
52 -import {getSuspenseHandler} from './ReactFiberSuspenseContext.old';
50 +} from './ReactFiberClassUpdateQueue';
51 +import {markFailedErrorBoundaryForHotReloading} from './ReactFiberHotReloading';
52 +import {getSuspenseHandler} from './ReactFiberSuspenseContext';
53 import {
54 renderDidError,
55 renderDidSuspendDelayIfPossible,
@@ -58,23 +58,23 @@ import {
58 isAlreadyFailedLegacyErrorBoundary,
59 attachPingListener,
60 restorePendingUpdaters,
61 -} from './ReactFiberWorkLoop.old';
62 -import {propagateParentContextChangesToDeferredTree} from './ReactFiberNewContext.old';
61 +} from './ReactFiberWorkLoop';
62 +import {propagateParentContextChangesToDeferredTree} from './ReactFiberNewContext';
63 import {logCapturedError} from './ReactFiberErrorLogger';
64 import {logComponentSuspended} from './DebugTracing';
65 -import {isDevToolsPresent} from './ReactFiberDevToolsHook.old';
65 +import {isDevToolsPresent} from './ReactFiberDevToolsHook';
66 import {
67 SyncLane,
68 NoTimestamp,
69 includesSomeLane,
70 mergeLanes,
71 pickArbitraryLane,
72 -} from './ReactFiberLane.old';
72 +} from './ReactFiberLane';
73 import {
74 getIsHydrating,
75 markDidThrowWhileHydratingDEV,
76 queueHydrationError,
77 -} from './ReactFiberHydrationContext.old';
77 +} from './ReactFiberHydrationContext';
78 import {ConcurrentRoot} from './ReactRootTags';
79
80 function createRootErrorUpdate(
packages/react-reconciler/src/ReactFiberTracingMarkerComponent.js renamed
+3 -3
@@ -13,11 +13,11 @@ import type {
13 FiberRoot,
14 } from './ReactInternalTypes';
15 import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
16 -import type {StackCursor} from './ReactFiberStack.old';
16 +import type {StackCursor} from './ReactFiberStack';
17
18 import {enableTransitionTracing} from 'shared/ReactFeatureFlags';
19 -import {createCursor, push, pop} from './ReactFiberStack.old';
20 -import {getWorkInProgressTransitions} from './ReactFiberWorkLoop.old';
19 +import {createCursor, push, pop} from './ReactFiberStack';
20 +import {getWorkInProgressTransitions} from './ReactFiberWorkLoop';
21
22 export type SuspenseInfo = {name: string | null};
23
packages/react-reconciler/src/ReactFiberTransition.js renamed
+7 -7
@@ -7,23 +7,23 @@
7 * @flow
8 */
9 import type {Fiber, FiberRoot} from './ReactInternalTypes';
10 -import type {Lanes} from './ReactFiberLane.old';
11 -import type {StackCursor} from './ReactFiberStack.old';
12 -import type {Cache, SpawnedCachePool} from './ReactFiberCacheComponent.old';
13 -import type {Transition} from './ReactFiberTracingMarkerComponent.old';
10 +import type {Lanes} from './ReactFiberLane';
11 +import type {StackCursor} from './ReactFiberStack';
12 +import type {Cache, SpawnedCachePool} from './ReactFiberCacheComponent';
13 +import type {Transition} from './ReactFiberTracingMarkerComponent';
14
15 import {enableCache, enableTransitionTracing} from 'shared/ReactFeatureFlags';
16 import {isPrimaryRenderer} from './ReactFiberHostConfig';
17 -import {createCursor, push, pop} from './ReactFiberStack.old';
17 +import {createCursor, push, pop} from './ReactFiberStack';
18 import {
19 getWorkInProgressRoot,
20 getWorkInProgressTransitions,
21 -} from './ReactFiberWorkLoop.old';
21 +} from './ReactFiberWorkLoop';
22 import {
23 createCache,
24 retainCache,
25 CacheContext,
26 -} from './ReactFiberCacheComponent.old';
26 +} from './ReactFiberCacheComponent';
27
28 import ReactSharedInternals from 'shared/ReactSharedInternals';
29
packages/react-reconciler/src/ReactFiberTreeContext.js renamed
+1 -1
@@ -62,7 +62,7 @@
62
63 import type {Fiber} from 'react-reconciler/src/ReactInternalTypes';
64
65 -import {getIsHydrating} from './ReactFiberHydrationContext.old';
65 +import {getIsHydrating} from './ReactFiberHydrationContext';
66 import {clz32} from './clz32';
67 import {Forked, NoFlags} from './ReactFiberFlags';
68
packages/react-reconciler/src/ReactFiberTreeReflection.js
+1 -1
@@ -9,7 +9,7 @@
9
10 import type {Fiber} from './ReactInternalTypes';
11 import type {Container, SuspenseInstance} from './ReactFiberHostConfig';
12 -import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
12 +import type {SuspenseState} from './ReactFiberSuspenseComponent';
13
14 import {get as getInstance} from 'shared/ReactInstanceMap';
15 import ReactSharedInternals from 'shared/ReactSharedInternals';
packages/react-reconciler/src/ReactFiberUnwindWork.js renamed
+16 -16
@@ -9,12 +9,12 @@
9
10 import type {ReactContext} from 'shared/ReactTypes';
11 import type {Fiber, FiberRoot} from './ReactInternalTypes';
12 -import type {Lanes} from './ReactFiberLane.old';
13 -import type {SuspenseState} from './ReactFiberSuspenseComponent.old';
14 -import type {Cache} from './ReactFiberCacheComponent.old';
15 -import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent.old';
12 +import type {Lanes} from './ReactFiberLane';
13 +import type {SuspenseState} from './ReactFiberSuspenseComponent';
14 +import type {Cache} from './ReactFiberCacheComponent';
15 +import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
16
17 -import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource.old';
17 +import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource';
18 import {
19 ClassComponent,
20 HostRoot,
@@ -38,27 +38,27 @@ import {
38 enableTransitionTracing,
39 } from 'shared/ReactFeatureFlags';
40
41 -import {popHostContainer, popHostContext} from './ReactFiberHostContext.old';
41 +import {popHostContainer, popHostContext} from './ReactFiberHostContext';
42 import {
43 popSuspenseListContext,
44 popSuspenseHandler,
45 -} from './ReactFiberSuspenseContext.old';
46 -import {popHiddenContext} from './ReactFiberHiddenContext.old';
47 -import {resetHydrationState} from './ReactFiberHydrationContext.old';
45 +} from './ReactFiberSuspenseContext';
46 +import {popHiddenContext} from './ReactFiberHiddenContext';
47 +import {resetHydrationState} from './ReactFiberHydrationContext';
48 import {
49 isContextProvider as isLegacyContextProvider,
50 popContext as popLegacyContext,
51 popTopLevelContextObject as popTopLevelLegacyContextObject,
52 -} from './ReactFiberContext.old';
53 -import {popProvider} from './ReactFiberNewContext.old';
54 -import {popCacheProvider} from './ReactFiberCacheComponent.old';
55 -import {transferActualDuration} from './ReactProfilerTimer.old';
56 -import {popTreeContext} from './ReactFiberTreeContext.old';
57 -import {popRootTransition, popTransition} from './ReactFiberTransition.old';
52 +} from './ReactFiberContext';
53 +import {popProvider} from './ReactFiberNewContext';
54 +import {popCacheProvider} from './ReactFiberCacheComponent';
55 +import {transferActualDuration} from './ReactProfilerTimer';
56 +import {popTreeContext} from './ReactFiberTreeContext';
57 +import {popRootTransition, popTransition} from './ReactFiberTransition';
58 import {
59 popMarkerInstance,
60 popRootMarkerInstance,
61 -} from './ReactFiberTracingMarkerComponent.old';
61 +} from './ReactFiberTracingMarkerComponent';
62
63 function unwindWork(
64 current: Fiber | null,
packages/react-reconciler/src/ReactFiberWorkLoop.js renamed
+30 -36
@@ -11,19 +11,16 @@ import {REACT_STRICT_MODE_TYPE} from 'shared/ReactSymbols';
11
12 import type {Wakeable, Thenable} from 'shared/ReactTypes';
13 import type {Fiber, FiberRoot} from './ReactInternalTypes';
14 -import type {Lanes, Lane} from './ReactFiberLane.old';
15 -import type {
16 - SuspenseProps,
17 - SuspenseState,
18 -} from './ReactFiberSuspenseComponent.old';
19 -import type {FunctionComponentUpdateQueue} from './ReactFiberHooks.old';
20 -import type {EventPriority} from './ReactEventPriorities.old';
14 +import type {Lanes, Lane} from './ReactFiberLane';
15 +import type {SuspenseProps, SuspenseState} from './ReactFiberSuspenseComponent';
16 +import type {FunctionComponentUpdateQueue} from './ReactFiberHooks';
17 +import type {EventPriority} from './ReactEventPriorities';
18 import type {
19 PendingTransitionCallbacks,
20 PendingBoundaries,
21 Transition,
22 TransitionAbort,
26 -} from './ReactFiberTracingMarkerComponent.old';
23 +} from './ReactFiberTracingMarkerComponent';
24 import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
25
26 import {
@@ -64,7 +61,7 @@ import {
61 flushSyncCallbacksOnlyInLegacyMode,
62 scheduleSyncCallback,
63 scheduleLegacySyncCallback,
67 -} from './ReactFiberSyncTaskQueue.old';
64 +} from './ReactFiberSyncTaskQueue';
65 import {
66 logCommitStarted,
67 logCommitStopped,
@@ -94,9 +91,9 @@ import {
91 createWorkInProgress,
92 assignFiberPropertiesInDEV,
93 resetWorkInProgress,
97 -} from './ReactFiber.old';
94 +} from './ReactFiber';
95 import {isRootDehydrated} from './ReactFiberShellHydration';
99 -import {didSuspendOrErrorWhileHydratingDEV} from './ReactFiberHydrationContext.old';
96 +import {didSuspendOrErrorWhileHydratingDEV} from './ReactFiberHydrationContext';
97 import {
98 NoMode,
99 ProfileMode,
@@ -165,7 +162,7 @@ import {
162 movePendingFibersToMemoized,
163 addTransitionToLanesMap,
164 getTransitionsForLanes,
168 -} from './ReactFiberLane.old';
165 +} from './ReactFiberLane';
166 import {
167 DiscreteEventPriority,
168 ContinuousEventPriority,
@@ -175,23 +172,20 @@ import {
172 setCurrentUpdatePriority,
173 lowerEventPriority,
174 lanesToEventPriority,
178 -} from './ReactEventPriorities.old';
179 -import {
180 - requestCurrentTransition,
181 - NoTransition,
182 -} from './ReactFiberTransition.old';
175 +} from './ReactEventPriorities';
176 +import {requestCurrentTransition, NoTransition} from './ReactFiberTransition';
177 import {
178 SelectiveHydrationException,
179 beginWork as originalBeginWork,
180 replayFunctionComponent,
187 -} from './ReactFiberBeginWork.old';
188 -import {completeWork} from './ReactFiberCompleteWork.old';
189 -import {unwindWork, unwindInterruptedWork} from './ReactFiberUnwindWork.old';
181 +} from './ReactFiberBeginWork';
182 +import {completeWork} from './ReactFiberCompleteWork';
183 +import {unwindWork, unwindInterruptedWork} from './ReactFiberUnwindWork';
184 import {
185 throwException,
186 createRootErrorUpdate,
187 createClassErrorUpdate,
194 -} from './ReactFiberThrow.old';
188 +} from './ReactFiberThrow';
189 import {
190 commitBeforeMutationEffects,
191 commitLayoutEffects,
@@ -208,15 +202,15 @@ import {
202 invokePassiveEffectMountInDEV,
203 invokeLayoutEffectUnmountInDEV,
204 invokePassiveEffectUnmountInDEV,
211 -} from './ReactFiberCommitWork.old';
212 -import {enqueueUpdate} from './ReactFiberClassUpdateQueue.old';
213 -import {resetContextDependencies} from './ReactFiberNewContext.old';
205 +} from './ReactFiberCommitWork';
206 +import {enqueueUpdate} from './ReactFiberClassUpdateQueue';
207 +import {resetContextDependencies} from './ReactFiberNewContext';
208 import {
209 resetHooksAfterThrow,
210 resetHooksOnUnwind,
211 ContextOnlyDispatcher,
218 -} from './ReactFiberHooks.old';
219 -import {DefaultCacheDispatcher} from './ReactFiberCache.old';
212 +} from './ReactFiberHooks';
213 +import {DefaultCacheDispatcher} from './ReactFiberCache';
214 import {
215 createCapturedValueAtFiber,
216 type CapturedValue,
@@ -225,7 +219,7 @@ import {
219 enqueueConcurrentRenderForLane,
220 finishQueueingConcurrentUpdates,
221 getConcurrentlyUpdatedLanes,
228 -} from './ReactFiberConcurrentUpdates.old';
222 +} from './ReactFiberConcurrentUpdates';
223
224 import {
225 markNestedUpdateScheduled,
@@ -234,11 +228,11 @@ import {
228 startProfilerTimer,
229 stopProfilerTimerIfRunningAndRecordDelta,
230 syncNestedUpdateFlag,
237 -} from './ReactProfilerTimer.old';
231 +} from './ReactProfilerTimer';
232
233 // DEV stuff
234 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
241 -import ReactStrictModeWarnings from './ReactStrictModeWarnings.old';
235 +import ReactStrictModeWarnings from './ReactStrictModeWarnings';
236 import {
237 isRendering as ReactCurrentDebugFiberIsRenderingInDEV,
238 current as ReactCurrentFiberCurrent,
@@ -266,25 +260,25 @@ import {
260 markRenderStopped,
261 onCommitRoot as onCommitRootDevTools,
262 onPostCommitRoot as onPostCommitRootDevTools,
269 -} from './ReactFiberDevToolsHook.old';
263 +} from './ReactFiberDevToolsHook';
264 import {onCommitRoot as onCommitRootTestSelector} from './ReactTestSelectors';
271 -import {releaseCache} from './ReactFiberCacheComponent.old';
265 +import {releaseCache} from './ReactFiberCacheComponent';
266 import {
267 isLegacyActEnvironment,
268 isConcurrentActEnvironment,
275 -} from './ReactFiberAct.old';
276 -import {processTransitionCallbacks} from './ReactFiberTracingMarkerComponent.old';
269 +} from './ReactFiberAct';
270 +import {processTransitionCallbacks} from './ReactFiberTracingMarkerComponent';
271 import {
272 SuspenseException,
273 getSuspendedThenable,
274 isThenableResolved,
281 -} from './ReactFiberThenable.old';
275 +} from './ReactFiberThenable';
276 import {schedulePostPaintCallback} from './ReactPostPaintCallback';
277 import {
278 getSuspenseHandler,
279 isBadSuspenseFallback,
286 -} from './ReactFiberSuspenseContext.old';
287 -import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
280 +} from './ReactFiberSuspenseContext';
281 +import {resolveDefaultProps} from './ReactFiberLazyComponent';
282
283 const ceil = Math.ceil;
284
packages/react-reconciler/src/ReactInternalTypes.js
+4 -4
@@ -22,7 +22,7 @@ import type {
22 import type {WorkTag} from './ReactWorkTags';
23 import type {TypeOfMode} from './ReactTypeOfMode';
24 import type {Flags} from './ReactFiberFlags';
25 -import type {Lane, Lanes, LaneMap} from './ReactFiberLane.old';
25 +import type {Lane, Lanes, LaneMap} from './ReactFiberLane';
26 import type {RootTag} from './ReactRootTags';
27 import type {
28 Container,
@@ -30,12 +30,12 @@ import type {
30 NoTimeout,
31 SuspenseInstance,
32 } from './ReactFiberHostConfig';
33 -import type {Cache} from './ReactFiberCacheComponent.old';
33 +import type {Cache} from './ReactFiberCacheComponent';
34 import type {
35 TracingMarkerInstance,
36 Transition,
37 -} from './ReactFiberTracingMarkerComponent.old';
38 -import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates.old';
37 +} from './ReactFiberTracingMarkerComponent';
38 +import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates';
39
40 // Unwind Circular: moved from ReactFiberHooks.old
41 export type HookType =
packages/react-reconciler/src/ReactMutableSource.js renamed
packages/react-reconciler/src/ReactProfilerTimer.js renamed
packages/react-reconciler/src/ReactReconcilerConstants.js
+1 -1
@@ -15,5 +15,5 @@ export {
15 ContinuousEventPriority,
16 DefaultEventPriority,
17 IdleEventPriority,
18 -} from './ReactEventPriorities.old';
18 +} from './ReactEventPriorities';
19 export {ConcurrentRoot, LegacyRoot} from './ReactRootTags';
packages/react-reconciler/src/ReactStrictModeWarnings.js renamed
packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.internal.js
+1 -1
@@ -24,7 +24,7 @@ describe('ReactFiberHostContext', () => {
24 ReactFiberReconciler = require('react-reconciler');
25 ConcurrentRoot = require('react-reconciler/src/ReactRootTags')
26 .ConcurrentRoot;
27 - DefaultEventPriority = require('react-reconciler/src/ReactEventPriorities.old')
27 + DefaultEventPriority = require('react-reconciler/src/ReactEventPriorities')
28 .DefaultEventPriority;
29 });
30
packages/react-reconciler/src/__tests__/ReactIncrementalErrorReplay-test.internal.js
+1 -1
@@ -21,7 +21,7 @@ describe('ReactIncrementalErrorReplay-test', () => {
21
22 // This is the method we're going to test.
23 // If this is no longer used, you can delete this test file.;
24 - const {assignFiberPropertiesInDEV} = require('../ReactFiber.old');
24 + const {assignFiberPropertiesInDEV} = require('../ReactFiber');
25
26 // Get a real fiber.
27 const realFiber = ReactTestRenderer.create(<div />).root._currentFiber();
packages/react-reconciler/src/__tests__/ReactUpdaters-test.internal.js
+1 -1
@@ -81,7 +81,7 @@ describe('updaters', () => {
81 };
82
83 jest.mock(
84 - 'react-reconciler/src/ReactFiberDevToolsHook.old',
84 + 'react-reconciler/src/ReactFiberDevToolsHook',
85 () => mockDevToolsHook,
86 );
87
packages/react-reconciler/src/forks/ReactFiberErrorDialog.native.js
+1 -1
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {Fiber} from '../ReactFiber.old';
10 +import type {Fiber} from '../ReactFiber';
11 import type {CapturedValue} from '../ReactCapturedValue';
12
13 import {ClassComponent} from '../ReactWorkTags';
packages/react-reconciler/src/forks/ReactFiberErrorDialog.www.js
+1 -1
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {Fiber} from '../ReactFiber.old';
10 +import type {Fiber} from '../ReactFiber';
11 import type {CapturedValue} from '../ReactCapturedValue';
12
13 import {ClassComponent} from '../ReactWorkTags';
packages/react-refresh/src/ReactFreshRuntime.js
+1 -1
@@ -16,7 +16,7 @@ import type {
16 ScheduleRoot,
17 FindHostInstancesForRefresh,
18 SetRefreshHandler,
19 -} from 'react-reconciler/src/ReactFiberHotReloading.old';
19 +} from 'react-reconciler/src/ReactFiberHotReloading';
20 import type {ReactNodeList} from 'shared/ReactTypes';
21
22 import {REACT_MEMO_TYPE, REACT_FORWARD_REF_TYPE} from 'shared/ReactSymbols';
packages/react-test-renderer/src/ReactTestHostConfig.js
+1 -1
@@ -8,7 +8,7 @@
8 */
9
10 import isArray from 'shared/isArray';
11 -import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
11 +import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
12
13 export type Type = string;
14 export type Props = Object;
packages/react-test-renderer/src/ReactTestRenderer.js
+1 -1
@@ -23,7 +23,7 @@ import {
23 flushSync,
24 injectIntoDevTools,
25 batchedUpdates,
26 -} from 'react-reconciler/src/ReactFiberReconciler.old';
26 +} from 'react-reconciler/src/ReactFiberReconciler';
27 import {findCurrentFiberUsingSlowPath} from 'react-reconciler/src/ReactFiberTreeReflection';
28 import {
29 Fragment,
packages/react/src/ReactCurrentBatchConfig.js
+1 -1
@@ -7,7 +7,7 @@
7 * @flow
8 */
9
10 -import type {BatchConfigTransition} from 'react-reconciler/src/ReactFiberTracingMarkerComponent.old';
10 +import type {BatchConfigTransition} from 'react-reconciler/src/ReactFiberTracingMarkerComponent';
11
12 type BatchConfig = {
13 transition: BatchConfigTransition | null,