Remove more deprecations (#3603)

Author: taion

docs/API.md

@@ -81,10 +81,6 @@ This is primarily for integrating with other libraries that need to participate
 
 Ensure that you render a `<RouterContext>` at the end of the line, passing all the props passed to `render`.
 
-##### `stringifyQuery(queryObject)` (deprecated)
-
-##### `parseQueryString(queryString)` (deprecated)
-
 
 #### Examples
 Please see the [`examples/`](/examples) directory of the repository for extensive examples of using `<Router>`.
@@ -124,12 +120,6 @@ If `true`, the `<Link>` will only be active when the current route exactly match
 ##### *others*
 You can also pass props you'd like to be on the `<a>` such as a `title`, `id`, `className`, etc.
 
-##### `query` **([deprecated](/upgrade-guides/v2.0.0.md#link-to-onenter-and-isactive-use-location-descriptors) see `to`)**
-
-##### `hash` **([deprecated](/upgrade-guides/v2.0.0.md#link-to-onenter-and-isactive-use-location-descriptors) see `to`)**
-
-##### `state` **([deprecated](/upgrade-guides/v2.0.0.md#link-to-onenter-and-isactive-use-location-descriptors) see `to`)**
-
 #### Example
 Given a route like `<Route path="/users/:userId" />`:
 

modules/__tests__/matchRoutes-test.js

@@ -1,7 +1,6 @@
 import expect from 'expect'
 import { createMemoryHistory } from 'history'
 import React from 'react'
-import { canUseMembrane } from '../deprecateObjectProperties'
 import IndexRoute from '../IndexRoute'
 import matchRoutes from '../matchRoutes'
 import Route from '../Route'
@@ -335,13 +334,6 @@ describe('matchRoutes', function () {
           expect(partialNextState.params).toEqual({ groupId: 'foo' })
           expect(partialNextState.location.pathname).toEqual('/foo/users/5')
 
-          // Only the calls below this point should emit deprecation warnings.
-          if (canUseMembrane) {
-            shouldWarn('deprecated')
-          }
-
-          expect(partialNextState.pathname).toEqual('/foo/users/5')
-
           done()
         }
       )
@@ -358,13 +350,6 @@ describe('matchRoutes', function () {
           expect(partialNextState.params).toEqual({ groupId: 'bar' })
           expect(partialNextState.location.pathname).toEqual('/bar/users')
 
-          // Only the calls below this point should emit deprecation warnings.
-          if (canUseMembrane) {
-            shouldWarn('deprecated')
-          }
-
-          expect(partialNextState.pathname).toEqual('/bar/users')
-
           done()
         }
       )

modules/deprecateObjectProperties.js

@@ -1,5 +1,4 @@
 import { loopAsync } from './AsyncUtils'
-import makeStateWithLocation from './makeStateWithLocation'
 import { matchPattern } from './PatternUtils'
 import warning from './routerWarning'
 import { createRoutes } from './RouteUtils'
@@ -19,22 +18,15 @@ function getChildRoutes(route, location, paramNames, paramValues, callback) {
     params: createParams(paramNames, paramValues)
   }
 
-  const partialNextStateWithLocation = makeStateWithLocation(
-    partialNextState, location
-  )
-
-  route.getChildRoutes(
-    partialNextStateWithLocation,
-    function (error, childRoutes) {
-      childRoutes = !error && createRoutes(childRoutes)
-      if (sync) {
-        result = [ error, childRoutes ]
-        return
-      }
-
-      callback(error, childRoutes)
+  route.getChildRoutes(partialNextState, (error, childRoutes) => {
+    childRoutes = !error && createRoutes(childRoutes)
+    if (sync) {
+      result = [ error, childRoutes ]
+      return
     }
-  )
+
+    callback(error, childRoutes)
+  })
 
   sync = false
   return result  // Might be undefined.
@@ -49,16 +41,9 @@ function getIndexRoute(route, location, paramNames, paramValues, callback) {
       params: createParams(paramNames, paramValues)
     }
 
-    const partialNextStateWithLocation = makeStateWithLocation(
-      partialNextState, location
-    )
-
-    route.getIndexRoute(
-      partialNextStateWithLocation,
-      function (error, indexRoute) {
-        callback(error, !error && createRoutes(indexRoute)[0])
-      }
-    )
+    route.getIndexRoute(partialNextState, (error, indexRoute) => {
+      callback(error, !error && createRoutes(indexRoute)[0])
+    })
   } else if (route.childRoutes) {
     const pathless = route.childRoutes.filter(childRoute => !childRoute.path)