From 2bd3a6e0d13f0f1e560b2f9f242bb3776d18a2c2 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 10 Nov 2016 14:27:46 +0000
Subject: [PATCH] update 1-to-2-providers

---
 .../_examples/upgrade-adapter/e2e-spec.ts     |  3 +-
 .../ts/app/1-to-2-providers/app.module.ts     | 44 ++++++++++++++-----
 .../app/1-to-2-providers/upgrade_adapter.ts   | 19 --------
 3 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/upgrade_adapter.ts

diff --git a/public/docs/_examples/upgrade-adapter/e2e-spec.ts b/public/docs/_examples/upgrade-adapter/e2e-spec.ts
index bfc953952e..61dad44e0b 100644
--- a/public/docs/_examples/upgrade-adapter/e2e-spec.ts
+++ b/public/docs/_examples/upgrade-adapter/e2e-spec.ts
@@ -145,9 +145,8 @@ describe('Upgrade Tests', function () {
   describe('Upgrading NG1 Providers', function() {
 
     beforeAll(function () {
+      setProtractorToHybridMode();
       browser.get('/index-1-to-2-providers.html');
-      setProtractorToNg1Mode();
-      waitForNg1AsyncBootstrap();
     });
 
     it('works', function () {
diff --git a/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/app.module.ts
index 7ae5fd331d..e1ef0a7ea4 100644
--- a/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/app.module.ts
+++ b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/app.module.ts
@@ -1,21 +1,41 @@
+declare var angular: any;
+import { NgModule } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { BrowserModule } from '@angular/platform-browser';
+import { UpgradeModule, downgradeComponent } from '@angular/upgrade/static';
+
 import { HeroDetailComponent } from './hero-detail.component';
 import { HeroesService } from './heroes.service';
-import { upgradeAdapter } from './upgrade_adapter';
-
-declare var angular: any;
 
 // #docregion register
+@NgModule({
+  imports: [
+    BrowserModule,
+    UpgradeModule
+  ],
+  providers: [{
+    provide: 'heroes',
+    useFactory: (i: any) => i.get('heroes'),
+    deps: ['$injector']
+  }],
+  declarations: [
+    HeroDetailComponent
+  ],
+  entryComponents: [
+    HeroDetailComponent
+  ]
+})
+export class AppModule {
+  ngDoBootstrap() {}
+}
+
 angular.module('heroApp', [])
   .service('heroes', HeroesService)
-  .directive('heroDetail',
-    upgradeAdapter.downgradeNg2Component(HeroDetailComponent));
-
-upgradeAdapter.upgradeNg1Provider('heroes');
+  .directive('heroDetail', downgradeComponent({component: HeroDetailComponent}));
 
 // #enddocregion register
 
-upgradeAdapter.bootstrap(
-  document.querySelector('hero-app'),
-  ['heroApp'],
-  {strictDi: true}
-);
+platformBrowserDynamic().bootstrapModule(AppModule).then(platformRef => {
+  let upgrade = platformRef.injector.get(UpgradeModule);
+  upgrade.bootstrap(document.body, ['heroApp'], {strictDi: true});
+});
diff --git a/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/upgrade_adapter.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/upgrade_adapter.ts
deleted file mode 100644
index c98ab182a8..0000000000
--- a/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/upgrade_adapter.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-
-import { HeroDetailComponent } from './hero-detail.component';
-
-@NgModule({
-  imports: [ BrowserModule ],
-  declarations: [ HeroDetailComponent ]
-})
-export class AppModule {}
-
-angular.module('heroApp', [])
-  .controller('MainCtrl', function() {
-    this.message = 'Hello world';
-  });
-
-// #docregion
-import { UpgradeAdapter } from '@angular/upgrade';
-export const upgradeAdapter = new UpgradeAdapter(AppModule);