Add basename support to match

Author: mjackson

modules/match.js

@@ -1,19 +1,43 @@
-import createHistory from 'history/lib/createMemoryHistory'
+import invariant from 'invariant'
+import createMemoryHistory from 'history/lib/createMemoryHistory'
+import useBasename from 'history/lib/useBasename'
 import { createRoutes } from './RouteUtils'
 import useRoutes from './useRoutes'
 
+const createHistory = useRoutes(useBasename(createMemoryHistory))
+
+/**
+ * A high-level API to be used for server-side rendering.
+ *
+ * This function matches a location to a set of routes and calls
+ * callback(error, redirectLocation, renderProps) when finished.
+ *
+ * Note: You probably don't want to use this in a browser. Use
+ * the history.listen API instead.
+ */
 function match({
   routes,
   location,
   parseQueryString,
-  stringifyQuery
+  stringifyQuery,
+  basename
 }, callback) {
-  let history = useRoutes(createHistory)({
+  invariant(
+    location,
+    'match needs a location'
+  )
+
+  const history = createHistory({
     routes: createRoutes(routes),
     parseQueryString,
-    stringifyQuery
+    stringifyQuery,
+    basename
   })
 
+  // Allow match({ location: '/the/path', ... })
+  if (typeof location === 'string')
+    location = history.createLocation(location)
+
   history.match(location, function (error, redirectLocation, nextState) {
     callback(error, redirectLocation, nextState && { ...nextState, history })
   })

modules/useRoutes.js

@@ -49,10 +49,6 @@ function useRoutes(createHistory) {
         // Continue from where we left off.
         finishMatch(partialNextState, callback)
       } else {
-        // Allow match(path)
-        if (typeof location === 'string')
-          location = history.createLocation(location)
-
         matchRoutes(routes, location, function (error, nextState) {
           if (error) {
             callback(error)