Add support for URL objects in Link and Router

lib/link.js

@@ -1,4 +1,4 @@
-import { resolve } from 'url'
+import { resolve, format } from 'url'
 import React, { Component, Children, PropTypes } from 'react'
 import Router from './router'
 import { warn, execOnce, getLocationOrigin } from './utils'
@@ -39,6 +39,11 @@ export default class Link extends Component {
       return
     }
 
+    if (typeof href === 'object') {
+      // format href object to generate url
+      href = format(href)
+    }
+
     const { pathname } = window.location
     href = resolve(pathname, href)
     as = as ? resolve(pathname, as) : href
@@ -97,7 +102,8 @@ export default class Link extends Component {
 
     // If child is an <a> tag and doesn't have a href attribute we specify it so that repetition is not needed by the user
     if (child.type === 'a' && !('href' in child.props)) {
-      props.href = this.props.as || this.props.href
+      props.href = this.props.as ||
+        (typeof this.props.href === 'object' ? format(this.props.href) : this.props.href)
     }
 
     return React.cloneElement(child, props)

lib/router/router.js

@@ -120,11 +120,13 @@ export default class Router extends EventEmitter {
   }
 
   push (url, as = url) {
-    return this.change('pushState', url, as)
+    const formattedUrl = typeof url === 'object' ? format(url) : url
+    return this.change('pushState', formattedUrl, as === url ? formattedUrl : as)
   }
 
   replace (url, as = url) {
-    return this.change('replaceState', url, as)
+    const formattedUrl = typeof url === 'object' ? format(url) : url
+    return this.change('replaceState', formattedUrl, as === url ? formattedUrl : as)
   }
 
   async change (method, url, as) {