fix(ng upgrade): do not compile ng2 components until after ng1 bootstrap (#10084)

Closes #9407 and angular/protractor#2944
2016-07-25 21:14:35 -07:00
parent d15a1d64e1
commit 9edea0b139
2 changed files with 16 additions and 11 deletions
--- a/modules/@angular/upgrade/src/upgrade_adapter.ts
+++ b/modules/@angular/upgrade/src/upgrade_adapter.ts
@ -383,11 +383,8 @@ export class UpgradeAdapter {
      }
    });

-    Promise
-        .all([
-          this.compileNg2Components(compiler, componentFactoryRefMap), ng1BootstrapPromise,
-          ng1compilePromise
-        ])
+    Promise.all([ng1BootstrapPromise, ng1compilePromise])
+        .then(() => { return this.compileNg2Components(compiler, componentFactoryRefMap); })
        .then(() => {
          ngZone.run(() => {
            if (rootScopePrototype) {