From 9fb581c7cc9b08a776d440254048734c3ffec78c Mon Sep 17 00:00:00 2001 From: c0dedance <38075730+c0dedance@users.noreply.github.com> Date: Mon, 17 Oct 2022 09:58:58 +0800 Subject: [PATCH] Refactor: merge duplicate imports (#25489) Co-authored-by: Jan Kassens --- packages/react-devtools-shared/src/utils.js | 2 +- .../src/TimelineContext.js | 3 +-- .../src/view-base/HorizontalPanAndZoomView.js | 3 +-- .../src/view-base/VerticalScrollView.js | 3 +-- .../VerticalScrollBarView.js | 2 +- .../src/client/ReactDOMHostConfig.js | 2 +- .../src/events/DOMPluginEventSystem.js | 13 +++++-------- .../src/events/plugins/SimpleEventPlugin.js | 6 ++++-- packages/react-dom/src/client/ReactDOMRoot.js | 11 ++++++----- .../react-dom/src/test-utils/ReactTestUtils.js | 3 +-- .../react-native-renderer/src/ReactFabric.js | 2 +- .../src/ReactFabricEventEmitter.js | 12 ++++++++---- .../src/ReactNativeEventEmitter.js | 12 ++++++++---- .../src/ReactNativeRenderer.js | 2 +- .../src/ReactFiberBeginWork.new.js | 2 +- .../src/ReactFiberBeginWork.old.js | 2 +- .../src/ReactFiberCommitWork.new.js | 7 +++++-- .../src/ReactFiberCommitWork.old.js | 7 +++++-- .../src/ReactFiberCompleteWork.new.js | 17 +++++++---------- .../src/ReactFiberCompleteWork.old.js | 17 +++++++---------- .../src/ReactFiberConcurrentUpdates.new.js | 2 +- .../src/ReactFiberConcurrentUpdates.old.js | 2 +- .../react-reconciler/src/ReactFiberHooks.new.js | 2 +- .../react-reconciler/src/ReactFiberHooks.old.js | 2 +- .../src/ReactFiberHotReloading.js | 3 +-- .../src/ReactFiberReconciler.new.js | 4 ++-- .../src/ReactFiberReconciler.old.js | 4 ++-- .../react-reconciler/src/ReactFiberThrow.new.js | 3 +-- .../react-reconciler/src/ReactFiberThrow.old.js | 3 +-- .../src/ReactTestRenderer.js | 3 +-- 30 files changed, 78 insertions(+), 78 deletions(-) diff --git a/packages/react-devtools-shared/src/utils.js b/packages/react-devtools-shared/src/utils.js index 064a57d3f3458..0b8dc66d05924 100644 --- a/packages/react-devtools-shared/src/utils.js +++ b/packages/react-devtools-shared/src/utils.js @@ -41,9 +41,9 @@ import { LOCAL_STORAGE_SHOW_INLINE_WARNINGS_AND_ERRORS_KEY, LOCAL_STORAGE_HIDE_CONSOLE_LOGS_IN_STRICT_MODE, } from './constants'; -import {ElementTypeRoot} from 'react-devtools-shared/src/types'; import {ComponentFilterElementType, ElementTypeHostComponent} from './types'; import { + ElementTypeRoot, ElementTypeClass, ElementTypeForwardRef, ElementTypeFunction, diff --git a/packages/react-devtools-timeline/src/TimelineContext.js b/packages/react-devtools-timeline/src/TimelineContext.js index 7ccc6fb972454..a1c24170d07c4 100644 --- a/packages/react-devtools-timeline/src/TimelineContext.js +++ b/packages/react-devtools-timeline/src/TimelineContext.js @@ -7,7 +7,7 @@ * @flow */ -import type {ReactContext} from 'shared/ReactTypes'; +import type {ReactContext, RefObject} from 'shared/ReactTypes'; import * as React from 'react'; import { @@ -27,7 +27,6 @@ import type { ViewState, ReactEventInfo, } from './types'; -import type {RefObject} from 'shared/ReactTypes'; export type Context = { file: File | null, diff --git a/packages/react-devtools-timeline/src/view-base/HorizontalPanAndZoomView.js b/packages/react-devtools-timeline/src/view-base/HorizontalPanAndZoomView.js index 64251c92a4e2a..1ffbae017695f 100644 --- a/packages/react-devtools-timeline/src/view-base/HorizontalPanAndZoomView.js +++ b/packages/react-devtools-timeline/src/view-base/HorizontalPanAndZoomView.js @@ -7,7 +7,7 @@ * @flow */ -import type {Size, IntrinsicSize} from './geometry'; +import type {Size, IntrinsicSize, Rect} from './geometry'; import type { Interaction, MouseDownInteraction, @@ -16,7 +16,6 @@ import type { WheelPlainInteraction, WheelWithShiftInteraction, } from './useCanvasInteraction'; -import type {Rect} from './geometry'; import type {ScrollState} from './utils/scrollState'; import type {ViewRefs} from './Surface'; import type {ViewState} from '../types'; diff --git a/packages/react-devtools-timeline/src/view-base/VerticalScrollView.js b/packages/react-devtools-timeline/src/view-base/VerticalScrollView.js index f09a5de8c586f..d23149acc5c1b 100644 --- a/packages/react-devtools-timeline/src/view-base/VerticalScrollView.js +++ b/packages/react-devtools-timeline/src/view-base/VerticalScrollView.js @@ -7,7 +7,7 @@ * @flow */ -import type {Size, IntrinsicSize} from './geometry'; +import type {Size, IntrinsicSize, Rect} from './geometry'; import type { Interaction, MouseDownInteraction, @@ -15,7 +15,6 @@ import type { MouseUpInteraction, WheelWithShiftInteraction, } from './useCanvasInteraction'; -import type {Rect} from './geometry'; import type {ScrollState} from './utils/scrollState'; import type {ViewRefs} from './Surface'; import type {ViewState} from '../types'; diff --git a/packages/react-devtools-timeline/src/view-base/vertical-scroll-overflow/VerticalScrollBarView.js b/packages/react-devtools-timeline/src/view-base/vertical-scroll-overflow/VerticalScrollBarView.js index 2d082de2fceab..cbbeeb8ba20f7 100644 --- a/packages/react-devtools-timeline/src/view-base/vertical-scroll-overflow/VerticalScrollBarView.js +++ b/packages/react-devtools-timeline/src/view-base/vertical-scroll-overflow/VerticalScrollBarView.js @@ -7,10 +7,10 @@ * @flow */ -import type {Interaction} from '../useCanvasInteraction'; import type {Rect} from '../geometry'; import type {Surface, ViewRefs} from '../Surface'; import type { + Interaction, ClickInteraction, MouseDownInteraction, MouseMoveInteraction, diff --git a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js b/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js index d5958401eb89a..3f57d064439b0 100644 --- a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js +++ b/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js @@ -24,8 +24,8 @@ import { getFiberFromScopeInstance, getInstanceFromNode as getInstanceFromNodeDOMTree, isContainerMarkedAsRoot, + detachDeletedInstance, } from './ReactDOMComponentTree'; -import {detachDeletedInstance} from './ReactDOMComponentTree'; export {detachDeletedInstance}; import {hasRole} from './DOMAccessibilityRoles'; import { diff --git a/packages/react-dom-bindings/src/events/DOMPluginEventSystem.js b/packages/react-dom-bindings/src/events/DOMPluginEventSystem.js index 645478f5b11ff..a558fbb953c54 100644 --- a/packages/react-dom-bindings/src/events/DOMPluginEventSystem.js +++ b/packages/react-dom-bindings/src/events/DOMPluginEventSystem.js @@ -8,12 +8,7 @@ */ import type {DOMEventName} from './DOMEventNames'; -import { - type EventSystemFlags, - SHOULD_NOT_DEFER_CLICK_FOR_FB_SUPPORT_MODE, - IS_LEGACY_FB_SUPPORT_MODE, - SHOULD_NOT_PROCESS_POLYFILL_EVENT_PLUGINS, -} from './EventSystemFlags'; +import type {EventSystemFlags} from './EventSystemFlags'; import type {AnyNativeEvent} from './PluginModuleType'; import type { KnownReactSyntheticEvent, @@ -23,6 +18,9 @@ import type {Fiber} from 'react-reconciler/src/ReactInternalTypes'; import {allNativeEvents} from './EventRegistry'; import { + SHOULD_NOT_DEFER_CLICK_FOR_FB_SUPPORT_MODE, + IS_LEGACY_FB_SUPPORT_MODE, + SHOULD_NOT_PROCESS_POLYFILL_EVENT_PLUGINS, IS_CAPTURE_PHASE, IS_EVENT_HANDLE_NON_MANAGED_NODE, IS_NON_DELEGATED, @@ -45,7 +43,7 @@ import { getEventListenerSet, getEventHandlerListeners, } from '../client/ReactDOMComponentTree'; -import {COMMENT_NODE} from '../shared/HTMLNodeType'; +import {COMMENT_NODE, DOCUMENT_NODE} from '../shared/HTMLNodeType'; import {batchedUpdates} from './ReactDOMUpdateBatching'; import getListener from './getListener'; import {passiveBrowserEventsSupported} from './checkPassiveEvents'; @@ -61,7 +59,6 @@ import { invokeGuardedCallbackAndCatchFirstError, rethrowCaughtError, } from 'shared/ReactErrorUtils'; -import {DOCUMENT_NODE} from '../shared/HTMLNodeType'; import {createEventListenerWrapperWithPriority} from './ReactDOMEventListener'; import { removeEventListener, diff --git a/packages/react-dom-bindings/src/events/plugins/SimpleEventPlugin.js b/packages/react-dom-bindings/src/events/plugins/SimpleEventPlugin.js index 78df13154b364..d6c66590a1eaf 100644 --- a/packages/react-dom-bindings/src/events/plugins/SimpleEventPlugin.js +++ b/packages/react-dom-bindings/src/events/plugins/SimpleEventPlugin.js @@ -43,10 +43,12 @@ import { accumulateSinglePhaseListeners, accumulateEventHandleNonManagedNodeListeners, } from '../DOMPluginEventSystem'; -import {IS_EVENT_HANDLE_NON_MANAGED_NODE} from '../EventSystemFlags'; +import { + IS_EVENT_HANDLE_NON_MANAGED_NODE, + IS_CAPTURE_PHASE, +} from '../EventSystemFlags'; import getEventCharCode from '../getEventCharCode'; -import {IS_CAPTURE_PHASE} from '../EventSystemFlags'; import {enableCreateEventHandleAPI} from 'shared/ReactFeatureFlags'; diff --git a/packages/react-dom/src/client/ReactDOMRoot.js b/packages/react-dom/src/client/ReactDOMRoot.js index 1fc2e71eb860b..4040a1ef3b0a7 100644 --- a/packages/react-dom/src/client/ReactDOMRoot.js +++ b/packages/react-dom/src/client/ReactDOMRoot.js @@ -18,7 +18,12 @@ const {Dispatcher} = ReactDOMSharedInternals; import {ReactDOMClientDispatcher} from 'react-dom-bindings/src/client/ReactDOMFloatClient'; import {queueExplicitHydrationTarget} from 'react-dom-bindings/src/events/ReactDOMEventReplaying'; import {REACT_ELEMENT_TYPE} from 'shared/ReactSymbols'; -import {enableFloat, enableHostSingletons} from 'shared/ReactFeatureFlags'; +import { + enableFloat, + enableHostSingletons, + allowConcurrentByDefault, + disableCommentsAsDOMContainers, +} from 'shared/ReactFeatureFlags'; export type RootType = { render(children: ReactNodeList): void, @@ -73,10 +78,6 @@ import { isAlreadyRendering, } from 'react-reconciler/src/ReactFiberReconciler'; import {ConcurrentRoot} from 'react-reconciler/src/ReactRootTags'; -import { - allowConcurrentByDefault, - disableCommentsAsDOMContainers, -} from 'shared/ReactFeatureFlags'; /* global reportError */ const defaultOnRecoverableError = diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js index 6d10bd7f4a6b8..b6c2aee247cef 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtils.js +++ b/packages/react-dom/src/test-utils/ReactTestUtils.js @@ -23,10 +23,9 @@ import { rethrowCaughtError, invokeGuardedCallbackAndCatchFirstError, } from 'shared/ReactErrorUtils'; -import {enableFloat} from 'shared/ReactFeatureFlags'; +import {enableFloat, enableHostSingletons} from 'shared/ReactFeatureFlags'; import assign from 'shared/assign'; import isArray from 'shared/isArray'; -import {enableHostSingletons} from 'shared/ReactFeatureFlags'; // Keep in sync with ReactDOM.js: const SecretInternals = diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js index d874742cd4846..848e53408f872 100644 --- a/packages/react-native-renderer/src/ReactFabric.js +++ b/packages/react-native-renderer/src/ReactFabric.js @@ -23,7 +23,6 @@ import { injectIntoDevTools, getPublicRootInstance, } from 'react-reconciler/src/ReactFiberReconciler'; -import {getInspectorDataForInstance} from './ReactNativeFiberInspector'; import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal'; import {setBatchingImplementation} from './legacy-events/ReactGenericBatching'; @@ -39,6 +38,7 @@ import {getClosestInstanceFromNode} from './ReactFabricComponentTree'; import { getInspectorDataForViewTag, getInspectorDataForViewAtPoint, + getInspectorDataForInstance, } from './ReactNativeFiberInspector'; import {LegacyRoot, ConcurrentRoot} from 'react-reconciler/src/ReactRootTags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; diff --git a/packages/react-native-renderer/src/ReactFabricEventEmitter.js b/packages/react-native-renderer/src/ReactFabricEventEmitter.js index 272d41208ccb7..3737ad3281a0e 100644 --- a/packages/react-native-renderer/src/ReactFabricEventEmitter.js +++ b/packages/react-native-renderer/src/ReactFabricEventEmitter.js @@ -7,20 +7,24 @@ * @flow */ -import type {AnyNativeEvent} from './legacy-events/PluginModuleType'; +import type { + AnyNativeEvent, + LegacyPluginModule, +} from './legacy-events/PluginModuleType'; import type {Fiber} from 'react-reconciler/src/ReactInternalTypes'; -import type {LegacyPluginModule} from './legacy-events/PluginModuleType'; import type {ReactSyntheticEvent} from './legacy-events/ReactSyntheticEventType'; import type { RNTopLevelEventType, TopLevelType, } from './legacy-events/TopLevelEventTypes'; -import {registrationNameModules} from './legacy-events/EventPluginRegistry'; +import { + registrationNameModules, + plugins, +} from './legacy-events/EventPluginRegistry'; import {batchedUpdates} from './legacy-events/ReactGenericBatching'; import accumulateInto from './legacy-events/accumulateInto'; -import {plugins} from './legacy-events/EventPluginRegistry'; import getListeners from './ReactNativeGetListeners'; import {runEventsInBatch} from './legacy-events/EventBatching'; diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js index 91816a53f82da..413395746d6cb 100644 --- a/packages/react-native-renderer/src/ReactNativeEventEmitter.js +++ b/packages/react-native-renderer/src/ReactNativeEventEmitter.js @@ -7,16 +7,20 @@ * @flow */ -import type {AnyNativeEvent} from './legacy-events/PluginModuleType'; +import type { + AnyNativeEvent, + LegacyPluginModule, +} from './legacy-events/PluginModuleType'; import type {Fiber} from 'react-reconciler/src/ReactInternalTypes'; -import type {LegacyPluginModule} from './legacy-events/PluginModuleType'; import type {ReactSyntheticEvent} from './legacy-events/ReactSyntheticEventType'; import type {TopLevelType} from './legacy-events/TopLevelEventTypes'; -import {registrationNameModules} from './legacy-events/EventPluginRegistry'; +import { + registrationNameModules, + plugins, +} from './legacy-events/EventPluginRegistry'; import {batchedUpdates} from './legacy-events/ReactGenericBatching'; import {runEventsInBatch} from './legacy-events/EventBatching'; -import {plugins} from './legacy-events/EventPluginRegistry'; import getListeners from './ReactNativeGetListeners'; import accumulateInto from './legacy-events/accumulateInto'; diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index b47baf0c9bb8c..f3cbe6576aa22 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -36,12 +36,12 @@ import { UIManager, legacySendAccessibilityEvent, } from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface'; -import {getInspectorDataForInstance} from './ReactNativeFiberInspector'; import {getClosestInstanceFromNode} from './ReactNativeComponentTree'; import { getInspectorDataForViewTag, getInspectorDataForViewAtPoint, + getInspectorDataForInstance, } from './ReactNativeFiberInspector'; import {LegacyRoot} from 'react-reconciler/src/ReactRootTags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.new.js b/packages/react-reconciler/src/ReactFiberBeginWork.new.js index 66c679b424646..4b75fd0f78d3e 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.new.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.new.js @@ -11,12 +11,12 @@ import type { ReactProviderType, ReactContext, ReactNodeList, + MutableSource, } from 'shared/ReactTypes'; 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.new'; -import type {MutableSource} from 'shared/ReactTypes'; import type { SuspenseState, SuspenseListRenderState, diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.old.js b/packages/react-reconciler/src/ReactFiberBeginWork.old.js index e5c3f1f4cb562..f44afa3b408af 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.old.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.old.js @@ -11,12 +11,12 @@ import type { ReactProviderType, ReactContext, ReactNodeList, + MutableSource, } from 'shared/ReactTypes'; 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 {MutableSource} from 'shared/ReactTypes'; import type { SuspenseState, SuspenseListRenderState, diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js index 343cc152d735c..0d2cb1da6b4d7 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.new.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.new.js @@ -15,8 +15,11 @@ import type { ChildSet, UpdatePayload, } from './ReactFiberHostConfig'; -import type {Fiber} from './ReactInternalTypes'; -import type {FiberRoot, EventFunctionWrapper} from './ReactInternalTypes'; +import type { + Fiber, + FiberRoot, + EventFunctionWrapper, +} from './ReactInternalTypes'; import type {Lanes} from './ReactFiberLane.new'; import type {SuspenseState} from './ReactFiberSuspenseComponent.new'; import type {UpdateQueue} from './ReactFiberClassUpdateQueue.new'; diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js index 0dac9e775a7fb..0751cd7d2e6cb 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.old.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.old.js @@ -15,8 +15,11 @@ import type { ChildSet, UpdatePayload, } from './ReactFiberHostConfig'; -import type {Fiber} from './ReactInternalTypes'; -import type {FiberRoot, EventFunctionWrapper} from './ReactInternalTypes'; +import type { + Fiber, + FiberRoot, + EventFunctionWrapper, +} from './ReactInternalTypes'; import type {Lanes} from './ReactFiberLane.old'; import type {SuspenseState} from './ReactFiberSuspenseComponent.old'; import type {UpdateQueue} from './ReactFiberClassUpdateQueue.old'; diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.new.js b/packages/react-reconciler/src/ReactFiberCompleteWork.new.js index 195a6f8d54ffc..9031a733fc86b 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.new.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.new.js @@ -7,7 +7,7 @@ * @flow */ -import type {Fiber} from './ReactInternalTypes'; +import type {Fiber, FiberRoot} from './ReactInternalTypes'; import type {RootState} from './ReactFiberRoot.new'; import type {Lanes, Lane} from './ReactFiberLane.new'; import type { @@ -15,7 +15,6 @@ import type { ReactContext, Wakeable, } from 'shared/ReactTypes'; -import type {FiberRoot} from './ReactInternalTypes'; import type { Instance, Type, @@ -34,6 +33,12 @@ import { enableSuspenseAvoidThisFallback, enableLegacyHidden, enableHostSingletons, + enableSuspenseCallback, + enableScopeAPI, + enableProfilerTimer, + enableCache, + enableTransitionTracing, + enableFloat, } from 'shared/ReactFeatureFlags'; import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource.new'; @@ -144,14 +149,6 @@ import { hasUnhydratedTailNodes, upgradeHydrationErrorsToRecoverable, } from './ReactFiberHydrationContext.new'; -import { - enableSuspenseCallback, - enableScopeAPI, - enableProfilerTimer, - enableCache, - enableTransitionTracing, - enableFloat, -} from 'shared/ReactFeatureFlags'; import { renderDidSuspend, renderDidSuspendDelayIfPossible, diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.old.js b/packages/react-reconciler/src/ReactFiberCompleteWork.old.js index 1ead0a8902311..ac35eeab58cec 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.old.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.old.js @@ -7,7 +7,7 @@ * @flow */ -import type {Fiber} from './ReactInternalTypes'; +import type {Fiber, FiberRoot} from './ReactInternalTypes'; import type {RootState} from './ReactFiberRoot.old'; import type {Lanes, Lane} from './ReactFiberLane.old'; import type { @@ -15,7 +15,6 @@ import type { ReactContext, Wakeable, } from 'shared/ReactTypes'; -import type {FiberRoot} from './ReactInternalTypes'; import type { Instance, Type, @@ -34,6 +33,12 @@ import { enableSuspenseAvoidThisFallback, enableLegacyHidden, enableHostSingletons, + enableSuspenseCallback, + enableScopeAPI, + enableProfilerTimer, + enableCache, + enableTransitionTracing, + enableFloat, } from 'shared/ReactFeatureFlags'; import {resetWorkInProgressVersions as resetMutableSourceWorkInProgressVersions} from './ReactMutableSource.old'; @@ -144,14 +149,6 @@ import { hasUnhydratedTailNodes, upgradeHydrationErrorsToRecoverable, } from './ReactFiberHydrationContext.old'; -import { - enableSuspenseCallback, - enableScopeAPI, - enableProfilerTimer, - enableCache, - enableTransitionTracing, - enableFloat, -} from 'shared/ReactFeatureFlags'; import { renderDidSuspend, renderDidSuspendDelayIfPossible, diff --git a/packages/react-reconciler/src/ReactFiberConcurrentUpdates.new.js b/packages/react-reconciler/src/ReactFiberConcurrentUpdates.new.js index affc79306f77d..789a62e5b5b3b 100644 --- a/packages/react-reconciler/src/ReactFiberConcurrentUpdates.new.js +++ b/packages/react-reconciler/src/ReactFiberConcurrentUpdates.new.js @@ -22,6 +22,7 @@ import type {OffscreenInstance} from './ReactFiberOffscreenComponent'; import { warnAboutUpdateOnNotYetMountedFiberInDEV, throwIfInfiniteUpdateLoopDetected, + getWorkInProgressRoot, } from './ReactFiberWorkLoop.new'; import { NoLane, @@ -32,7 +33,6 @@ import { import {NoFlags, Placement, Hydrating} from './ReactFiberFlags'; import {HostRoot, OffscreenComponent} from './ReactWorkTags'; import {OffscreenVisible} from './ReactFiberOffscreenComponent'; -import {getWorkInProgressRoot} from './ReactFiberWorkLoop.new'; export type ConcurrentUpdate = { next: ConcurrentUpdate, diff --git a/packages/react-reconciler/src/ReactFiberConcurrentUpdates.old.js b/packages/react-reconciler/src/ReactFiberConcurrentUpdates.old.js index 2d40c3386a473..e2653b3082a56 100644 --- a/packages/react-reconciler/src/ReactFiberConcurrentUpdates.old.js +++ b/packages/react-reconciler/src/ReactFiberConcurrentUpdates.old.js @@ -22,6 +22,7 @@ import type {OffscreenInstance} from './ReactFiberOffscreenComponent'; import { warnAboutUpdateOnNotYetMountedFiberInDEV, throwIfInfiniteUpdateLoopDetected, + getWorkInProgressRoot, } from './ReactFiberWorkLoop.old'; import { NoLane, @@ -32,7 +33,6 @@ import { import {NoFlags, Placement, Hydrating} from './ReactFiberFlags'; import {HostRoot, OffscreenComponent} from './ReactWorkTags'; import {OffscreenVisible} from './ReactFiberOffscreenComponent'; -import {getWorkInProgressRoot} from './ReactFiberWorkLoop.old'; export type ConcurrentUpdate = { next: ConcurrentUpdate, diff --git a/packages/react-reconciler/src/ReactFiberHooks.new.js b/packages/react-reconciler/src/ReactFiberHooks.new.js index 110431001349f..f3e0e9b5934dd 100644 --- a/packages/react-reconciler/src/ReactFiberHooks.new.js +++ b/packages/react-reconciler/src/ReactFiberHooks.new.js @@ -18,6 +18,7 @@ import type { } from 'shared/ReactTypes'; import type { Fiber, + FiberRoot, Dispatcher, HookType, MemoCache, @@ -25,7 +26,6 @@ import type { } from './ReactInternalTypes'; import type {Lanes, Lane} from './ReactFiberLane.new'; import type {HookFlags} from './ReactHookEffectTags'; -import type {FiberRoot} from './ReactInternalTypes'; import type {Flags} from './ReactFiberFlags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; diff --git a/packages/react-reconciler/src/ReactFiberHooks.old.js b/packages/react-reconciler/src/ReactFiberHooks.old.js index 527d442f88d22..71978d060026a 100644 --- a/packages/react-reconciler/src/ReactFiberHooks.old.js +++ b/packages/react-reconciler/src/ReactFiberHooks.old.js @@ -18,6 +18,7 @@ import type { } from 'shared/ReactTypes'; import type { Fiber, + FiberRoot, Dispatcher, HookType, MemoCache, @@ -25,7 +26,6 @@ import type { } from './ReactInternalTypes'; import type {Lanes, Lane} from './ReactFiberLane.old'; import type {HookFlags} from './ReactHookEffectTags'; -import type {FiberRoot} from './ReactInternalTypes'; import type {Flags} from './ReactFiberFlags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; diff --git a/packages/react-reconciler/src/ReactFiberHotReloading.js b/packages/react-reconciler/src/ReactFiberHotReloading.js index 569ba8228fafe..13342d229ea92 100644 --- a/packages/react-reconciler/src/ReactFiberHotReloading.js +++ b/packages/react-reconciler/src/ReactFiberHotReloading.js @@ -7,10 +7,9 @@ * @flow */ -import type {Fiber} from './ReactInternalTypes'; +import type {Fiber, FiberRoot} from './ReactInternalTypes'; import type {ReactElement} from '../../shared/ReactElementType'; import type {Instance} from './ReactFiberHostConfig'; -import type {FiberRoot} from './ReactInternalTypes'; import type {ReactNodeList} from 'shared/ReactTypes'; import {enableNewReconciler} from 'shared/ReactFeatureFlags'; diff --git a/packages/react-reconciler/src/ReactFiberReconciler.new.js b/packages/react-reconciler/src/ReactFiberReconciler.new.js index 1da000212bdc7..a1cf65e616924 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.new.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.new.js @@ -9,18 +9,18 @@ import type { Fiber, + FiberRoot, SuspenseHydrationCallbacks, TransitionTracingCallbacks, } from './ReactInternalTypes'; -import type {FiberRoot} from './ReactInternalTypes'; import type {RootTag} from './ReactRootTags'; import type { Instance, TextInstance, Container, PublicInstance, + RendererInspectionConfig, } from './ReactFiberHostConfig'; -import type {RendererInspectionConfig} from './ReactFiberHostConfig'; import type {ReactNodeList} from 'shared/ReactTypes'; import type {Lane} from './ReactFiberLane.new'; import type {SuspenseState} from './ReactFiberSuspenseComponent.new'; diff --git a/packages/react-reconciler/src/ReactFiberReconciler.old.js b/packages/react-reconciler/src/ReactFiberReconciler.old.js index ba046b1d197a5..652e850f8dac6 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.old.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.old.js @@ -9,18 +9,18 @@ import type { Fiber, + FiberRoot, SuspenseHydrationCallbacks, TransitionTracingCallbacks, } from './ReactInternalTypes'; -import type {FiberRoot} from './ReactInternalTypes'; import type {RootTag} from './ReactRootTags'; import type { Instance, TextInstance, Container, PublicInstance, + RendererInspectionConfig, } from './ReactFiberHostConfig'; -import type {RendererInspectionConfig} from './ReactFiberHostConfig'; import type {ReactNodeList} from 'shared/ReactTypes'; import type {Lane} from './ReactFiberLane.old'; import type {SuspenseState} from './ReactFiberSuspenseComponent.old'; diff --git a/packages/react-reconciler/src/ReactFiberThrow.new.js b/packages/react-reconciler/src/ReactFiberThrow.new.js index b96df89fd54be..97e02cd8dec6b 100644 --- a/packages/react-reconciler/src/ReactFiberThrow.new.js +++ b/packages/react-reconciler/src/ReactFiberThrow.new.js @@ -7,8 +7,7 @@ * @flow */ -import type {Fiber} from './ReactInternalTypes'; -import type {FiberRoot} from './ReactInternalTypes'; +import type {Fiber, FiberRoot} from './ReactInternalTypes'; import type {Lane, Lanes} from './ReactFiberLane.new'; import type {CapturedValue} from './ReactCapturedValue'; import type {Update} from './ReactFiberClassUpdateQueue.new'; diff --git a/packages/react-reconciler/src/ReactFiberThrow.old.js b/packages/react-reconciler/src/ReactFiberThrow.old.js index c3ab61a5dc130..f20047c8f05d1 100644 --- a/packages/react-reconciler/src/ReactFiberThrow.old.js +++ b/packages/react-reconciler/src/ReactFiberThrow.old.js @@ -7,8 +7,7 @@ * @flow */ -import type {Fiber} from './ReactInternalTypes'; -import type {FiberRoot} from './ReactInternalTypes'; +import type {Fiber, FiberRoot} from './ReactInternalTypes'; import type {Lane, Lanes} from './ReactFiberLane.old'; import type {CapturedValue} from './ReactCapturedValue'; import type {Update} from './ReactFiberClassUpdateQueue.old'; diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index 57996d680d0cc..5bd0f758edae0 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -7,8 +7,7 @@ * @flow */ -import type {Fiber} from 'react-reconciler/src/ReactInternalTypes'; -import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes'; +import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes'; import type { PublicInstance, Instance,