feat(router): consolidate / for "hash and pushstate"

aurelia · Aug 25, 2019 · 6492182 · 6492182
1 parent dbf5449
commit 6492182
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/router/src/browser-navigator.ts b/packages/router/src/browser-navigator.ts
@@ -89,13 +89,13 @@ export class BrowserNavigator implements INavigatorStore, INavigatorViewer {
 
   public pushNavigatorState(state: INavigatorState): Promise<void> {
     const { title, path } = state.currentEntry;
-    const fragment = this.options.useBrowserFragmentHash ? '#' : '';
+    const fragment = this.options.useBrowserFragmentHash ? '#/' : '';
     return this.enqueue(this.history, 'pushState', [state, title, `${fragment}${path}`]);
   }
 
   public replaceNavigatorState(state: INavigatorState): Promise<void> {
     const { title, path } = state.currentEntry;
-    const fragment = this.options.useBrowserFragmentHash ? '#' : '';
+    const fragment = this.options.useBrowserFragmentHash ? '#/' : '';
     return this.enqueue(this.history, 'replaceState', [state, title, `${fragment}${path}`]);
   }
 

diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
@@ -219,6 +219,10 @@ export class Router implements IRouter {
         // TODO: Don't go via string here, use instructions as they are
         path = Array.isArray(routeOrInstructions) ? this.instructionResolver.stringifyViewportInstructions(routeOrInstructions) : routeOrInstructions;
       }
+      // TODO: Review this
+      if (path === '/') {
+        path = '';
+      }
 
       // TODO: Clean up clear viewports
       const { clear, newPath } = this.instructionResolver.shouldClearViewports(path);