add location support

Author: olegman

src/index.ts

@@ -7,4 +7,14 @@ import Redirect from './redirect';
 import PlaceHolder from './placeholder';
 import { RouterError, Context } from 'router-async';
 
-export { Router, Route, Link, RootRoute, Middleware, Redirect, PlaceHolder, RouterError, Context };
+export {
+    Router,
+    Route,
+    Link,
+    RootRoute,
+    Middleware,
+    Redirect,
+    PlaceHolder,
+    RouterError,
+    Context
+};

src/router.tsx

@@ -32,25 +32,26 @@ export default class Router extends React.Component<Props, State> {
     private history: any;
     private unlistenHistroy: any;
     private subscriber: any;
-    private location: any;
+
     constructor(props) {
         super();
         this.state = {
             Component: props.Component,
             props: props.props
         };
 
-        this.location = props.history.location;
         this.router = props.router;
         this.history = props.history;
         this.subscriber = null;
     }
     static async init({ path, routes, hooks, silent = false, ctx = new Context() }) {
         const plainRoutes = Router.buildRoutes(routes);
         const router = new RouterAsync({ routes: plainRoutes, hooks });
-        const { route, status, params, redirect, result } = await router.run({ path, ctx, silent });
+        const { location, route, status, params, redirect, result } = await router.run({ path, ctx, silent });
+
         let props = {
             path,
+            location,
             route,
             status,
             params,
@@ -133,18 +134,18 @@ export default class Router extends React.Component<Props, State> {
     go(n) {
         this.history.go(n);
     }
-    private _locationChanged = async (location, action) => {
+    private _locationChanged = async ({ pathname }) => {
         try {
-            const { path, route, status, params, redirect, result, ctx } = await this.router.run({ path: location.pathname });
+            const { path, location, route, status, params, redirect, result, ctx } = await this.router.run({ path: pathname });
             let props = {
                 path,
+                location,
                 route,
                 status,
                 params,
                 redirect,
                 ctx
             };
-            this.location = location;
             let renderCallback = Router.makeCallback(this.router, { path, route, status, params, redirect, result, ctx });
             this.changeComponent(result, props, renderCallback);
         } catch (error) {

yarn.lock

@@ -17,24 +17,19 @@ encoding@^0.1.11:
     iconv-lite "~0.4.13"
 
 fbjs@^0.8.4:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.5.tgz#f69ba8a876096cb1b9bffe4d7c1e71c19d39d008"
+  version "0.8.6"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.6.tgz#7eb67d6986b2d5007a9b6e92e0e7cb6f75cad290"
   dependencies:
     core-js "^1.0.0"
-    immutable "^3.7.6"
     isomorphic-fetch "^2.1.1"
     loose-envify "^1.0.0"
     object-assign "^4.1.0"
     promise "^7.1.1"
     ua-parser-js "^0.7.9"
 
 iconv-lite@~0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-
-immutable@^3.7.6:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
 is-stream@^1.0.1:
   version "1.1.0"
@@ -51,15 +46,15 @@ isomorphic-fetch@^2.1.1:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
 
-js-tokens@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-1.0.3.tgz#14e56eb68c8f1a92c43d59f5014ec29dc20f2ae1"
+js-tokens@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5"
 
 loose-envify@^1.0.0, loose-envify@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.2.0.tgz#69a65aad3de542cf4ee0f4fe74e8e33c709ccb0f"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.0.tgz#6b26248c42f6d4fa4b0d8542f78edfcde35642a8"
   dependencies:
-    js-tokens "^1.0.1"
+    js-tokens "^2.0.0"
 
 node-fetch@^1.0.1:
   version "1.6.3"
@@ -73,8 +68,8 @@ object-assign@^4.1.0:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
 
 path-to-regexp@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.6.0.tgz#4c59cfeab5e360a2657b180730a4bb4582ecec5b"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
   dependencies:
     isarray "0.0.1"
 
@@ -84,28 +79,40 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+query-string@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.2.3.tgz#9f27273d207a25a8ee4c7b8c74dcd45d556db822"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
 [email protected]:
-  version "15.3.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-15.3.2.tgz#a7bccd2fee8af126b0317e222c28d1d54528d09e"
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.4.1.tgz#498e918602677a3983cd0fd206dfe700389a0dd6"
   dependencies:
     fbjs "^0.8.4"
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
-router-async:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/router-async/-/router-async-0.2.1.tgz#33b47110410b62068d79db84ad83423280ab3208"
+router-async@0.2.x:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/router-async/-/router-async-0.2.2.tgz#7816d1c60e79bb43454f02bad73ffc925e2fbf69"
   dependencies:
     path-to-regexp "^1.6.0"
+    query-string "^4.2.3"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
 typescript@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.4.tgz#b53b69fb841126acb1dd4b397d21daba87572251"
 
 ua-parser-js@^0.7.9:
-  version "0.7.10"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.10.tgz#917559ddcce07cbc09ece7d80495e4c268f4ef9f"
+  version "0.7.12"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
 
 whatwg-fetch@>=0.10.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.0.0.tgz#01c2ac4df40e236aaa18480e3be74bd5c8eb798e"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.1.tgz#078b9461bbe91cea73cbce8bb122a05f9e92b772"