Smarter stripPrefix

modules/PathUtils.js

@@ -4,8 +4,11 @@ export const addLeadingSlash = (path) =>
 export const stripLeadingSlash = (path) =>
   path.charAt(0) === '/' ? path.substr(1) : path
 
-export const stripPrefix = (path, prefix) =>
-  path.indexOf(prefix) === 0 ? path.substr(prefix.length) : path
+export const hasBasename = (path, prefix) => 
+  (new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i')).test(path)
+
+export const stripBasename = (path, prefix) =>
+  hasBasename(path, prefix) ? path.substr(prefix.length) : path
 
 export const stripTrailingSlash = (path) =>
   path.charAt(path.length - 1) === '/' ? path.slice(0, -1) : path

modules/__tests__/BrowserHistory-test.js

@@ -1,3 +1,4 @@
+import expect from 'expect'
 import createHistory from '../createBrowserHistory'
 import { canUseDOM, supportsHistory } from '../DOMUtils'
 import * as TestSequences from './TestSequences'
@@ -168,4 +169,42 @@ describeHistory('a browser history', () => {
       TestSequences.HashChangeTransitionHook(history, done)
     })
   })
+
+  describe('basename', () => {
+    it('strips the basename from the pathname', () => {
+      window.history.replaceState(null, null, '/prefix/pathname')
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('/pathname')
+    })
+
+    it('is not case-sensitive', () => {
+      window.history.replaceState(null, null, '/PREFIX/pathname')
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('/pathname')
+    })
+
+    it('does not strip partial prefix matches', () => {
+      window.history.replaceState(null, null, '/prefixed/pathname')
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('/prefixed/pathname')
+    })
+
+    it('strips when path is only the prefix', () => {
+      window.history.replaceState(null, null, '/prefix')
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('/')
+    })
+
+    it('strips with no pathname, but with a search string', () => {
+      window.history.replaceState(null, null, '/prefix?a=b')
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('')
+    })
+
+    it('strips with no pathname, but with a hash string', () => {
+      window.history.replaceState(null, null, '/prefix#rest')
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('')
+    })
+  })
 })

modules/__tests__/HashHistory-test.js

@@ -1,3 +1,4 @@
+import expect from 'expect'
 import createHistory from '../createHashHistory'
 import { canUseDOM, supportsGoWithoutReloadUsingHash } from '../DOMUtils'
 import * as TestSequences from './TestSequences'
@@ -208,4 +209,45 @@ describeHistory('a hash history', () => {
       TestSequences.SlashHashPathCoding(history, done)
     })
   })
+
+
+  describe('basename', () => {
+    it('strips the basename from the pathname', () => {
+      window.location.hash = '#/prefix/pathname'
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('/pathname')
+    })
+
+    it('is not case-sensitive', () => {
+      window.location.hash = '#/PREFIX/pathname'
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('/pathname')
+    })
+
+    it('does not strip partial prefix matches', () => {
+      window.location.hash = '#/prefixed/pathname'
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('/prefixed/pathname')
+    })
+
+    it('strips when path is only the prefix', () => {
+      window.location.hash = '#/prefix'
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('/')
+    })
+
+    it('strips with no pathname, but with a search string', () => {
+      window.location.hash = '#/prefix?a=b'
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('')
+    })
+
+    it('strips with no pathname, but with a hash string', () => {
+      console.log('\n\n\n\n\n\n\n\n')
+      window.location.hash = '#/prefix#rest'
+      const history = createHistory({ basename: '/prefix' })
+      expect(history.location.pathname).toEqual('')
+      console.log('\n\n\n\n\n\n\n\n')
+    })
+  })
 })

modules/createBrowserHistory.js

@@ -4,7 +4,8 @@ import { createLocation } from './LocationUtils'
 import {
   addLeadingSlash,
   stripTrailingSlash,
-  stripPrefix,
+  hasBasename,
+  stripBasename,
   parsePath,
   createPath
 } from './PathUtils'
@@ -60,13 +61,13 @@ const createBrowserHistory = (props = {}) => {
     let path = pathname + search + hash
 
     warning(
-      !(basename && path.indexOf(basename) !== 0),
+      !(basename && hasBasename(path, basename)),
       'You are attempting to use a basename on a page whose URL path does not begin ' +
       'with the basename. Expected path "' + path + '" to begin with "' + basename + '".'
     )
 
     if (basename)
-      path = stripPrefix(path, basename)
+      path = stripBasename(path, basename)
 
     return {
       ...parsePath(path),

modules/createHashHistory.js

@@ -5,7 +5,8 @@ import {
   addLeadingSlash,
   stripLeadingSlash,
   stripTrailingSlash,
-  stripPrefix,
+  hasBasename,
+  stripBasename,
   parsePath,
   createPath
 } from './PathUtils'
@@ -75,13 +76,13 @@ const createHashHistory = (props = {}) => {
     let path = decodePath(getHashPath())
 
     warning(
-      !(basename && path.indexOf(basename) !== 0),
+      !(basename && hasBasename(path, basename)),
       'You are attempting to use a basename on a page whose URL path does not begin ' +
       'with the basename. Expected path "' + path + '" to begin with "' + basename + '".'
     )
 
     if (basename)
-      path = stripPrefix(path, basename)
+      path = stripBasename(path, basename)
 
     return parsePath(path)
   }