From 9591a08dfbfc58d009ea0af6cbd34af71b683977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3natan=20N=C3=BA=C3=B1ez?=
 <JoniJnm@users.noreply.github.com>
Date: Thu, 8 Dec 2016 20:24:38 +0100
Subject: [PATCH] fix(router): Use T type in Resolve interface (#13242)

---
 modules/@angular/router/src/interfaces.ts        | 3 +--
 modules/@angular/router/test/integration.spec.ts | 2 +-
 tools/public_api_guard/router/index.d.ts         | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/@angular/router/src/interfaces.ts b/modules/@angular/router/src/interfaces.ts
index 0c5e2d46b4..da35d2d90a 100644
--- a/modules/@angular/router/src/interfaces.ts
+++ b/modules/@angular/router/src/interfaces.ts
@@ -305,8 +305,7 @@ export interface CanDeactivate<T> {
  * @stable
  */
 export interface Resolve<T> {
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
-      Observable<any>|Promise<any>|any;
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<T>|Promise<T>|T;
 }
 
 
diff --git a/modules/@angular/router/test/integration.spec.ts b/modules/@angular/router/test/integration.spec.ts
index 0fb2a569fc..2f78de70ec 100644
--- a/modules/@angular/router/test/integration.spec.ts
+++ b/modules/@angular/router/test/integration.spec.ts
@@ -780,7 +780,7 @@ describe('Integration', () => {
      })));
 
   describe('data', () => {
-    class ResolveSix implements Resolve<TeamCmp> {
+    class ResolveSix implements Resolve<number> {
       resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): number { return 6; }
     }
 
diff --git a/tools/public_api_guard/router/index.d.ts b/tools/public_api_guard/router/index.d.ts
index 2c3ec19ea4..d692a8df74 100644
--- a/tools/public_api_guard/router/index.d.ts
+++ b/tools/public_api_guard/router/index.d.ts
@@ -172,7 +172,7 @@ export declare function provideRoutes(routes: Routes): any;
 
 /** @stable */
 export interface Resolve<T> {
-    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any> | Promise<any> | any;
+    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<T> | Promise<T> | T;
 }
 
 /** @stable */