Fix repeating hash

doasync · Sep 22, 2020 · 485129d · 485129d
1 parent c2efcde
commit 485129d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/route.ts b/src/route.ts
@@ -35,7 +35,7 @@ export const compileRoute = <
 
   const pathname = createCompile<P>(route.config.path, options)(params);
   const search = queryString ? `?${queryString}` : '';
-  const hashSign = !hash || hash.startsWith('#') ? '' : `#${hash}`;
+  const hashSign = !hash || hash.startsWith('#') ? '' : `#`;
   return `${pathname}${search}${hashSign}${hash ?? ''}`;
 };
 

diff --git a/src/router.ts b/src/router.ts
@@ -7,6 +7,7 @@ import {
   Update,
 } from 'history';
 
+import { createMergedRoute, createRoute } from './route';
 import {
   Delta,
   MergedRoute,
@@ -24,7 +25,6 @@ import {
   historyChanger,
   reduceStore,
 } from './utils';
-import { createRoute, createMergedRoute } from './route';
 
 export const createRouter = <Q extends Query = Query, S extends State = State>({
   history: userHistory,
@@ -102,7 +102,7 @@ export const createRouter = <Q extends Query = Query, S extends State = State>({
     ): Route<P, Router<Q, S>> => {
       const routeConfig =
         typeof pathConfig === 'string' ? { path: pathConfig } : pathConfig;
-      // @ts-ignore
+      // @ts-expect-error
       const route = createRoute<P, Router<Q, S>>(router, routeConfig);
       connectRoute(route);
       return route;