Merge remote-tracking branch 'origin/master'

Author: olegman

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-async",
-  "version": "0.6.20",
+  "version": "0.6.22",
   "author": {
     "name": "Oleg Martynov",
     "email": "[email protected]"
@@ -16,8 +16,8 @@
     "url": "https://github.com/router-async/react-router-async.git"
   },
   "license": "MIT",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "main": "index.js",
+  "typings": "index.d.ts",
   "scripts": {
     "clean": "rm -rf lib",
     "watch": "yarn run clean && tsc -p . --watch",

src/browser-router.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as PropTypes from 'prop-types';
 import Router, { initParams, initResult } from './router';
 import { Context, stringifyQuery } from 'router-async';
 import * as serialize from 'serialize-javascript';
@@ -32,14 +31,6 @@ export default class BrowserRouter extends Router {
             Router: BrowserRouter
         };
     }
-    static childContextTypes = {
-        router: PropTypes.object
-    };
-    getChildContext() {
-        return {
-            router: this
-        };
-    }
     async navigate(path, ctx = new Context()) {
         // if (this.router.isRunning) this.router.cancel(false);
         const { redirect, error } = await this.router.resolve({ path, ctx });

src/router.tsx

@@ -1,5 +1,6 @@
-import { Router as RouterAsync, Context } from 'router-async';
 import * as React from 'react';
+import * as PropTypes from 'prop-types';
+import { Router as RouterAsync, Context } from 'router-async';
 import { deepMap } from './helpers';
 
 export interface Props {
@@ -19,7 +20,7 @@ export interface State {
 export interface Action {
     (): React.ReactElement<Props>;
 }
-interface Childs {
+export interface Childs {
     [index: number]: Route;
 }
 export interface Route {
@@ -48,6 +49,9 @@ export interface initResult {
     componentProps?: any,
     callback?: any
 }
+export interface childContext {
+    router: PropTypes.object
+}
 
 export default class Router extends React.Component<Props, State> {
     router: any;
@@ -170,4 +174,12 @@ export default class Router extends React.Component<Props, State> {
     getState() {
         return this.state;
     }
+    static childContextTypes: childContext = {
+        router: PropTypes.object
+    }
+    getChildContext(): childContext {
+        return {
+            router: this
+        };
+    }
 }

src/server-router.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as PropTypes from 'prop-types';
 import Router, { initParams, initResult } from './router';
 import * as serialize from 'serialize-javascript';
 
@@ -11,14 +10,6 @@ export default class ServerRouter extends Router {
             Router: ServerRouter
         };
     }
-    static childContextTypes = {
-        router: PropTypes.object
-    };
-    getChildContext() {
-        return {
-            router: this
-        };
-    }
     render() {
         return (
             <div>

tsconfig.json

@@ -3,7 +3,7 @@
     "target": "es5",
     "module": "commonjs",
     "outDir": "./lib",
-//    "declaration": true,
+    "declaration": true,
     "jsx": "react"
   },
   "include": [