Merge pull request #485 from jeffreypriebe/bugfix/fix-basename-match-…

…warning Fix logic bug when displaying history basename warning messages
remix-run · Jun 13, 2017 · 2e50334 · 2e50334
2 parents 4aeb669 + 93992e8
commit 2e50334
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/createBrowserHistory.js b/modules/createBrowserHistory.js
@@ -60,7 +60,7 @@ const createBrowserHistory = (props = {}) => {
     let path = pathname + search + hash
 
     warning(
-      !(basename && hasBasename(path, basename)),
+      (!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 + '".'
     )

diff --git a/modules/createHashHistory.js b/modules/createHashHistory.js
@@ -75,7 +75,7 @@ const createHashHistory = (props = {}) => {
     let path = decodePath(getHashPath())
 
     warning(
-      !(basename && hasBasename(path, basename)),
+      (!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 + '".'
     )