Remove cycle between ReactFiberHooks and ReactInternalTypes (#20242)

ZoteTheMighty · padoyle · web-flow · commit 2fbcc9806666 · 2020-11-13T09:18:24.000-05:00
Co-authored-by: Paul Doyle &lt;pauldoyle22@gmail.com&gt;
diff --git a/packages/react-reconciler/src/ReactFiberHooks.new.js b/packages/react-reconciler/src/ReactFiberHooks.new.js
@@ -13,7 +13,7 @@ import type {
 MutableSourceSubscribeFn,
 ReactContext,
 } from 'shared/ReactTypes';
-import type {Fiber, Dispatcher} from './ReactInternalTypes';
+import type {Fiber, Dispatcher, HookType} from './ReactInternalTypes';
 import type {Lanes, Lane} from './ReactFiberLane';
 import type {HookFlags} from './ReactHookEffectTags';
 import type {ReactPriorityLevel} from './ReactInternalTypes';
@@ -118,22 +118,6 @@ type UpdateQueue<S, A> = {|
 lastRenderedState: S | null,
 |};
 
-export type HookType =
- | 'useState'
- | 'useReducer'
- | 'useContext'
- | 'useRef'
- | 'useEffect'
- | 'useLayoutEffect'
- | 'useCallback'
- | 'useMemo'
- | 'useImperativeHandle'
- | 'useDebugValue'
- | 'useDeferredValue'
- | 'useTransition'
- | 'useMutableSource'
- | 'useOpaqueIdentifier';
-
 let didWarnAboutMismatchedHooksForComponent;
 let didWarnAboutUseOpaqueIdentifier;
 if (__DEV__) {
diff --git a/packages/react-reconciler/src/ReactFiberHooks.old.js b/packages/react-reconciler/src/ReactFiberHooks.old.js
@@ -13,7 +13,7 @@ import type {
 MutableSourceSubscribeFn,
 ReactContext,
 } from 'shared/ReactTypes';
-import type {Fiber, Dispatcher} from './ReactInternalTypes';
+import type {Fiber, Dispatcher, HookType} from './ReactInternalTypes';
 import type {Lanes, Lane} from './ReactFiberLane';
 import type {HookFlags} from './ReactHookEffectTags';
 import type {ReactPriorityLevel} from './ReactInternalTypes';
@@ -109,22 +109,6 @@ type UpdateQueue<S, A> = {|
 lastRenderedState: S | null,
 |};
 
-export type HookType =
- | 'useState'
- | 'useReducer'
- | 'useContext'
- | 'useRef'
- | 'useEffect'
- | 'useLayoutEffect'
- | 'useCallback'
- | 'useMemo'
- | 'useImperativeHandle'
- | 'useDebugValue'
- | 'useDeferredValue'
- | 'useTransition'
- | 'useMutableSource'
- | 'useOpaqueIdentifier';
-
 let didWarnAboutMismatchedHooksForComponent;
 let didWarnAboutUseOpaqueIdentifier;
 if (__DEV__) {
diff --git a/packages/react-reconciler/src/ReactInternalTypes.js b/packages/react-reconciler/src/ReactInternalTypes.js
@@ -21,12 +21,28 @@ import type {WorkTag} from './ReactWorkTags';
 import type {TypeOfMode} from './ReactTypeOfMode';
 import type {Flags} from './ReactFiberFlags';
 import type {Lane, LanePriority, Lanes, LaneMap} from './ReactFiberLane';
-import type {HookType} from './ReactFiberHooks.old';
 import type {RootTag} from './ReactRootTags';
 import type {TimeoutHandle, NoTimeout} from './ReactFiberHostConfig';
 import type {Wakeable} from 'shared/ReactTypes';
 import type {Interaction} from 'scheduler/src/Tracing';
 
+// Unwind Circular: moved from ReactFiberHooks.old
+export type HookType =
+ | 'useState'
+ | 'useReducer'
+ | 'useContext'
+ | 'useRef'
+ | 'useEffect'
+ | 'useLayoutEffect'
+ | 'useCallback'
+ | 'useMemo'
+ | 'useImperativeHandle'
+ | 'useDebugValue'
+ | 'useDeferredValue'
+ | 'useTransition'
+ | 'useMutableSource'
+ | 'useOpaqueIdentifier';
+
 export type ReactPriorityLevel = 99 | 98 | 97 | 96 | 95 | 90;
 
 export type ContextDependency<T> = {

-Original file line number
+Diff line change
 MutableSourceSubscribeFn,
 ReactContext,
 }from'shared/ReactTypes';
 -importtype{Fiber,Dispatcher}from'./ReactInternalTypes';
 +importtype{Fiber,Dispatcher,HookType}from'./ReactInternalTypes';
 importtype{Lanes,Lane}from'./ReactFiberLane';
 importtype{HookFlags}from'./ReactHookEffectTags';
 importtype{ReactPriorityLevel}from'./ReactInternalTypes';
 lastRenderedState: S|null,
 |};
 -exporttypeHookType=
 -|'useState'
 -|'useReducer'
 -|'useContext'
 -|'useRef'
 -|'useEffect'
 -|'useLayoutEffect'
 -|'useCallback'
 -|'useMemo'
 -|'useImperativeHandle'
 -|'useDebugValue'
 -|'useDeferredValue'
 -|'useTransition'
 -|'useMutableSource'
 -|'useOpaqueIdentifier';
+-
 letdidWarnAboutMismatchedHooksForComponent;
 letdidWarnAboutUseOpaqueIdentifier;
 if(__DEV__){