From 1f96a93f5918dc008a1c9de66e9c4266e9ebe548 Mon Sep 17 00:00:00 2001
From: Peter Bacon Darwin <pete@bacondarwin.com>
Date: Wed, 9 Nov 2016 14:37:20 +0000
Subject: [PATCH] chore(public_api): remove Angular 1 types from upgrade/static
 API

---
 .../upgrade/src/aot/downgrade_component.ts         |  9 ++++++---
 modules/@angular/upgrade/src/aot/upgrade_module.ts |  5 +++--
 tools/public_api_guard/upgrade/static.d.ts         | 14 ++++++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/modules/@angular/upgrade/src/aot/downgrade_component.ts b/modules/@angular/upgrade/src/aot/downgrade_component.ts
index b79684ca26..590bb06dcf 100644
--- a/modules/@angular/upgrade/src/aot/downgrade_component.ts
+++ b/modules/@angular/upgrade/src/aot/downgrade_component.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentFactory, ComponentFactoryResolver, Injector} from '@angular/core';
+import {ComponentFactory, ComponentFactoryResolver, Injector, Type} from '@angular/core';
 
 import * as angular from '../angular_js';
 
-import {ComponentInfo} from './component_info';
 import {$INJECTOR, $PARSE, INJECTOR_KEY} from './constants';
 import {DowngradeComponentAdapter} from './downgrade_component_adapter';
 
@@ -19,7 +18,11 @@ let downgradeCount = 0;
 /**
  * @experimental
  */
-export function downgradeComponent(info: ComponentInfo): angular.IInjectable {
+export function downgradeComponent(info: /* ComponentInfo */ {
+  component: Type<any>;
+  inputs?: string[];
+  outputs?: string[];
+}): any /* angular.IInjectable */ {
   const idPrefix = `NG2_UPGRADE_${downgradeCount++}_`;
   let idCount = 0;
 
diff --git a/modules/@angular/upgrade/src/aot/upgrade_module.ts b/modules/@angular/upgrade/src/aot/upgrade_module.ts
index a22af71930..cf9744e42e 100644
--- a/modules/@angular/upgrade/src/aot/upgrade_module.ts
+++ b/modules/@angular/upgrade/src/aot/upgrade_module.ts
@@ -23,7 +23,7 @@ import {$$TESTABILITY, $DELEGATE, $INJECTOR, $PROVIDE, $ROOT_SCOPE, INJECTOR_KEY
  */
 @NgModule({providers: angular1Providers})
 export class UpgradeModule {
-  public $injector: angular.IInjectorService;
+  public $injector: any /*angular.IInjectorService*/;
 
   constructor(public injector: Injector, public ngZone: NgZone) {}
 
@@ -33,7 +33,8 @@ export class UpgradeModule {
    * @param [modules] the Angular 1 modules to bootstrap for this application
    * @param [config] optional extra Angular 1 bootstrap configuration
    */
-  bootstrap(element: Element, modules: string[] = [], config?: angular.IAngularBootstrapConfig) {
+  bootstrap(
+      element: Element, modules: string[] = [], config?: any /*angular.IAngularBootstrapConfig*/) {
     // Create an ng1 module to bootstrap
     const upgradeModule =
         angular
diff --git a/tools/public_api_guard/upgrade/static.d.ts b/tools/public_api_guard/upgrade/static.d.ts
index 3afecf1bd3..0306e068b4 100644
--- a/tools/public_api_guard/upgrade/static.d.ts
+++ b/tools/public_api_guard/upgrade/static.d.ts
@@ -1,5 +1,9 @@
 /** @experimental */
-export declare function downgradeComponent(info: ComponentInfo): angular.IInjectable;
+export declare function downgradeComponent(info: {
+    component: Type<any>;
+    inputs?: string[];
+    outputs?: string[];
+}): any;
 
 /** @experimental */
 export declare function downgradeInjectable(token: any): (string | ((i: Injector) => any))[];
@@ -15,9 +19,11 @@ export declare class UpgradeComponent implements OnInit, OnChanges, DoCheck, OnD
 
 /** @experimental */
 export declare class UpgradeModule {
-    $injector: angular.IInjectorService;
+    $injector: any;
     injector: Injector;
     ngZone: NgZone;
-    constructor(injector: Injector, ngZone: NgZone);
-    bootstrap(element: Element, modules?: string[], config?: angular.IAngularBootstrapConfig): void;
+    constructor(
+        injector: Injector,
+        ngZone: NgZone);
+    bootstrap(element: Element, modules?: string[], config?: any): void;
 }