[state-router] Import * triggers a deprecation warning, so use import…

… type instead
sanity-io · Sep 14, 2017 · 37b8951 · 37b8951
1 parent 34cdb2e
commit 37b8951
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/packages/@sanity/state-router/src/components/IntentLink.js b/packages/@sanity/state-router/src/components/IntentLink.js
@@ -1,5 +1,6 @@
 // @flow
-import * as React from 'react'
+import React from 'react'
+import type {Node} from 'react'
 import Link from './Link'
 import type {RouterProviderContext} from './types'
 import internalRouterContextTypeCheck from './internalRouterContextTypeCheck'
@@ -8,7 +9,7 @@ export default class IntentLink extends React.PureComponent<*, *> {
   props: {
     intent: string,
     params?: Object,
-    children: React.Node,
+    children: Node,
     className: string
   };
 

diff --git a/packages/@sanity/state-router/src/components/Link.js b/packages/@sanity/state-router/src/components/Link.js
@@ -1,5 +1,5 @@
 // @flow
-import * as React from 'react'
+import React from 'react'
 import {omit} from 'lodash'
 import type {RouterProviderContext} from './types'
 import internalRouterContextTypeCheck from './internalRouterContextTypeCheck'

diff --git a/packages/@sanity/state-router/src/components/RouteScope.js b/packages/@sanity/state-router/src/components/RouteScope.js
@@ -1,8 +1,9 @@
 // @flow
 import PropTypes from 'prop-types'
-import * as React from 'react'
+import React from 'react'
 import isEmpty from '../utils/isEmpty'
 
+import type {Node} from 'react'
 import type {RouterProviderContext, NavigateOptions, InternalRouter} from './types'
 
 function addScope(routerState: Object, scope: string, scopedState: Object) {
@@ -14,7 +15,7 @@ function addScope(routerState: Object, scope: string, scopedState: Object) {
 
 type Props = {
   scope: string,
-  children: React.Node
+  children: Node
 }
 
 export default class RouteScope extends React.Component<*, *> {

diff --git a/packages/@sanity/state-router/src/components/RouterProvider.js b/packages/@sanity/state-router/src/components/RouterProvider.js
@@ -1,15 +1,16 @@
 // @flow
-import * as React from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
+import pubsub from 'nano-pubsub'
+import type {Node} from 'react'
 import type {Router} from '../types'
 import type {RouterProviderContext, NavigateOptions, InternalRouter, RouterState} from './types'
-import pubsub from 'nano-pubsub'
 
 type Props = {
   onNavigate: (nextPath: string, options?: NavigateOptions) => void,
   router: Router,
   state: RouterState,
-  children: React.Node
+  children: Node
 }
 
 export default class RouterProvider extends React.Component<*, *> {

diff --git a/packages/@sanity/state-router/src/components/WithRouter.js b/packages/@sanity/state-router/src/components/WithRouter.js
@@ -1,11 +1,12 @@
 // @flow
-import * as React from 'react'
-import type {Router} from './types'
+import React from 'react'
 import withRouterHOC from './withRouterHOC'
+import type {Router} from './types'
+import type {Node} from 'react'
 
 type Props = {
   router: Router,
-  children: (Router) => React.Node
+  children: (Router) => Node
 }
 
 const WithRouter = withRouterHOC((props: Props) => props.children(props.router))

diff --git a/packages/@sanity/state-router/src/components/withRouterHOC.js b/packages/@sanity/state-router/src/components/withRouterHOC.js
@@ -1,7 +1,8 @@
 // @flow
-import * as React from 'react'
-import type {Router, InternalRouter} from './types'
+import React from 'react'
 import internalRouterContextTypeCheck from './internalRouterContextTypeCheck'
+import type {Router, InternalRouter} from './types'
+import type {ComponentType} from 'react'
 
 type State = {
   routerState: Object
@@ -17,7 +18,7 @@ const NO_CONTEXT_STATE = {
   }
 }
 
-export default function withRouter<Props: {}>(Component: React.ComponentType<{ router: Router } & Props>): React.ComponentType<Props> {
+export default function withRouter<Props: {}>(Component: ComponentType<{ router: Router } & Props>): ComponentType<Props> {
 
   return class extends React.Component<*, *> {
     static displayName = `withRouter(${Component.displayName || Component.name})`