diff --git a/keyserver/flow-typed/npm/react-redux_v7.x.x.js b/keyserver/flow-typed/npm/react-redux_v7.x.x.js
--- a/keyserver/flow-typed/npm/react-redux_v7.x.x.js
+++ b/keyserver/flow-typed/npm/react-redux_v7.x.x.js
@@ -33,6 +33,7 @@
 */
 
 declare module "react-redux" {
+  import * as React from 'react';
   // ------------------------------------------------------------
   // Typings for connect()
   // ------------------------------------------------------------
@@ -67,7 +68,7 @@
     // and provide the DispatchProps type to the DP type parameter.
     | ((dispatch: D, ownProps: OP) => (dispatch: D, ownProps: OP) => DP);
 
-  declare class ConnectedComponentClass<OP, +WC> extends React$Component<OP> {
+  declare class ConnectedComponentClass<OP, +WC> extends React.Component<OP> {
     static +WrappedComponent: WC;
     getWrappedInstance(): React$ElementRef<WC>;
   }
@@ -77,7 +78,7 @@
   // The connection of the Wrapped Component and the Connected Component
   // happens here in `MP: P`. It means that type wise MP belongs to P,
   // so to say MP >= P.
-  declare type Connector<P, OP, MP: P> = <WC: React$ComponentType<P>>(
+  declare type Connector<P, OP, MP: P> = <WC: React.ComponentType<P>>(
     WC,
   ) => Class<ConnectedComponentClass<OP, WC>> & WC;
 
@@ -249,7 +250,7 @@
   // Typings for Provider
   // ------------------------------------------------------------
 
-  declare export class Provider<Store> extends React$Component<{
+  declare export class Provider<Store> extends React.Component<{
     store: Store,
     children?: React$Node,
     ...
@@ -293,7 +294,7 @@
   ) => RSP;
 
   declare type SelectorFactory<
-    Com: React$ComponentType<any>,
+    Com: React.ComponentType<any>,
     Dispatch,
     S: Object,
     OP: Object,
@@ -305,7 +306,7 @@
   ) => MapStateToPropsEx<S, OP, CP>;
 
   declare export function connectAdvanced<
-    Com: React$ComponentType<any>,
+    Com: React.ComponentType<any>,
     D,
     S: Object,
     OP: Object,
@@ -315,7 +316,7 @@
   >(
     selectorFactory: SelectorFactory<Com, D, S, OP, EFO, CP>,
     connectAdvancedOptions: ?(ConnectAdvancedOptions & EFO),
-  ): (component: Com) => React$ComponentType<OP> & Partial<ST>;
+  ): (component: Com) => React.ComponentType<OP> & Partial<ST>;
 
   declare export function batch(() => void): void
 
diff --git a/keyserver/flow-typed/npm/react-router_v5.x.x.js b/keyserver/flow-typed/npm/react-router_v5.x.x.js
--- a/keyserver/flow-typed/npm/react-router_v5.x.x.js
+++ b/keyserver/flow-typed/npm/react-router_v5.x.x.js
@@ -2,6 +2,7 @@
 // flow-typed version: 5f4b3cb313/react-router_v5.x.x/flow_>=v0.104.x
 
 declare module "react-router" {
+  import * as React from 'react';
   // NOTE: many of these are re-exported by react-router-dom and
   // react-router-native, so when making changes, please be sure to update those
   // as well.
@@ -65,7 +66,7 @@
 
   declare type StaticRouterContext = { url?: string, ... };
 
-  declare export class StaticRouter extends React$Component<{
+  declare export class StaticRouter extends React.Component<{
     basename?: string,
     location?: string | Location,
     context: StaticRouterContext,
@@ -73,7 +74,7 @@
     ...
   }> {}
 
-  declare export class MemoryRouter extends React$Component<{
+  declare export class MemoryRouter extends React.Component<{
     initialEntries?: Array<LocationShape | string>,
     initialIndex?: number,
     getUserConfirmation?: GetUserConfirmation,
@@ -82,19 +83,19 @@
     ...
   }> {}
 
-  declare export class Router extends React$Component<{
+  declare export class Router extends React.Component<{
     history: RouterHistory,
     children?: React$Node,
     ...
   }> {}
 
-  declare export class Prompt extends React$Component<{
+  declare export class Prompt extends React.Component<{
     message: string | ((location: Location) => string | true),
     when?: boolean,
     ...
   }> {}
 
-  declare export class Redirect extends React$Component<{|
+  declare export class Redirect extends React.Component<{|
     to: string | LocationShape,
     push?: boolean,
     from?: string,
@@ -103,10 +104,10 @@
   |}> {}
 
 
-  declare export class Route extends React$Component<{|
-    component?: React$ComponentType<*>,
+  declare export class Route extends React.Component<{|
+    component?: React.ComponentType<*>,
     render?: (router: ContextRouter) => React$Node,
-    children?: React$ComponentType<ContextRouter> | React$Node,
+    children?: React.ComponentType<ContextRouter> | React$Node,
     path?: string | Array<string>,
     exact?: boolean,
     strict?: boolean,
@@ -114,14 +115,14 @@
     sensitive?: boolean
   |}> {}
 
-  declare export class Switch extends React$Component<{|
+  declare export class Switch extends React.Component<{|
     children?: React$Node,
     location?: Location
   |}> {}
 
   declare export function withRouter<P>(
-    Component: React$ComponentType<{| ...ContextRouter, ...P |}>
-  ): React$ComponentType<P>;
+    Component: React.ComponentType<{| ...ContextRouter, ...P |}>
+  ): React.ComponentType<P>;
 
   declare type MatchPathOptions = {
     path?: string | string[],
diff --git a/landing/flow-typed/npm/react-router-dom_v5.x.x.js b/landing/flow-typed/npm/react-router-dom_v5.x.x.js
--- a/landing/flow-typed/npm/react-router-dom_v5.x.x.js
+++ b/landing/flow-typed/npm/react-router-dom_v5.x.x.js
@@ -2,7 +2,7 @@
 // flow-typed version: 5f4b3cb313/react-router-dom_v5.x.x/flow_>=v0.104.x
 
 declare module "react-router-dom" {
-  declare export var BrowserRouter: React$ComponentType<{|
+  declare export var BrowserRouter: React.ComponentType<{|
     basename?: string,
     forceRefresh?: boolean,
     getUserConfirmation?: GetUserConfirmation,
@@ -10,14 +10,14 @@
     children?: React$Node
   |}>
 
-  declare export var HashRouter: React$ComponentType<{|
+  declare export var HashRouter: React.ComponentType<{|
     basename?: string,
     getUserConfirmation?: GetUserConfirmation,
     hashType?: "slash" | "noslash" | "hashbang",
     children?: React$Node
   |}>
 
-  declare export var Link: React$ComponentType<{
+  declare export var Link: React.ComponentType<{
     +className?: string,
     +to: string | LocationShape,
     +replace?: boolean,
@@ -25,7 +25,7 @@
     ...
   }>
 
-  declare export var NavLink: React$ComponentType<{
+  declare export var NavLink: React.ComponentType<{
     +to: string | LocationShape,
     +activeClassName?: string,
     +className?: string,
@@ -108,14 +108,14 @@
 
   declare export type StaticRouterContext = { url?: string, ... };
 
-  declare export var StaticRouter: React$ComponentType<{|
+  declare export var StaticRouter: React.ComponentType<{|
     basename?: string,
     location?: string | Location,
     context: StaticRouterContext,
     children?: React$Node
   |}>
 
-  declare export var MemoryRouter: React$ComponentType<{|
+  declare export var MemoryRouter: React.ComponentType<{|
     initialEntries?: Array<LocationShape | string>,
     initialIndex?: number,
     getUserConfirmation?: GetUserConfirmation,
@@ -123,17 +123,17 @@
     children?: React$Node
   |}>
 
-  declare export var Router: React$ComponentType<{|
+  declare export var Router: React.ComponentType<{|
     history: RouterHistory,
     children?: React$Node
   |}>
 
-  declare export var Prompt: React$ComponentType<{|
+  declare export var Prompt: React.ComponentType<{|
     message: string | ((location: Location) => string | boolean),
     when?: boolean
   |}>
 
-  declare export var Redirect: React$ComponentType<{|
+  declare export var Redirect: React.ComponentType<{|
     to: string | LocationShape,
     push?: boolean,
     from?: string,
@@ -141,10 +141,10 @@
     strict?: boolean
   |}>
 
-  declare export var Route: React$ComponentType<{|
-    component?: React$ComponentType<*>,
+  declare export var Route: React.ComponentType<{|
+    component?: React.ComponentType<*>,
     render?: (router: ContextRouter) => React$Node,
-    children?: React$ComponentType<ContextRouter> | React$Node,
+    children?: React.ComponentType<ContextRouter> | React$Node,
     path?: string | Array<string>,
     exact?: boolean,
     strict?: boolean,
@@ -152,14 +152,14 @@
     sensitive?: boolean
   |}>
 
-  declare export var Switch: React$ComponentType<{|
+  declare export var Switch: React.ComponentType<{|
     children?: React$Node,
     location?: Location
   |}>
 
-  declare export function withRouter<Props: {...}, Component: React$ComponentType<Props>>(
+  declare export function withRouter<Props: {...}, Component: React.ComponentType<Props>>(
     WrappedComponent: Component
-  ): React$ComponentType<$Diff<React$ElementConfig<Component>, ContextRouterVoid>>;
+  ): React.ComponentType<$Diff<React$ElementConfig<Component>, ContextRouterVoid>>;
 
   declare type MatchPathOptions = {
     path?: string | string[],
diff --git a/landing/flow-typed/npm/react-router_v5.x.x.js b/landing/flow-typed/npm/react-router_v5.x.x.js
--- a/landing/flow-typed/npm/react-router_v5.x.x.js
+++ b/landing/flow-typed/npm/react-router_v5.x.x.js
@@ -2,6 +2,7 @@
 // flow-typed version: 5f4b3cb313/react-router_v5.x.x/flow_>=v0.104.x
 
 declare module "react-router" {
+  import * as React from 'react';
   // NOTE: many of these are re-exported by react-router-dom and
   // react-router-native, so when making changes, please be sure to update those
   // as well.
@@ -65,7 +66,7 @@
 
   declare type StaticRouterContext = { url?: string, ... };
 
-  declare export class StaticRouter extends React$Component<{
+  declare export class StaticRouter extends React.Component<{
     basename?: string,
     location?: string | Location,
     context: StaticRouterContext,
@@ -73,7 +74,7 @@
     ...
   }> {}
 
-  declare export class MemoryRouter extends React$Component<{
+  declare export class MemoryRouter extends React.Component<{
     initialEntries?: Array<LocationShape | string>,
     initialIndex?: number,
     getUserConfirmation?: GetUserConfirmation,
@@ -82,19 +83,19 @@
     ...
   }> {}
 
-  declare export class Router extends React$Component<{
+  declare export class Router extends React.Component<{
     history: RouterHistory,
     children?: React$Node,
     ...
   }> {}
 
-  declare export class Prompt extends React$Component<{
+  declare export class Prompt extends React.Component<{
     message: string | ((location: Location) => string | true),
     when?: boolean,
     ...
   }> {}
 
-  declare export class Redirect extends React$Component<{|
+  declare export class Redirect extends React.Component<{|
     to: string | LocationShape,
     push?: boolean,
     from?: string,
@@ -103,10 +104,10 @@
   |}> {}
 
 
-  declare export class Route extends React$Component<{|
-    component?: React$ComponentType<*>,
+  declare export class Route extends React.Component<{|
+    component?: React.ComponentType<*>,
     render?: (router: ContextRouter) => React$Node,
-    children?: React$ComponentType<ContextRouter> | React$Node,
+    children?: React.ComponentType<ContextRouter> | React$Node,
     path?: string | Array<string>,
     exact?: boolean,
     strict?: boolean,
@@ -114,14 +115,14 @@
     sensitive?: boolean
   |}> {}
 
-  declare export class Switch extends React$Component<{|
+  declare export class Switch extends React.Component<{|
     children?: React$Node,
     location?: Location
   |}> {}
 
   declare export function withRouter<P>(
-    Component: React$ComponentType<{| ...ContextRouter, ...P |}>
-  ): React$ComponentType<P>;
+    Component: React.ComponentType<{| ...ContextRouter, ...P |}>
+  ): React.ComponentType<P>;
 
   declare type MatchPathOptions = {
     path?: string | string[],
diff --git a/lib/flow-typed/npm/react-redux_v7.x.x.js b/lib/flow-typed/npm/react-redux_v7.x.x.js
--- a/lib/flow-typed/npm/react-redux_v7.x.x.js
+++ b/lib/flow-typed/npm/react-redux_v7.x.x.js
@@ -33,6 +33,7 @@
 */
 
 declare module "react-redux" {
+  import * as React from 'react';
   // ------------------------------------------------------------
   // Typings for connect()
   // ------------------------------------------------------------
@@ -67,7 +68,7 @@
     // and provide the DispatchProps type to the DP type parameter.
     | ((dispatch: D, ownProps: OP) => (dispatch: D, ownProps: OP) => DP);
 
-  declare class ConnectedComponentClass<OP, +WC> extends React$Component<OP> {
+  declare class ConnectedComponentClass<OP, +WC> extends React.Component<OP> {
     static +WrappedComponent: WC;
     getWrappedInstance(): React$ElementRef<WC>;
   }
@@ -77,7 +78,7 @@
   // The connection of the Wrapped Component and the Connected Component
   // happens here in `MP: P`. It means that type wise MP belongs to P,
   // so to say MP >= P.
-  declare type Connector<P, OP, MP: P> = <WC: React$ComponentType<P>>(
+  declare type Connector<P, OP, MP: P> = <WC: React.ComponentType<P>>(
     WC,
   ) => Class<ConnectedComponentClass<OP, WC>> & WC;
 
@@ -249,7 +250,7 @@
   // Typings for Provider
   // ------------------------------------------------------------
 
-  declare export class Provider<Store> extends React$Component<{
+  declare export class Provider<Store> extends React.Component<{
     store: Store,
     children?: React$Node,
     ...
@@ -293,7 +294,7 @@
   ) => RSP;
 
   declare type SelectorFactory<
-    Com: React$ComponentType<any>,
+    Com: React.ComponentType<any>,
     Dispatch,
     S: Object,
     OP: Object,
@@ -305,7 +306,7 @@
   ) => MapStateToPropsEx<S, OP, CP>;
 
   declare export function connectAdvanced<
-    Com: React$ComponentType<any>,
+    Com: React.ComponentType<any>,
     D,
     S: Object,
     OP: Object,
@@ -315,7 +316,7 @@
   >(
     selectorFactory: SelectorFactory<Com, D, S, OP, EFO, CP>,
     connectAdvancedOptions: ?(ConnectAdvancedOptions & EFO),
-  ): (component: Com) => React$ComponentType<OP> & Partial<ST>;
+  ): (component: Com) => React.ComponentType<OP> & Partial<ST>;
 
   declare export function batch(() => void): void
 
diff --git a/native/flow-typed/npm/@expo/react-native-action-sheet_vx.x.x.js b/native/flow-typed/npm/@expo/react-native-action-sheet_vx.x.x.js
--- a/native/flow-typed/npm/@expo/react-native-action-sheet_vx.x.x.js
+++ b/native/flow-typed/npm/@expo/react-native-action-sheet_vx.x.x.js
@@ -2,6 +2,7 @@
 // flow-typed version: <<STUB>>/@expo/react-native-action-sheet_v3.14.0/flow_v0.158.0
 
 declare module '@expo/react-native-action-sheet' {
+  import * as React from 'react';
   // This was taken from the flow typed library definitions of bottom-tabs_v6
   declare type StyleObj =
     | null
@@ -60,5 +61,5 @@
   |};
 
   declare export class ActionSheetProvider
-    extends React$Component<ActionSheetProviderProps> {}
+    extends React.Component<ActionSheetProviderProps> {}
 }
diff --git a/native/flow-typed/npm/@expo/vector-icons_vx.x.x.js b/native/flow-typed/npm/@expo/vector-icons_vx.x.x.js
--- a/native/flow-typed/npm/@expo/vector-icons_vx.x.x.js
+++ b/native/flow-typed/npm/@expo/vector-icons_vx.x.x.js
@@ -21,7 +21,7 @@
   |};
 
   declare export type Icon<Glyphs: string> =
-    & React$ComponentType<IconProps<Glyphs>>
+    & React.ComponentType<IconProps<Glyphs>>
     & IconStatics;
 
   declare export type IconButtonProps<Glyphs: string> = {
@@ -31,7 +31,7 @@
     ...
   };
 
-  declare export type IconButton<Glyphs: string> = React$ComponentType<
+  declare export type IconButton<Glyphs: string> = React.ComponentType<
     IconButtonProps<Glyphs>
   >;
 
diff --git a/native/flow-typed/npm/@react-navigation/bottom-tabs_v6.x.x.js b/native/flow-typed/npm/@react-navigation/bottom-tabs_v6.x.x.js
--- a/native/flow-typed/npm/@react-navigation/bottom-tabs_v6.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/bottom-tabs_v6.x.x.js
@@ -29,7 +29,7 @@
    * BottomTabBar
    */
 
-  declare export var BottomTabBar: React$ComponentType<BottomTabBarProps>;
+  declare export var BottomTabBar: React.ComponentType<BottomTabBarProps>;
 
   /**
    * BottomTabView
@@ -39,6 +39,6 @@
     ...BottomTabNavigationConfig,
     ...BottomTabNavigationBuilderResult,
   |};
-  declare export var BottomTabView: React$ComponentType<BottomTabViewProps>;
+  declare export var BottomTabView: React.ComponentType<BottomTabViewProps>;
 
 }
diff --git a/native/flow-typed/npm/@react-navigation/core_v6.x.x.js b/native/flow-typed/npm/@react-navigation/core_v6.x.x.js
--- a/native/flow-typed/npm/@react-navigation/core_v6.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/core_v6.x.x.js
@@ -1016,7 +1016,7 @@
           ScreenOptions,
           EventMap,
         >,
-        +component: React$ComponentType<{|
+        +component: React.ComponentType<{|
           +route: RouteProp<ParamList, RouteName>,
           +navigation: NavProp,
         |}>,
@@ -1030,7 +1030,7 @@
           ScreenOptions,
           EventMap,
         >,
-        +getComponent: () => React$ComponentType<{|
+        +getComponent: () => React.ComponentType<{|
           +route: RouteProp<ParamList, RouteName>,
           +navigation: NavProp,
         |}>,
@@ -1150,14 +1150,14 @@
       ScreenOptions,
       EventMap,
     >,
-    +Navigator: React$ComponentType<$Exact<NavigatorProps<
+    +Navigator: React.ComponentType<$Exact<NavigatorProps<
       ScreenOptions,
       ScreenListeners<State, EventMap>,
       RouteProp<ParamList>,
       NavHelpers,
       ExtraNavigatorProps,
     >>>,
-    +Group: React$ComponentType<{|
+    +Group: React.ComponentType<{|
       ...ScreenOptionsProps<ScreenOptions, RouteProp<ParamList>, NavHelpers>,
       +children: React$Node,
       +navigationKey?: string,
@@ -1175,7 +1175,7 @@
     >,
     ExtraNavigatorProps: ExtraNavigatorPropsBase,
   >(
-    navigator: React$ComponentType<$Exact<NavigatorProps<
+    navigator: React.ComponentType<$Exact<NavigatorProps<
       ScreenOptions,
       ScreenListeners<State, EventMap>,
       RouteProp<>,
diff --git a/native/flow-typed/npm/@react-navigation/drawer_v6.x.x.js b/native/flow-typed/npm/@react-navigation/drawer_v6.x.x.js
--- a/native/flow-typed/npm/@react-navigation/drawer_v6.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/drawer_v6.x.x.js
@@ -35,7 +35,7 @@
     ...DrawerNavigationConfig,
     ...DrawerNavigationBuilderResult,
   |};
-  declare export var DrawerView: React$ComponentType<DrawerViewProps>;
+  declare export var DrawerView: React.ComponentType<DrawerViewProps>;
 
   /**
    * DrawerItem
@@ -60,13 +60,13 @@
     +labelStyle?: TextStyleProp,
     +style?: ViewStyleProp,
   |};
-  declare export var DrawerItem: React$ComponentType<DrawerItemProps>;
+  declare export var DrawerItem: React.ComponentType<DrawerItemProps>;
 
   /**
    * DrawerItemList
    */
 
-  declare export var DrawerItemList: React$ComponentType<
+  declare export var DrawerItemList: React.ComponentType<
     DrawerNavigationBuilderResult,
   >;
 
@@ -74,7 +74,7 @@
    * DrawerContent
    */
 
-  declare export var DrawerContent: React$ComponentType<
+  declare export var DrawerContent: React.ComponentType<
     DrawerNavigationBuilderResult,
   >;
 
@@ -82,7 +82,7 @@
    * DrawerContentScrollView
    */
 
-  declare export var DrawerContentScrollView: React$ComponentType<{
+  declare export var DrawerContentScrollView: React.ComponentType<{
     +children: React$Node,
     ...
   }>;
@@ -92,7 +92,7 @@
    */
 
   declare type GestureHandlerRef = React.RefObject<
-    React$ComponentType<PanGestureHandlerProps>,
+    React.ComponentType<PanGestureHandlerProps>,
   >;
   declare export var DrawerGestureContext: React$Context<?GestureHandlerRef>;
 
diff --git a/native/flow-typed/npm/@react-navigation/elements_v1.x.x.js b/native/flow-typed/npm/@react-navigation/elements_v1.x.x.js
--- a/native/flow-typed/npm/@react-navigation/elements_v1.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/elements_v1.x.x.js
@@ -18,14 +18,14 @@
    */
 
   declare export type StackHeaderTitleProps = Partial<HeaderTitleInputBase>;
-  declare export var HeaderTitle: React$ComponentType<StackHeaderTitleProps>;
+  declare export var HeaderTitle: React.ComponentType<StackHeaderTitleProps>;
 
   declare export type HeaderBackButtonProps = Partial<{|
     ...StackHeaderLeftButtonProps,
     +disabled: boolean,
     +accessibilityLabel: string,
   |}>;
-  declare export var HeaderBackButton: React$ComponentType<
+  declare export var HeaderBackButton: React.ComponentType<
     HeaderBackButtonProps,
   >;
 
@@ -34,7 +34,7 @@
     +style: AnimatedViewStyleProp,
     ...
   }>;
-  declare export var HeaderBackground: React$ComponentType<
+  declare export var HeaderBackground: React.ComponentType<
     HeaderBackgroundProps,
   >;
 
diff --git a/native/flow-typed/npm/@react-navigation/material-top-tabs_v6.x.x.js b/native/flow-typed/npm/@react-navigation/material-top-tabs_v6.x.x.js
--- a/native/flow-typed/npm/@react-navigation/material-top-tabs_v6.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/material-top-tabs_v6.x.x.js
@@ -34,7 +34,7 @@
     ...MaterialTopTabNavigationConfig,
     ...MaterialTopTabNavigationBuilderResult,
   |};
-  declare export var MaterialTopTabView: React$ComponentType<
+  declare export var MaterialTopTabView: React.ComponentType<
     MaterialTopTabViewProps,
   >;
 
@@ -42,7 +42,7 @@
    * MaterialTopTabBar
    */
 
-  declare export var MaterialTopTabBar: React$ComponentType<
+  declare export var MaterialTopTabBar: React.ComponentType<
     MaterialTopTabBarProps<Route<>>,
   >;
 
diff --git a/native/flow-typed/npm/@react-navigation/stack_v6.x.x.js b/native/flow-typed/npm/@react-navigation/stack_v6.x.x.js
--- a/native/flow-typed/npm/@react-navigation/stack_v6.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/stack_v6.x.x.js
@@ -49,7 +49,7 @@
    * Header components
    */
 
-  declare export var Header: React$ComponentType<
+  declare export var Header: React.ComponentType<
     StackHeaderProps
   >;
 
@@ -106,7 +106,7 @@
    */
 
   declare type GestureHandlerRef = React.RefObject<
-    React$ComponentType<PanGestureHandlerProps>,
+    React.ComponentType<PanGestureHandlerProps>,
   >;
   declare export var GestureHandlerRefContext: React$Context<
     ?GestureHandlerRef,
diff --git a/native/flow-typed/npm/react-native-gesture-handler_v2.x.x.js b/native/flow-typed/npm/react-native-gesture-handler_v2.x.x.js
--- a/native/flow-typed/npm/react-native-gesture-handler_v2.x.x.js
+++ b/native/flow-typed/npm/react-native-gesture-handler_v2.x.x.js
@@ -97,6 +97,7 @@
 }
 
 declare module 'react-native-gesture-handler/DrawerLayout' {
+  import * as React from 'react';
   import type {
     AnimatedValue,
     ViewStyle,
@@ -151,7 +152,7 @@
     containerWidth: number,
   |};
 
-  declare export default class DrawerLayout extends React$Component<
+  declare export default class DrawerLayout extends React.Component<
     DrawerLayoutProps,
     DrawerLayoutState
   > {
@@ -164,6 +165,7 @@
   }
 }
 declare module 'react-native-gesture-handler/Swipeable' {
+  import * as React from 'react';
   import type {
     AnimatedValue,
     ViewStyle,
@@ -207,7 +209,7 @@
     ...
   }>;
 
-  declare export default class Swipeable extends React$Component<
+  declare export default class Swipeable extends React.Component<
     SwipeableProps,
     SwipeableState
   > {
@@ -218,18 +220,20 @@
 }
 
 declare module 'react-native-gesture-handler/gestureHandlerRootHOC' {
+  import * as React from 'react';
   import type { ViewStyle } from 'react-native-gesture-handler/@react-native';
 
   declare export default {
     <Config: { ... }>(
-      Component: React$ComponentType<Config>,
+      Component: React.ComponentType<Config>,
       containerStyles: ?ViewStyle
-    ): React$ComponentType<Config>,
+    ): React.ComponentType<Config>,
     ...,
   };
 }
 
 declare module 'react-native-gesture-handler/touchables/TouchableNativeFeedback' {
+  import * as React from 'react';
   import type { TouchableProps } from 'react-native-gesture-handler/@react-native';
 
   declare type TouchableNativeFeedbackProps = $ReadOnly<{
@@ -237,7 +241,7 @@
     ...
   }>;
 
-  declare export default class TouchableNativeFeedback extends React$Component<TouchableNativeFeedbackProps> {
+  declare export default class TouchableNativeFeedback extends React.Component<TouchableNativeFeedbackProps> {
     static SelectableBackground(): {| type: 'SelectableBackground' |};
     static SelectableBackgroundBorderless(): {|
       type: 'SelectableBackgroundBorderless',
@@ -254,6 +258,7 @@
   }
 }
 declare module 'react-native-gesture-handler/touchables/TouchableWithoutFeedback' {
+  import * as React from 'react';
   import type { TouchableProps } from 'react-native-gesture-handler/@react-native';
 
   declare type TouchableWithoutFeedbackProps = $ReadOnly<{
@@ -261,9 +266,10 @@
     ...
   }>;
 
-  declare export default class TouchableWithoutFeedback extends React$Component<TouchableWithoutFeedbackProps> {}
+  declare export default class TouchableWithoutFeedback extends React.Component<TouchableWithoutFeedbackProps> {}
 }
 declare module 'react-native-gesture-handler/touchables/TouchableOpacity' {
+  import * as React from 'react';
   import type {
     TouchableProps,
     ViewStyle,
@@ -276,9 +282,10 @@
     ...
   }>;
 
-  declare export default class TouchableOpacity extends React$Component<TouchableOpacityProps> {}
+  declare export default class TouchableOpacity extends React.Component<TouchableOpacityProps> {}
 }
 declare module 'react-native-gesture-handler/touchables/TouchableHighlight' {
+  import * as React from 'react';
   import type {
     TouchableProps,
     ViewStyle,
@@ -294,7 +301,7 @@
     ...
   }>;
 
-  declare export default class TouchableHighlight extends React$Component<TouchableHighlightProps> {}
+  declare export default class TouchableHighlight extends React.Component<TouchableHighlightProps> {}
 }
 declare module 'react-native-gesture-handler/touchables' {
   declare export {
@@ -312,6 +319,7 @@
 }
 
 declare module 'react-native-gesture-handler/GestureHandler' {
+  import * as React from 'react';
   import type { State } from 'react-native-gesture-handler/State';
   import type { ViewStyle } from 'react-native-gesture-handler/@react-native';
 
@@ -398,7 +406,7 @@
     { pointerInside: boolean, ... }
   >;
 
-  declare export class NativeViewGestureHandler extends React$Component<NativeViewGestureHandlerProps> {}
+  declare export class NativeViewGestureHandler extends React.Component<NativeViewGestureHandlerProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // Tap
@@ -423,7 +431,7 @@
     TapGestureEvent,
   >;
 
-  declare export class TapGestureHandler extends React$Component<TapGestureHandlerProps> {}
+  declare export class TapGestureHandler extends React.Component<TapGestureHandlerProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // Fling
@@ -443,7 +451,7 @@
     }
   >;
 
-  declare export class FlingGestureHandler extends React$Component<FlingGestureHandlerProps> {}
+  declare export class FlingGestureHandler extends React.Component<FlingGestureHandlerProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // ForceTouch
@@ -458,7 +466,7 @@
     { force: number, ... }
   >;
 
-  declare export class ForceTouchGestureHandler extends React$Component<ForceTouchGestureHandlerProps> {
+  declare export class ForceTouchGestureHandler extends React.Component<ForceTouchGestureHandlerProps> {
     static forceTouchAvailable(): boolean;
   }
 
@@ -482,7 +490,7 @@
     LongPressGestureEvent,
   >;
 
-  declare export class LongPressGestureHandler extends React$Component<LongPressGestureHandlerProps> {}
+  declare export class LongPressGestureHandler extends React.Component<LongPressGestureHandlerProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // PanGesture
@@ -517,7 +525,7 @@
     PanGestureEvent,
   >;
 
-  declare export class PanGestureHandler extends React$Component<PanGestureHandlerProps> {}
+  declare export class PanGestureHandler extends React.Component<PanGestureHandlerProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // Pinch
@@ -535,7 +543,7 @@
     PinchGestureEvent,
   >;
 
-  declare export class PinchGestureHandler extends React$Component<PinchGestureHandlerProps> {}
+  declare export class PinchGestureHandler extends React.Component<PinchGestureHandlerProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // Rotation
@@ -551,7 +559,7 @@
     }
   >;
 
-  declare export class RotationGestureHandler extends React$Component<RotationGestureHandlerProps> {}
+  declare export class RotationGestureHandler extends React.Component<RotationGestureHandlerProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // RawButton
@@ -561,7 +569,7 @@
     ...
   };
 
-  declare export class RawButton extends React$Component<RawButtonProps> {}
+  declare export class RawButton extends React.Component<RawButtonProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // BaseButton
@@ -577,7 +585,7 @@
     ...
   };
 
-  declare export class BaseButton extends React$Component<BaseButtonProps> {}
+  declare export class BaseButton extends React.Component<BaseButtonProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // RectButton
@@ -588,7 +596,7 @@
     activeOpacity?: number,
     ...
   };
-  declare export class RectButton extends React$Component<RectButtonProps> {}
+  declare export class RectButton extends React.Component<RectButtonProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // BorderlessButton
@@ -599,7 +607,7 @@
     activeOpacity?: number,
     ...
   };
-  declare export class BorderlessButton extends React$Component<BorderlessButtonProps> {}
+  declare export class BorderlessButton extends React.Component<BorderlessButtonProps> {}
 
   /////////////////////////////////////////////////////////////////////////////
   // Other
@@ -612,24 +620,24 @@
     default as Directions,
   } from 'react-native-gesture-handler/Directions';
 
-  declare export var FlatList: React$ComponentType<any>;
-  declare export var ScrollView: React$ComponentType<any>;
-  declare export var Switch: React$ComponentType<any>;
-  declare export var TextInput: React$ComponentType<any>;
-  declare export var ToolbarAndroid: React$ComponentType<any>;
-  declare export var DrawerLayoutAndroid: React$ComponentType<any>;
-  declare export var PureNativeButton: React$ComponentType<any>;
+  declare export var FlatList: React.ComponentType<any>;
+  declare export var ScrollView: React.ComponentType<any>;
+  declare export var Switch: React.ComponentType<any>;
+  declare export var TextInput: React.ComponentType<any>;
+  declare export var ToolbarAndroid: React.ComponentType<any>;
+  declare export var DrawerLayoutAndroid: React.ComponentType<any>;
+  declare export var PureNativeButton: React.ComponentType<any>;
 
   declare export function createNativeWrapper<Config: { ... }>(
-    Com: React$ComponentType<Config>,
+    Com: React.ComponentType<Config>,
     config?: { ... }
-  ): React$ComponentType<{
+  ): React.ComponentType<{
     ...NativeViewGestureHandlerProps,
     ...$Exact<Config>,
     ...
   }>;
 
-  declare export var GestureHandlerRootView: React$ComponentType<{...}>;
+  declare export var GestureHandlerRootView: React.ComponentType<{...}>;
 }
 
 declare const State: {
diff --git a/native/flow-typed/npm/react-native-reanimated_v2.x.x.js b/native/flow-typed/npm/react-native-reanimated_v2.x.x.js
--- a/native/flow-typed/npm/react-native-reanimated_v2.x.x.js
+++ b/native/flow-typed/npm/react-native-reanimated_v2.x.x.js
@@ -14,6 +14,7 @@
  */
 
 declare module 'react-native-reanimated' {
+  import * as React from 'react';
   // This was taken from the flow typed library definitions of bottom-tabs_v6
   declare type StyleObj =
     | null
@@ -42,7 +43,7 @@
 
   declare class ClockImpl extends NodeImpl { }
 
-  declare class ViewImpl extends React$Component<{
+  declare class ViewImpl extends React.Component<{
     +entering?:
       | ReanimatedAnimationBuilder
       | EntryAnimationFunction
@@ -53,7 +54,7 @@
       | Keyframe,
     ...
   }> { }
-  declare class TextImpl extends React$Component<{
+  declare class TextImpl extends React.Component<{
     +entering?:
       | ReanimatedAnimationBuilder
       | EntryAnimationFunction
@@ -64,7 +65,7 @@
       | Keyframe,
     ...
   }> { }
-  declare class ImageImpl extends React$Component<{
+  declare class ImageImpl extends React.Component<{
     +entering?:
       | ReanimatedAnimationBuilder
       | EntryAnimationFunction
@@ -76,7 +77,7 @@
     ...
   }> { }
 
-  declare class CodeImpl extends React$Component<{
+  declare class CodeImpl extends React.Component<{
     +exec: NodeImpl,
     ...
   }> { }
diff --git a/native/flow-typed/npm/react-native-tab-view_v3.x.x.js b/native/flow-typed/npm/react-native-tab-view_v3.x.x.js
--- a/native/flow-typed/npm/react-native-tab-view_v3.x.x.js
+++ b/native/flow-typed/npm/react-native-tab-view_v3.x.x.js
@@ -20,7 +20,7 @@
   // We couldn't find a good way to type this
   declare type AnimatedInterpolation = any;
 
-  declare export var TabBarItem: React$ComponentType<{
+  declare export var TabBarItem: React.ComponentType<{
     +position: AnimatedInterpolation,
     +route: Route<>,
     +navigationState: { +index: number, ... },
@@ -36,7 +36,7 @@
     ...
   }>;
 
-  declare export var TabView: React$ComponentType<{
+  declare export var TabView: React.ComponentType<{
     +navigationState: { +index: number, ... },
     +renderScene: (props: SceneRendererProps & { +route: Route<>, ... }) => React$Node,
     +onIndexChange: (number) => void,
@@ -49,7 +49,7 @@
     [key: string]: () => React$Node,
   }): (props: SceneRendererProps & { +route: Route<>, ... }) => React$Node;
 
-  declare export var TabBar: React$ComponentType<{
+  declare export var TabBar: React.ComponentType<{
     +style: ViewStyle,
     +indicatorStyle: ViewStyle,
     ...
diff --git a/native/flow-typed/npm/react-redux_v7.x.x.js b/native/flow-typed/npm/react-redux_v7.x.x.js
--- a/native/flow-typed/npm/react-redux_v7.x.x.js
+++ b/native/flow-typed/npm/react-redux_v7.x.x.js
@@ -33,6 +33,7 @@
 */
 
 declare module "react-redux" {
+  import * as React from 'react';
   // ------------------------------------------------------------
   // Typings for connect()
   // ------------------------------------------------------------
@@ -67,7 +68,7 @@
     // and provide the DispatchProps type to the DP type parameter.
     | ((dispatch: D, ownProps: OP) => (dispatch: D, ownProps: OP) => DP);
 
-  declare class ConnectedComponentClass<OP, +WC> extends React$Component<OP> {
+  declare class ConnectedComponentClass<OP, +WC> extends React.Component<OP> {
     static +WrappedComponent: WC;
     getWrappedInstance(): React$ElementRef<WC>;
   }
@@ -77,7 +78,7 @@
   // The connection of the Wrapped Component and the Connected Component
   // happens here in `MP: P`. It means that type wise MP belongs to P,
   // so to say MP >= P.
-  declare type Connector<P, OP, MP: P> = <WC: React$ComponentType<P>>(
+  declare type Connector<P, OP, MP: P> = <WC: React.ComponentType<P>>(
     WC,
   ) => Class<ConnectedComponentClass<OP, WC>> & WC;
 
@@ -249,7 +250,7 @@
   // Typings for Provider
   // ------------------------------------------------------------
 
-  declare export class Provider<Store> extends React$Component<{
+  declare export class Provider<Store> extends React.Component<{
     store: Store,
     children?: React$Node,
     ...
@@ -293,7 +294,7 @@
   ) => RSP;
 
   declare type SelectorFactory<
-    Com: React$ComponentType<any>,
+    Com: React.ComponentType<any>,
     Dispatch,
     S: Object,
     OP: Object,
@@ -305,7 +306,7 @@
   ) => MapStateToPropsEx<S, OP, CP>;
 
   declare export function connectAdvanced<
-    Com: React$ComponentType<any>,
+    Com: React.ComponentType<any>,
     D,
     S: Object,
     OP: Object,
@@ -315,7 +316,7 @@
   >(
     selectorFactory: SelectorFactory<Com, D, S, OP, EFO, CP>,
     connectAdvancedOptions: ?(ConnectAdvancedOptions & EFO),
-  ): (component: Com) => React$ComponentType<OP> & Partial<ST>;
+  ): (component: Com) => React.ComponentType<OP> & Partial<ST>;
 
   declare export function batch(() => void): void
 
diff --git a/native/flow-typed/npm/react-test-renderer_v16.x.x.js b/native/flow-typed/npm/react-test-renderer_v16.x.x.js
--- a/native/flow-typed/npm/react-test-renderer_v16.x.x.js
+++ b/native/flow-typed/npm/react-test-renderer_v16.x.x.js
@@ -4,7 +4,7 @@
 // Type definitions for react-test-renderer 16.x.x
 // Ported from: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-test-renderer
 
-type ReactComponentInstance = React$Component<any>;
+type ReactComponentInstance = React.ComponentType<any>;
 
 type ReactTestRendererJSON = {
   type: string,
diff --git a/web/flow-typed/npm/react-hot-loader_v4.6.x.js b/web/flow-typed/npm/react-hot-loader_v4.6.x.js
--- a/web/flow-typed/npm/react-hot-loader_v4.6.x.js
+++ b/web/flow-typed/npm/react-hot-loader_v4.6.x.js
@@ -3,6 +3,7 @@
 
 // @flow
 declare module "react-hot-loader" {
+  import * as React from 'react';
   declare type Module = { id: string, ... };
 
   declare type ErrorReporterProps = {|
@@ -13,21 +14,21 @@
   declare export type ContainerProps = {|
     children: React$Element<any>,
     errorBoundary?: boolean,
-    errorReporter?: React$ComponentType<ErrorReporterProps>,
+    errorReporter?: React.ComponentType<ErrorReporterProps>,
   |}
 
-  declare export class AppContainer extends React$Component<ContainerProps> {}
+  declare export class AppContainer extends React.Component<ContainerProps> {}
 
-  declare export function hot(module: Module): <T: React$ComponentType<any>>(
+  declare export function hot(module: Module): <T: React.ComponentType<any>>(
     Component: T,
     props?: $Diff<ContainerProps, { children: React$Element<any>, ... }>
   ) => T
 
-  declare export function cold<T: React$ComponentType<any>>(component: T): T
+  declare export function cold<T: React.ComponentType<any>>(component: T): T
 
   declare export function areComponentsEqual<T>(
-    typeA: React$ComponentType<T>,
-    typeB: React$ComponentType<T>
+    typeA: React.ComponentType<T>,
+    typeB: React.ComponentType<T>
   ): boolean
 
   declare type Config = {|
@@ -39,8 +40,8 @@
     disableHotRendererWhenInjected: boolean,
     ignoreSFC: boolean,
     ignoreComponents: boolean,
-    errorReporter: React$ComponentType<ErrorReporterProps>,
-    ErrorOverlay: React$ComponentType<{ errors: Array<ErrorReporterProps>, ... }>,
+    errorReporter: React.ComponentType<ErrorReporterProps>,
+    ErrorOverlay: React.ComponentType<{ errors: Array<ErrorReporterProps>, ... }>,
     onComponentRegister: (type: any, uniqueLocalName: string, fileName: string) => any,
     onComponentCreate: (type: any, displayName: string) => any,
   |}
@@ -51,7 +52,7 @@
 declare module "react-hot-loader/root" {
   import type { ContainerProps } from 'react-hot-loader';
 
-  declare export function hot<T: React$ComponentType<any>>(
+  declare export function hot<T: React.ComponentType<any>>(
     Component: T,
     props?: $Diff<ContainerProps, { children: React$Element<any>, ... }>
   ): T;
diff --git a/web/flow-typed/npm/react-redux_v7.x.x.js b/web/flow-typed/npm/react-redux_v7.x.x.js
--- a/web/flow-typed/npm/react-redux_v7.x.x.js
+++ b/web/flow-typed/npm/react-redux_v7.x.x.js
@@ -33,6 +33,7 @@
 */
 
 declare module "react-redux" {
+  import * as React from 'react';
   // ------------------------------------------------------------
   // Typings for connect()
   // ------------------------------------------------------------
@@ -67,7 +68,7 @@
     // and provide the DispatchProps type to the DP type parameter.
     | ((dispatch: D, ownProps: OP) => (dispatch: D, ownProps: OP) => DP);
 
-  declare class ConnectedComponentClass<OP, +WC> extends React$Component<OP> {
+  declare class ConnectedComponentClass<OP, +WC> extends React.Component<OP> {
     static +WrappedComponent: WC;
     getWrappedInstance(): React$ElementRef<WC>;
   }
@@ -77,7 +78,7 @@
   // The connection of the Wrapped Component and the Connected Component
   // happens here in `MP: P`. It means that type wise MP belongs to P,
   // so to say MP >= P.
-  declare type Connector<P, OP, MP: P> = <WC: React$ComponentType<P>>(
+  declare type Connector<P, OP, MP: P> = <WC: React.ComponentType<P>>(
     WC,
   ) => Class<ConnectedComponentClass<OP, WC>> & WC;
 
@@ -249,7 +250,7 @@
   // Typings for Provider
   // ------------------------------------------------------------
 
-  declare export class Provider<Store> extends React$Component<{
+  declare export class Provider<Store> extends React.Component<{
     store: Store,
     children?: React$Node,
     ...
@@ -293,7 +294,7 @@
   ) => RSP;
 
   declare type SelectorFactory<
-    Com: React$ComponentType<any>,
+    Com: React.ComponentType<any>,
     Dispatch,
     S: Object,
     OP: Object,
@@ -305,7 +306,7 @@
   ) => MapStateToPropsEx<S, OP, CP>;
 
   declare export function connectAdvanced<
-    Com: React$ComponentType<any>,
+    Com: React.ComponentType<any>,
     D,
     S: Object,
     OP: Object,
@@ -315,7 +316,7 @@
   >(
     selectorFactory: SelectorFactory<Com, D, S, OP, EFO, CP>,
     connectAdvancedOptions: ?(ConnectAdvancedOptions & EFO),
-  ): (component: Com) => React$ComponentType<OP> & Partial<ST>;
+  ): (component: Com) => React.ComponentType<OP> & Partial<ST>;
 
   declare export function batch(() => void): void
 
diff --git a/web/flow-typed/npm/react-router-dom_v5.x.x.js b/web/flow-typed/npm/react-router-dom_v5.x.x.js
--- a/web/flow-typed/npm/react-router-dom_v5.x.x.js
+++ b/web/flow-typed/npm/react-router-dom_v5.x.x.js
@@ -2,7 +2,7 @@
 // flow-typed version: 5f4b3cb313/react-router-dom_v5.x.x/flow_>=v0.104.x
 
 declare module "react-router-dom" {
-  declare export var BrowserRouter: React$ComponentType<{|
+  declare export var BrowserRouter: React.ComponentType<{|
     basename?: string,
     forceRefresh?: boolean,
     getUserConfirmation?: GetUserConfirmation,
@@ -10,14 +10,14 @@
     children?: React$Node
   |}>
 
-  declare export var HashRouter: React$ComponentType<{|
+  declare export var HashRouter: React.ComponentType<{|
     basename?: string,
     getUserConfirmation?: GetUserConfirmation,
     hashType?: "slash" | "noslash" | "hashbang",
     children?: React$Node
   |}>
 
-  declare export var Link: React$ComponentType<{
+  declare export var Link: React.ComponentType<{
     +className?: string,
     +to: string | LocationShape,
     +replace?: boolean,
@@ -25,7 +25,7 @@
     ...
   }>
 
-  declare export var NavLink: React$ComponentType<{
+  declare export var NavLink: React.ComponentType<{
     +to: string | LocationShape,
     +activeClassName?: string,
     +className?: string,
@@ -108,14 +108,14 @@
 
   declare export type StaticRouterContext = { url?: string, ... };
 
-  declare export var StaticRouter: React$ComponentType<{|
+  declare export var StaticRouter: React.ComponentType<{|
     basename?: string,
     location?: string | Location,
     context: StaticRouterContext,
     children?: React$Node
   |}>
 
-  declare export var MemoryRouter: React$ComponentType<{|
+  declare export var MemoryRouter: React.ComponentType<{|
     initialEntries?: Array<LocationShape | string>,
     initialIndex?: number,
     getUserConfirmation?: GetUserConfirmation,
@@ -123,17 +123,17 @@
     children?: React$Node
   |}>
 
-  declare export var Router: React$ComponentType<{|
+  declare export var Router: React.ComponentType<{|
     history: RouterHistory,
     children?: React$Node
   |}>
 
-  declare export var Prompt: React$ComponentType<{|
+  declare export var Prompt: React.ComponentType<{|
     message: string | ((location: Location) => string | boolean),
     when?: boolean
   |}>
 
-  declare export var Redirect: React$ComponentType<{|
+  declare export var Redirect: React.ComponentType<{|
     to: string | LocationShape,
     push?: boolean,
     from?: string,
@@ -141,10 +141,10 @@
     strict?: boolean
   |}>
 
-  declare export var Route: React$ComponentType<{|
-    component?: React$ComponentType<*>,
+  declare export var Route: React.ComponentType<{|
+    component?: React.ComponentType<*>,
     render?: (router: ContextRouter) => React$Node,
-    children?: React$ComponentType<ContextRouter> | React$Node,
+    children?: React.ComponentType<ContextRouter> | React$Node,
     path?: string | Array<string>,
     exact?: boolean,
     strict?: boolean,
@@ -152,14 +152,14 @@
     sensitive?: boolean
   |}>
 
-  declare export var Switch: React$ComponentType<{|
+  declare export var Switch: React.ComponentType<{|
     children?: React$Node,
     location?: Location
   |}>
 
-  declare export function withRouter<Props: {...}, Component: React$ComponentType<Props>>(
+  declare export function withRouter<Props: {...}, Component: React.ComponentType<Props>>(
     WrappedComponent: Component
-  ): React$ComponentType<$Diff<React$ElementConfig<Component>, ContextRouterVoid>>;
+  ): React.ComponentType<$Diff<React$ElementConfig<Component>, ContextRouterVoid>>;
 
   declare type MatchPathOptions = {
     path?: string | string[],
diff --git a/web/flow-typed/npm/react-router_v5.x.x.js b/web/flow-typed/npm/react-router_v5.x.x.js
--- a/web/flow-typed/npm/react-router_v5.x.x.js
+++ b/web/flow-typed/npm/react-router_v5.x.x.js
@@ -2,6 +2,7 @@
 // flow-typed version: 5f4b3cb313/react-router_v5.x.x/flow_>=v0.104.x
 
 declare module "react-router" {
+  import * as React from 'react';
   // NOTE: many of these are re-exported by react-router-dom and
   // react-router-native, so when making changes, please be sure to update those
   // as well.
@@ -65,7 +66,7 @@
 
   declare type StaticRouterContext = { url?: string, ... };
 
-  declare export class StaticRouter extends React$Component<{
+  declare export class StaticRouter extends React.Component<{
     basename?: string,
     location?: string | Location,
     context: StaticRouterContext,
@@ -73,7 +74,7 @@
     ...
   }> {}
 
-  declare export class MemoryRouter extends React$Component<{
+  declare export class MemoryRouter extends React.Component<{
     initialEntries?: Array<LocationShape | string>,
     initialIndex?: number,
     getUserConfirmation?: GetUserConfirmation,
@@ -82,19 +83,19 @@
     ...
   }> {}
 
-  declare export class Router extends React$Component<{
+  declare export class Router extends React.Component<{
     history: RouterHistory,
     children?: React$Node,
     ...
   }> {}
 
-  declare export class Prompt extends React$Component<{
+  declare export class Prompt extends React.Component<{
     message: string | ((location: Location) => string | true),
     when?: boolean,
     ...
   }> {}
 
-  declare export class Redirect extends React$Component<{|
+  declare export class Redirect extends React.Component<{|
     to: string | LocationShape,
     push?: boolean,
     from?: string,
@@ -103,10 +104,10 @@
   |}> {}
 
 
-  declare export class Route extends React$Component<{|
-    component?: React$ComponentType<*>,
+  declare export class Route extends React.Component<{|
+    component?: React.ComponentType<*>,
     render?: (router: ContextRouter) => React$Node,
-    children?: React$ComponentType<ContextRouter> | React$Node,
+    children?: React.ComponentType<ContextRouter> | React$Node,
     path?: string | Array<string>,
     exact?: boolean,
     strict?: boolean,
@@ -114,14 +115,14 @@
     sensitive?: boolean
   |}> {}
 
-  declare export class Switch extends React$Component<{|
+  declare export class Switch extends React.Component<{|
     children?: React$Node,
     location?: Location
   |}> {}
 
   declare export function withRouter<P>(
-    Component: React$ComponentType<{| ...ContextRouter, ...P |}>
-  ): React$ComponentType<P>;
+    Component: React.ComponentType<{| ...ContextRouter, ...P |}>
+  ): React.ComponentType<P>;
 
   declare type MatchPathOptions = {
     path?: string | string[],