Merge pull request #2667 from taion/Link-history-1.15.x

Use history v1.15.x API for createHref

Author: timdorr

modules/Link.js

@@ -19,7 +19,7 @@ function isEmptyObject(object) {
   return true
 }
 
-function createLocation({ to, query, hash, state }) {
+function createLocationDescriptor({ to, query, hash, state }) {
   if (typeof to !== 'object') {
     return { pathname: to, query, hash, state }
   } else {
@@ -96,7 +96,7 @@ const Link = React.createClass({
     if (allowTransition) {
       let { state, to, query, hash } = this.props
 
-      const location = createLocation({ to, query, hash, state })
+      const location = createLocationDescriptor({ to, query, hash, state })
 
       this.context.history.push(location)
     }
@@ -113,9 +113,9 @@ const Link = React.createClass({
     const { history } = this.context
 
     if (history) {
-      const location = createLocation({ to, query, hash, state })
+      const location = createLocationDescriptor({ to, query, hash, state })
 
-      props.href = history.createHref(location, location.query)
+      props.href = history.createHref(location)
 
       if (activeClassName || (activeStyle != null && !isEmptyObject(activeStyle))) {
         if (history.isActive(to, query, onlyActiveOnIndex)) {

package.json

@@ -41,7 +41,7 @@
     "warning": "^2.0.0"
   },
   "peerDependencies": {
-    "history": "^1.14.0"
+    "history": "^1.15.0"
   },
   "devDependencies": {
     "babel": "^5.4.7",
@@ -60,7 +60,7 @@
     "express": "^4.13.3",
     "express-urlrewrite": "^1.2.0",
     "gzip-size": "^3.0.0",
-    "history": "^1.14.0",
+    "history": "^1.15.0",
     "isparta-loader": "^1.0.0",
     "karma": "^0.13.13",
     "karma-browserstack-launcher": "^0.1.4",