fix: Router#resolve typings (#891)

vaadin · Oct 9, 2024 · 1c559fb · 1c559fb
1 parent 78ff48b
commit 1c559fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/router.ts b/src/router.ts
@@ -699,7 +699,9 @@ export class Router<R extends AnyObject = EmptyObject, C extends AnyObject = Emp
     return context.__renderId === this.#lastStartedRenderId;
   }
 
-  declare ['resolve']: (context: RouteContext<R, C>) => Promise<RouteContext<R, C> & RedirectContextInfo>;
+  declare ['resolve']: (
+    contextOrPathname: RouteContext<R, C> | string,
+  ) => Promise<RouteContext<R, C> & RedirectContextInfo>;
 
   async #redirect(
     redirectData: RedirectContextInfo,

diff --git a/src/triggers/popstate.ts b/src/triggers/popstate.ts
@@ -1,5 +1,5 @@
-import { fireRouterEvent } from '../utils.js';
 import type { NavigationTrigger } from '../types.js';
+import { fireRouterEvent } from '../utils.js';
 
 function vaadinRouterGlobalPopstateHandler(event: PopStateEvent) {
   if (event.state === 'vaadin-router-ignore') {