diff --git a/modules/@angular/upgrade/src/upgrade_adapter.ts b/modules/@angular/upgrade/src/upgrade_adapter.ts index 664d83fa9a..497ca9a314 100644 --- a/modules/@angular/upgrade/src/upgrade_adapter.ts +++ b/modules/@angular/upgrade/src/upgrade_adapter.ts @@ -450,49 +450,6 @@ export class UpgradeAdapter { return upgrade; } - /** - * Adds a provider to the top level environment of a hybrid AngularJS v1 / Angular v2 application. - * - * In hybrid AngularJS v1 / Angular v2 application, there is no one root Angular v2 component, - * for this reason we provide an application global way of registering providers which is - * consistent with single global injection in AngularJS v1. - * - * ### Example - * - * ``` - * class Greeter { - * greet(name) { - * alert('Hello ' + name + '!'); - * } - * } - * - * @Component({ - * selector: 'app', - * template: '' - * }) - * class App { - * constructor(greeter: Greeter) { - * this.greeter('World'); - * } - * } - * - * var adapter = new UpgradeAdapter(); - * adapter.addProvider(Greeter); - * - * var module = angular.module('myExample', []); - * module.directive('app', adapter.downgradeNg2Component(App)); - * - * document.body.innerHTML = '' - * adapter.bootstrap(document.body, ['myExample']); - *``` - * - * @deprecated Use NgModules and `new UpgradeAdapter(ng2AppModule)` to configure top-level - *providers - */ - public addProvider(provider: Type|Provider|any[]|any): void { - this.providers.push(provider); - } - /** * Allows AngularJS v1 service to be accessible from Angular v2. * diff --git a/modules/@angular/upgrade/test/upgrade_spec.ts b/modules/@angular/upgrade/test/upgrade_spec.ts index 537ee03c90..3163b4f35a 100644 --- a/modules/@angular/upgrade/test/upgrade_spec.ts +++ b/modules/@angular/upgrade/test/upgrade_spec.ts @@ -836,16 +836,18 @@ export function main() { describe('injection', () => { function SomeToken() {} - it('should export ng2 instance to ng1', - inject([AsyncTestCompleter], (async: AsyncTestCompleter) => { - var adapter = new UpgradeAdapter(); + it('should export ng2 instance to ng1', async(() => { + var MyModule = NgModule({ + providers: [{provide: SomeToken, useValue: 'correct_value'}], + imports: [BrowserModule] + }).Class({constructor: function() {}}); + + var adapter = new UpgradeAdapter(MyModule); var module = angular.module('myExample', []); - adapter.addProvider({provide: SomeToken, useValue: 'correct_value'}); module.factory('someToken', adapter.downgradeNg2Provider(SomeToken)); adapter.bootstrap(html('
'), ['myExample']).ready((ref) => { expect(ref.ng1Injector.get('someToken')).toBe('correct_value'); ref.dispose(); - async.done(); }); })); diff --git a/tools/public_api_guard/upgrade/index.d.ts b/tools/public_api_guard/upgrade/index.d.ts index 0bf4405423..ed3f3be1c9 100644 --- a/tools/public_api_guard/upgrade/index.d.ts +++ b/tools/public_api_guard/upgrade/index.d.ts @@ -1,7 +1,6 @@ /** @experimental */ export declare class UpgradeAdapter { constructor(ng2AppModule?: Type); - /** @deprecated */ addProvider(provider: Type | Provider | any[] | any): void; bootstrap(element: Element, modules?: any[], config?: angular.IAngularBootstrapConfig): UpgradeAdapterRef; downgradeNg2Component(type: Type): Function; downgradeNg2Provider(token: any): Function;