Merge pull request #3054 from rackt/server-basename

Add back basename support in match()

modules/__tests__/serverRendering-test.js

@@ -152,6 +152,16 @@ describe('server rendering', function () {
     })
   })
 
+  it('accepts a basename option', 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/createMemoryHistory.js

@@ -1,4 +1,5 @@
 import useQueries from 'history/lib/useQueries'
+import useBasename from 'history/lib/useBasename'
 import baseCreateMemoryHistory from 'history/lib/createMemoryHistory'
 
 export default function createMemoryHistory(options) {
@@ -7,7 +8,7 @@ export default function createMemoryHistory(options) {
   // `useQueries` doesn't understand the signature
   const memoryHistory = baseCreateMemoryHistory(options)
   const createHistory = () => memoryHistory
-  const history = useQueries(createHistory)(options)
+  const history = useQueries(useBasename(createHistory))(options)
   history.__v2_compatible__ = true
   return history
 }