Fix unintentional regressions from removing extraneous slash support (#8

)

modules/__tests__/_bc-Link-test.js

@@ -57,7 +57,7 @@ describe('v1 Link', function () {
               Michael
             </Link>
             <Link
-              to="/hello/ryan" query={{ the: 'query' }}
+              to="hello/ryan" query={{ the: 'query' }}
               activeClassName="active"
             >
               Ryan

modules/__tests__/serverRendering-test.js

@@ -162,6 +162,16 @@ describe('server rendering', function () {
     })
   })
 
+  it('supports basenames with trailing slash', function (done) {
+    match({ routes, location: '/dashboard', basename: '/nasebame/' }, function (error, redirectLocation, renderProps) {
+      const string = renderToString(
+        <RouterContext {...renderProps} />
+      )
+      expect(string).toMatch(/\/nasebame/)
+      done()
+    })
+  })
+
   describe('server/client consistency', function () {
     // Just render to static markup here to avoid having to normalize markup.
 

modules/isActive.js

@@ -83,6 +83,13 @@ function getMatchingRouteIndex(pathname, activeRoutes, activeParams) {
  * and params.
  */
 function routeIsActive(pathname, routes, params, indexOnly) {
+  // TODO: This is a bit ugly. It keeps around support for treating pathnames
+  // without preceding slashes as absolute paths, but possibly also works
+  // around the same quirks with basenames as in matchRoutes.
+  if (pathname.charAt(0) !== '/') {
+    pathname = `/${pathname}`
+  }
+
   const i = getMatchingRouteIndex(pathname, routes, params)
 
   if (i === null) {

modules/matchRoutes.js

@@ -180,10 +180,23 @@ function matchRouteDeep(
  * Note: This operation may finish synchronously if no routes have an
  * asynchronous getChildRoutes method.
  */
-function matchRoutes(
+export default function matchRoutes(
   routes, location, callback,
-  remainingPathname=location.pathname, paramNames=[], paramValues=[]
+  remainingPathname, paramNames=[], paramValues=[]
 ) {
+  if (remainingPathname === undefined) {
+    // TODO: This is a little bit ugly, but it works around a quirk in history
+    // that strips the leading slash from pathnames when using basenames with
+    // trailing slashes.
+    if (location.pathname.charAt(0) !== '/') {
+      location = {
+        ...location,
+        pathname: `/${location.pathname}`
+      }
+    }
+    remainingPathname = location.pathname
+  }
+
   loopAsync(routes.length, function (index, next, done) {
     matchRouteDeep(
       routes[index], location, remainingPathname, paramNames, paramValues,
@@ -197,5 +210,3 @@ function matchRoutes(
     )
   }, callback)
 }
-
-export default matchRoutes