Handle trailing slashes in basename

remix-run · Oct 26, 2015 · 1934718 · 1934718
1 parent 8da759f
commit 1934718
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/useBasename.js b/modules/useBasename.js
@@ -29,7 +29,10 @@ function useBasename(createHistory) {
       if (typeof path === 'string')
         path = parsePath(path)
 
-      const pathname = basename + path.pathname
+      const pname = path.pathname
+      const normalizedBasename = basename.slice(-1) === '/' ? basename : basename + '/'
+      const normalizedPathname = pname.charAt(0) === '/' ? pname.slice(1) : pname
+      const pathname = normalizedBasename + normalizedPathname
 
       return {
         ...path,