Merge pull request #613 from bigopon/fix-build

fix(typings): Revert aliasing interface
aurelia · Aug 7, 2018 · 8f97f35 · 8f97f35
2 parents ddb9be1 + 2816647
commit 8f97f35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/interfaces.js b/src/interfaces.js
@@ -212,8 +212,3 @@ interface PipelineResult {
   output: any;
   completed: boolean;
 }
-
-/**
-* The result of a router navigation.
-*/
-export type NavigationResult = Promise<PipelineResult | boolean>;
diff --git a/src/router.js b/src/router.js
@@ -10,7 +10,7 @@ import {
   _createRootedPath,
   _resolveUrl
 } from './util';
-import {RouteConfig, NavigationResult} from './interfaces';
+import {RouteConfig, PipelineResult} from './interfaces';
 
 /**
 * The primary class responsible for handling routing and navigation.
@@ -218,7 +218,7 @@ export class Router {
   * @param fragment The URL fragment to use as the navigation destination.
   * @param options The navigation options.
   */
-  navigate(fragment: string, options?: NavigationOptions): NavigationResult {
+  navigate(fragment: string, options?: NavigationOptions): Promise<PipelineResult | boolean> {
     if (!this.isConfigured && this.parent) {
       return this.parent.navigate(fragment, options);
     }
@@ -235,7 +235,7 @@ export class Router {
   * @param params The route parameters to be used when populating the route pattern.
   * @param options The navigation options.
   */
-  navigateToRoute(route: string, params?: any, options?: NavigationOptions): NavigationResult {
+  navigateToRoute(route: string, params?: any, options?: NavigationOptions): Promise<PipelineResult | boolean> {
     let path = this.generate(route, params);
     return this.navigate(path, options);
   }