docs: add changelog for 5.0.2

Using `display: none` on the `<h1>` causes `innerText` to not work as expected
and include the icon ligature (`link`) in the title. This caused the window
title on the angular.io Home page to appear as "Angular - link".
This commit fixes it by not generating anchors at all for headings with the
`no-anchor` class.

Fixes #20427

PR Close #20440

.bazelrc

@@ -0,0 +1,18 @@
+# Make compilation fast, by keeping a few copies of the compilers
+# running as daemons, and cache SourceFile AST's to reduce parse time.
+build --strategy=TypeScriptCompile=worker
+build --strategy=AngularTemplateCompile=worker
+
+# Don't create bazel-* symlinks in the WORKSPACE directory.
+# These require .gitignore and may scare users.
+# Also, it's a workaround for https://github.com/bazelbuild/rules_typescript/issues/12
+# which affects the common case of having `tsconfig.json` in the WORKSPACE directory.
+#
+# Instead, you should run `bazel info bazel-bin` to find out where the outputs went.
+build --symlink_prefix=/
+
+# Performance: avoid stat'ing input files
+build --watchfs
+
+# Don't print all the .d.ts output locations after builds
+build --show_result=0

CHANGELOG.md

@@ -1,22 +1,3 @@
-<a name="5.1.0-beta.1"></a>
-# [5.1.0-beta.1](https://github.com/angular/angular/compare/5.1.0-beta.0...5.1.0-beta.1) (2017-11-16)
-
-
-### Bug Fixes
-
-* **animations:** always fire inner trigger callbacks even if blocked by parent animations ([#19753](https://github.com/angular/angular/issues/19753)) ([d47b2a6](https://github.com/angular/angular/commit/d47b2a6)), closes [#19100](https://github.com/angular/angular/issues/19100)
-* **animations:** ensure final state() styles are applied within @.disabled animations ([#20267](https://github.com/angular/angular/issues/20267)) ([20aafff](https://github.com/angular/angular/commit/20aafff)), closes [#20266](https://github.com/angular/angular/issues/20266)
-* **bazel:** adjust mock of tsconfig for ng_module rule unit test ([#20175](https://github.com/angular/angular/issues/20175)) ([c2a24b4](https://github.com/angular/angular/commit/c2a24b4))
-* **compiler:** fix corner cases in shadow CSS ([c32f5fd](https://github.com/angular/angular/commit/c32f5fd))
-* **compiler:** recognize @NgModule with a redundant @Injectable ([#20320](https://github.com/angular/angular/issues/20320)) ([c33a576](https://github.com/angular/angular/commit/c33a576))
-* **compiler:** show explanatory text in template errors ([#20313](https://github.com/angular/angular/issues/20313)) ([3257fcd](https://github.com/angular/angular/commit/3257fcd))
-* **core:** ensure init lifecycle events are called ([#20258](https://github.com/angular/angular/issues/20258)) ([24cf8b3](https://github.com/angular/angular/commit/24cf8b3))
-* **language-service:** pass compilerOptions.paths to ReflectorHost ([#20222](https://github.com/angular/angular/issues/20222)) ([eb8013e](https://github.com/angular/angular/commit/eb8013e))
-* **router:** 'merge' queryParamHandling strategy should be able to remove query params ([#19733](https://github.com/angular/angular/issues/19733)) ([a622e19](https://github.com/angular/angular/commit/a622e19)), closes [#18463](https://github.com/angular/angular/issues/18463) [#17202](https://github.com/angular/angular/issues/17202)
-* Update test code to type-check under TS 2.5 ([#20175](https://github.com/angular/angular/issues/20175)) ([5ec1717](https://github.com/angular/angular/commit/5ec1717))
-
-
-
 <a name="5.0.2"></a>
 ## [5.0.2](https://github.com/angular/angular/compare/5.0.1...5.0.2) (2017-11-16)
 
@@ -30,22 +11,6 @@
 * **router:** 'merge' queryParamHandling strategy should be able to remove query params ([#19733](https://github.com/angular/angular/issues/19733)) ([b732fb9](https://github.com/angular/angular/commit/b732fb9)), closes [#18463](https://github.com/angular/angular/issues/18463) [#17202](https://github.com/angular/angular/issues/17202)
 
 
-<a name="5.1.0-beta.0"></a>
-# [5.1.0-beta.0](https://github.com/angular/angular/compare/5.0.0-rc.4...5.1.0-beta.0) (2017-11-08)
-
-### Bug Fixes
-
-* **compiler:** don't overwrite missingTranslation's value in JIT ([#19952](https://github.com/angular/angular/issues/19952)) ([799cbb9](https://github.com/angular/angular/commit/799cbb9))
-* **compiler:** report a reasonable error with invalid metadata ([#20062](https://github.com/angular/angular/issues/20062)) ([da22c48](https://github.com/angular/angular/commit/da22c48))
-* **compiler-cli:** don't report emit diagnostics when `--noEmitOnError` is off ([#20063](https://github.com/angular/angular/issues/20063)) ([8639995](https://github.com/angular/angular/commit/8639995))
-* **core:** `__symbol__` should return `__zone_symbol__` without zone.js loaded ([#19541](https://github.com/angular/angular/issues/19541)) ([678d1cf](https://github.com/angular/angular/commit/678d1cf))
-* **core:** should support event.stopImmediatePropagation ([#19222](https://github.com/angular/angular/issues/19222)) ([7083791](https://github.com/angular/angular/commit/7083791))
-* **platform-browser:** support Symbols in custom `jasmineToString()` method ([#19794](https://github.com/angular/angular/issues/19794)) ([5a6efa7](https://github.com/angular/angular/commit/5a6efa7))
-
-### Features
-
-* **compiler:** introduce `TestBed.overrideTemplateUsingTestingModule` ([a460066](https://github.com/angular/angular/commit/a460066)), closes [#19815](https://github.com/angular/angular/issues/19815)
-
 
 <a name="5.0.1"></a>
 ## [5.0.1](https://github.com/angular/angular/compare/5.0.0...5.0.1) (2017-11-08)

CONTRIBUTING.md

@@ -69,37 +69,36 @@ You can file new issues by filling out our [new issue form](https://github.com/a
 ### <a name="submit-pr"></a> Submitting a Pull Request (PR)
 Before you submit your Pull Request (PR) consider the following guidelines:
 
-1. Search [GitHub](https://github.com/angular/angular/pulls) for an open or closed PR
+* Search [GitHub](https://github.com/angular/angular/pulls) for an open or closed PR
   that relates to your submission. You don't want to duplicate effort.
-1. Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
+* Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
   We cannot accept code without this.
-1. Fork the angular/angular repo.
-1. Make your changes in a new git branch:
+* Make your changes in a new git branch:
 
      ```shell
      git checkout -b my-fix-branch master
      ```
 
-1. Create your patch, **including appropriate test cases**.
-1. Follow our [Coding Rules](#rules).
-1. Run the full Angular test suite, as described in the [developer documentation][dev-doc],
+* Create your patch, **including appropriate test cases**.
+* Follow our [Coding Rules](#rules).
+* Run the full Angular test suite, as described in the [developer documentation][dev-doc],
   and ensure that all tests pass.
-1. Commit your changes using a descriptive commit message that follows our
+* Commit your changes using a descriptive commit message that follows our
   [commit message conventions](#commit). Adherence to these conventions
   is necessary because release notes are automatically generated from these messages.
 
      ```shell
      git commit -a
      ```
-    Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
+  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
 
-1. Push your branch to GitHub:
+* Push your branch to GitHub:
 
     ```shell
     git push origin my-fix-branch
     ```
 
-1. In GitHub, send a pull request to `angular:master`.
+* In GitHub, send a pull request to `angular:master`.
 * If we suggest changes then:
   * Make the required updates.
   * Re-run the Angular test suites to ensure tests are still passing.

WORKSPACE

@@ -5,7 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "build_bazel_rules_nodejs",
     remote = "https://github.com/bazelbuild/rules_nodejs.git",
-    commit = "0.2.1",
+    # TODO(alexeagle): use the correct tag here.
+    commit = "2c6243df53fd33fdab283ebdd01582e4eb815db8",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")

integration/bazel/WORKSPACE

@@ -3,7 +3,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "build_bazel_rules_nodejs",
     remote = "https://github.com/bazelbuild/rules_nodejs.git",
-    tag = "0.2.1",
+    tag = "0.0.2",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")

integration/typings_test_ts24/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-integration",
-  "description": "Assert that users with TypeScript 2.4 can type-check an Angular application",
+  "description": "Assert that users with TypeScript 2.2 can type-check an Angular application",
   "version": "0.0.0",
   "license": "MIT",
   "dependencies": {
@@ -18,7 +18,7 @@
     "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
     "@types/jasmine": "2.5.41",
     "rxjs": "file:../../node_modules/rxjs",
-    "typescript": "2.4.x",
+    "typescript": "file:../../node_modules/typescript",
     "zone.js": "file:../../node_modules/zone.js"
   },
   "scripts": {

integration/typings_test_ts25/include-all.ts

@@ -1,41 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import * as compiler from '@angular/compiler';
-import * as compilerTesting from '@angular/compiler/testing';
-import * as core from '@angular/core';
-import * as coreTesting from '@angular/core/testing';
-import * as forms from '@angular/forms';
-import * as http from '@angular/http';
-import * as httpTesting from '@angular/http/testing';
-import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
-import * as platformBrowser from '@angular/platform-browser';
-import * as platformBrowserTesting from '@angular/platform-browser/testing';
-import * as platformServer from '@angular/platform-server';
-import * as platformServerTesting from '@angular/platform-server/testing';
-import * as router from '@angular/router';
-import * as routerTesting from '@angular/router/testing';
-import * as upgrade from '@angular/upgrade';
-
-export default {
-  compiler,
-  compilerTesting,
-  core,
-  coreTesting,
-  forms,
-  http,
-  httpTesting,
-  platformBrowser,
-  platformBrowserTesting,
-  platformBrowserDynamic,
-  platformServer,
-  platformServerTesting,
-  router,
-  routerTesting,
-  upgrade
-};

integration/typings_test_ts25/package.json

@@ -1,27 +0,0 @@
-{
-  "name": "angular-integration",
-  "description": "Assert that users with TypeScript 2.5 can type-check an Angular application",
-  "version": "0.0.0",
-  "license": "MIT",
-  "dependencies": {
-    "@angular/animations": "file:../../dist/packages-dist/animations",
-    "@angular/common": "file:../../dist/packages-dist/common",
-    "@angular/compiler": "file:../../dist/packages-dist/compiler",
-    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
-    "@angular/core": "file:../../dist/packages-dist/core",
-    "@angular/forms": "file:../../dist/packages-dist/forms",
-    "@angular/http": "file:../../dist/packages-dist/http",
-    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
-    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
-    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
-    "@angular/router": "file:../../dist/packages-dist/router",
-    "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
-    "@types/jasmine": "2.5.41",
-    "rxjs": "file:../../node_modules/rxjs",
-    "typescript": "2.5.x",
-    "zone.js": "file:../../node_modules/zone.js"
-  },
-  "scripts": {
-    "test": "tsc"
-  }
-}

integration/typings_test_ts25/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "outDir": "../../dist/typings_test_ts25/",
-    "rootDir": ".",
-    "target": "es5",
-    "lib": [
-      "es5",
-      "dom",
-      "es2015.collection",
-      "es2015.iterable",
-      "es2015.promise"
-    ],
-    "types": [],
-    "strictNullChecks": true
-  },
-  "files": [
-    "include-all.ts",
-    "node_modules/@types/jasmine/index.d.ts"
-  ]
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "5.1.0-beta.1",
+  "version": "5.0.2",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",
@@ -32,7 +32,7 @@
     "fsevents": "1.1.2"
   },
   "devDependencies": {
-    "@bazel/typescript": "0.3.1",
+    "@bazel/typescript": "0.2.x",
     "@types/angularjs": "1.5.14-alpha",
     "@types/base64-js": "1.2.5",
     "@types/chokidar": "1.7.3",
@@ -95,10 +95,10 @@
     "source-map-support": "0.4.18",
     "systemjs": "0.18.10",
     "ts-api-guardian": "0.2.2",
-    "tsickle": "0.25.5",
+    "tsickle": "0.24.x",
     "tslint": "5.7.0",
     "tslint-eslint-rules": "4.1.1",
-    "typescript": "2.5.x",
+    "typescript": "2.4.2",
     "uglify-js": "2.8.29",
     "universal-analytics": "0.4.15",
     "vlq": "0.2.2",

packages/bazel/package.json

@@ -6,10 +6,10 @@
   "license": "MIT",
   "peerDependencies": {
     "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
-    "typescript": ">=2.4.2 <2.6"
+    "typescript": ">=2.4.2 <2.5"
   },
   "dependencies": {
-    "@bazel/typescript": "0.3.x",
+    "@bazel/typescript": "0.2.x",
     "@types/node": "6.0.84"
   },
   "repository": {

packages/bazel/src/ngc-wrapped/index.ts

@@ -5,7 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
+// TODO(tbosch): figure out why we need this as it breaks node code within ngc-wrapped
+/// <reference types="node" />
 import * as ng from '@angular/compiler-cli';
 import {BazelOptions, CachedFileLoader, CompilerHost, FileCache, FileLoader, UncachedFileLoader, constructManifest, debug, fixUmdModuleDeclarations, parseTsconfig, runAsWorker, runWorkerLoop} from '@bazel/typescript';
 import * as fs from 'fs';

packages/bazel/test/ngc-wrapped/tsconfig_template.ts

@@ -64,10 +64,6 @@ export function createTsConfig(options: TsConfigOptions) {
       'es5Mode': true,
       'manifest': createManifestPath(options),
       'compilationTargetSrc': options.compilationTargetSrc,
-      // Override this property from the real tsconfig we read
-      // Because we ask for :empty_tsconfig.json, we get the ES6 version which
-      // expects to write externs, yet that doesn't work under this fixture.
-      'tsickleExternsPath': '',
     },
     'files': options.files,
     'angularCompilerOptions': {

packages/benchpress/src/runner.ts

@@ -81,9 +81,7 @@ export class Runner {
             {provide: WebDriverAdapter, useValue: adapter}
           ]);
 
-          // TODO: With TypeScript 2.5 injector.get does not infer correctly the
-          // return type. Remove 'any' and investigate the issue.
-          const sampler = injector.get(Sampler) as any;
+          const sampler = injector.get(Sampler);
           return sampler.sample();
         });
   }

packages/benchpress/test/metric/multi_metric_spec.ts

@@ -17,7 +17,7 @@ export function main() {
                     ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
                     MultiMetric.provideWith(ids)
                   ])
-                  .get<MultiMetric>(MultiMetric);
+                  .get(MultiMetric);
     return Promise.resolve(m);
   }
 

packages/benchpress/test/reporter/json_file_reporter_spec.ts

@@ -34,7 +34,7 @@ export function main() {
           }
         }
       ];
-      return Injector.create(providers).get<JsonFileReporter>(JsonFileReporter);
+      return Injector.create(providers).get(JsonFileReporter);
     }
 
     it('should write all data into a file',

packages/benchpress/test/reporter/multi_reporter_spec.ts

@@ -17,7 +17,7 @@ export function main() {
                     ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
                     MultiReporter.provideWith(ids)
                   ])
-                  .get<MultiReporter>(MultiReporter);
+                  .get(MultiReporter);
     return Promise.resolve(r);
   }
 

packages/common/testing/src/location_mock.ts

@@ -41,9 +41,7 @@ export class SpyLocation implements Location {
     return currPath == givenPath + (query.length > 0 ? ('?' + query) : '');
   }
 
-  simulateUrlPop(pathname: string) {
-    this._subject.emit({'url': pathname, 'pop': true, 'type': 'popstate'});
-  }
+  simulateUrlPop(pathname: string) { this._subject.emit({'url': pathname, 'pop': true}); }
 
   simulateHashChange(pathname: string) {
     // Because we don't prevent the native event, the browser will independently update the path

packages/compiler-cli/package.json

@@ -11,11 +11,11 @@
   "dependencies": {
     "reflect-metadata": "^0.1.2",
     "minimist": "^1.2.0",
-    "tsickle": "^0.25.5",
+    "tsickle": "^0.24.0",
     "chokidar": "^1.4.2"
   },
   "peerDependencies": {
-    "typescript": ">=2.4.2 <2.6",
+    "typescript": ">=2.4.2 <2.5",
     "@angular/compiler": "0.0.0-PLACEHOLDER"
   },
   "repository": {

packages/compiler-cli/src/metadata/collector.ts

@@ -116,8 +116,8 @@ export class MetadataCollector {
     function classMetadataOf(classDeclaration: ts.ClassDeclaration): ClassMetadata {
       const result: ClassMetadata = {__symbolic: 'class'};
 
-      function getDecorators(decorators: ReadonlyArray<ts.Decorator>| undefined):
-          MetadataSymbolicExpression[]|undefined {
+      function getDecorators(decorators: ts.Decorator[] | undefined): MetadataSymbolicExpression[]|
+          undefined {
         if (decorators && decorators.length)
           return decorators.map(decorator => objFromDecorator(decorator));
         return undefined;

packages/compiler-cli/src/transformers/compiler_host.ts

@@ -41,13 +41,6 @@ export interface CodeGenerator {
   findGeneratedFileNames(fileName: string): string[];
 }
 
-function assert<T>(condition: T | null | undefined) {
-  if (!condition) {
-    // TODO(chuckjaz): do the right thing
-  }
-  return condition !;
-}
-
 /**
  * Implements the following hosts based on an api.CompilerHost:
  * - ts.CompilerHost to be consumed by a ts.Program
@@ -120,7 +113,7 @@ export class TsCompilerAotCompilerTypeCheckHostAdapter implements ts.CompilerHos
         return sf ? this.metadataProvider.getMetadata(sf) : undefined;
       },
       fileExists: (filePath) => this.originalFileExists(filePath),
-      readFile: (filePath) => assert(this.context.readFile(filePath)),
+      readFile: (filePath) => this.context.readFile(filePath),
     };
   }
 
@@ -428,7 +421,7 @@ export class TsCompilerAotCompilerTypeCheckHostAdapter implements ts.CompilerHos
       return summary.text;
     }
     if (this.originalFileExists(filePath)) {
-      return assert(this.context.readFile(filePath));
+      return this.context.readFile(filePath);
     }
     return null;
   }
@@ -479,7 +472,7 @@ export class TsCompilerAotCompilerTypeCheckHostAdapter implements ts.CompilerHos
     if (!this.originalFileExists(filePath)) {
       throw syntaxError(`Error: Resource file not found: ${filePath}`);
     }
-    return assert(this.context.readFile(filePath));
+    return this.context.readFile(filePath);
   }
 
   private hasBundleIndex(filePath: string): boolean {
@@ -497,13 +490,13 @@ export class TsCompilerAotCompilerTypeCheckHostAdapter implements ts.CompilerHos
             if (this.originalFileExists(packageFile)) {
               // Once we see a package.json file, assume false until it we find the bundle index.
               result = false;
-              const packageContent: any = JSON.parse(assert(this.context.readFile(packageFile)));
+              const packageContent: any = JSON.parse(this.context.readFile(packageFile));
               if (packageContent.typings) {
                 const typings = path.normalize(path.join(directory, packageContent.typings));
                 if (DTS.test(typings)) {
                   const metadataFile = typings.replace(DTS, '.metadata.json');
                   if (this.originalFileExists(metadataFile)) {
-                    const metadata = JSON.parse(assert(this.context.readFile(metadataFile)));
+                    const metadata = JSON.parse(this.context.readFile(metadataFile));
                     if (metadata.flatModuleIndexRedirect) {
                       this.flatModuleIndexRedirectNames.add(typings);
                       // Note: don't set result = true,

packages/compiler-cli/src/transformers/program.ts

@@ -606,8 +606,7 @@ class AngularCompilerProgram implements Program {
 
   private writeFile(
       outFileName: string, outData: string, writeByteOrderMark: boolean,
-      onError?: (message: string) => void, genFile?: GeneratedFile,
-      sourceFiles?: ReadonlyArray<ts.SourceFile>) {
+      onError?: (message: string) => void, genFile?: GeneratedFile, sourceFiles?: ts.SourceFile[]) {
     // collect emittedLibrarySummaries
     let baseFile: ts.SourceFile|undefined;
     if (genFile) {
@@ -654,8 +653,7 @@ class AngularCompilerProgram implements Program {
     if (baseFile) {
       sourceFiles = sourceFiles ? [...sourceFiles, baseFile] : [baseFile];
     }
-    // TODO: remove any when TS 2.4 support is removed.
-    this.host.writeFile(outFileName, outData, writeByteOrderMark, onError, sourceFiles as any);
+    this.host.writeFile(outFileName, outData, writeByteOrderMark, onError, sourceFiles);
   }
 }
 

packages/compiler-cli/test/metadata/bundler_spec.ts

@@ -27,7 +27,7 @@ describe('metadata bundler', () => {
 
     const originalOne = './src/one';
     const originalTwo = './src/two/index';
-    expect(Object.keys(result.metadata.origins !)
+    expect(Object.keys(result.metadata.origins)
                .sort()
                .map(name => ({name, value: result.metadata.origins ![name]})))
         .toEqual([

packages/compiler-cli/test/metadata/typescript.mocks.ts

@@ -102,7 +102,6 @@ export class MockNode implements ts.Node {
 
 export class MockIdentifier extends MockNode implements ts.Identifier {
   public text: string;
-  public escapedText: ts.__String;
   // tslint:disable
   public _primaryExpressionBrand: any;
   public _memberExpressionBrand: any;
@@ -138,14 +137,12 @@ export class MockVariableDeclaration extends MockNode implements ts.VariableDecl
 }
 
 export class MockSymbol implements ts.Symbol {
-  public escapedName: ts.__String;
   constructor(
       public name: string, private node: ts.Declaration = MockVariableDeclaration.of(name),
       public flags: ts.SymbolFlags = 0) {}
 
   getFlags(): ts.SymbolFlags { return this.flags; }
   getName(): string { return this.name; }
-  getEscapedName(): ts.__String { return this.escapedName; }
   getDeclarations(): ts.Declaration[] { return [this.node]; }
   getDocumentationComment(): ts.SymbolDisplayPart[] { return []; }
   // TODO(vicb): removed in TS 2.2

packages/compiler-cli/test/perform_watch_spec.ts

@@ -119,7 +119,7 @@ describe('perform watch', () => {
     const errorFileContent = `
       import {NgModule} from '@angular/core';
 
-      @NgModule((() => (1===1 ? null as any : null as any)) as any)
+      @NgModule(() => (1===1 ? null as any : null as any))
       export class MyModule {}
     `;
     const indexTsPath = path.resolve(testSupport.basePath, 'src', 'index.ts');

packages/compiler-cli/test/transformers/program_spec.ts

@@ -325,7 +325,7 @@ describe('ng program', () => {
          'src/main.ts': `
         import {NgModule} from '@angular/core';
 
-        @NgModule((() => {if (1==1) return null as any;}) as any)
+        @NgModule(() => {if (1==1) return null as any;})
         export class SomeClassWithInvalidMetadata {}
       `,
        });

packages/compiler/src/jit/compiler.ts

@@ -42,7 +42,6 @@ export class JitCompiler {
   private _compiledDirectiveWrapperCache = new Map<Type, Type>();
   private _compiledNgModuleCache = new Map<Type, object>();
   private _sharedStylesheetCount = 0;
-  private _addedAotSummaries = new Set<() => any[]>();
 
   constructor(
       private _metadataResolver: CompileMetadataResolver, private _templateParser: TemplateParser,
@@ -75,25 +74,10 @@ export class JitCompiler {
 
   loadAotSummaries(summaries: () => any[]) {
     this.clearCache();
-    this._addAotSummaries(summaries);
-  }
-
-  private _addAotSummaries(fn: () => any[]) {
-    if (this._addedAotSummaries.has(fn)) {
-      return;
-    }
-    this._addedAotSummaries.add(fn);
-    const summaries = fn();
-    for (let i = 0; i < summaries.length; i++) {
-      const entry = summaries[i];
-      if (typeof entry === 'function') {
-        this._addAotSummaries(entry);
-      } else {
-        const summary = entry as CompileTypeSummary;
-        this._summaryResolver.addSummary(
-            {symbol: summary.type.reference, metadata: null, type: summary});
-      }
-    }
+    flattenSummaries(summaries).forEach((summary) => {
+      this._summaryResolver.addSummary(
+          {symbol: summary.type.reference, metadata: null, type: summary});
+    });
   }
 
   hasAotSummary(ref: Type) { return !!this._summaryResolver.resolveSummary(ref); }
@@ -216,7 +200,6 @@ export class JitCompiler {
   }
 
   clearCache(): void {
-    // Note: don't clear the _addedAotSummaries, as they don't change!
     this._metadataResolver.clearCache();
     this._compiledTemplateCache.clear();
     this._compiledHostTemplateCache.clear();
@@ -352,6 +335,25 @@ function assertComponent(meta: CompileDirectiveMetadata) {
   }
 }
 
+function flattenSummaries(
+    fn: () => any[], out: CompileTypeSummary[] = [],
+    seen = new Set<() => any[]>()): CompileTypeSummary[] {
+  if (seen.has(fn)) {
+    return out;
+  }
+  seen.add(fn);
+  const summaries = fn();
+  for (let i = 0; i < summaries.length; i++) {
+    const entry = summaries[i];
+    if (typeof entry === 'function') {
+      flattenSummaries(entry, out, seen);
+    } else {
+      out.push(entry);
+    }
+  }
+  return out;
+}
+
 function createOutputContext(): OutputContext {
   const importExpr = (symbol: any) =>
       ir.importExpr({name: identifierName(symbol), moduleName: null, runtime: symbol});

packages/core/src/core_private_export.ts

@@ -20,5 +20,5 @@ export {DirectRenderer as ɵDirectRenderer, RenderDebugInfo as ɵRenderDebugInfo
 export {global as ɵglobal, looseIdentical as ɵlooseIdentical, stringify as ɵstringify} from './util';
 export {makeDecorator as ɵmakeDecorator} from './util/decorators';
 export {isObservable as ɵisObservable, isPromise as ɵisPromise} from './util/lang';
-export {clearOverrides as ɵclearOverrides, overrideComponentView as ɵoverrideComponentView, overrideProvider as ɵoverrideProvider} from './view/index';
+export {clearProviderOverrides as ɵclearProviderOverrides, overrideProvider as ɵoverrideProvider} from './view/index';
 export {NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR as ɵNOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR} from './view/provider';

packages/core/src/view/entrypoint.ts

@@ -7,12 +7,11 @@
  */
 
 import {Injector} from '../di/injector';
-import {ComponentFactory} from '../linker/component_factory';
 import {NgModuleFactory, NgModuleRef} from '../linker/ng_module_factory';
 import {Type} from '../type';
 
 import {initServicesIfNeeded} from './services';
-import {NgModuleDefinitionFactory, ProviderOverride, Services, ViewDefinition} from './types';
+import {NgModuleDefinitionFactory, ProviderOverride, Services} from './types';
 import {resolveDefinition} from './util';
 
 export function overrideProvider(override: ProviderOverride) {
@@ -20,14 +19,9 @@ export function overrideProvider(override: ProviderOverride) {
   return Services.overrideProvider(override);
 }
 
-export function overrideComponentView(comp: Type<any>, componentFactory: ComponentFactory<any>) {
+export function clearProviderOverrides() {
   initServicesIfNeeded();
-  return Services.overrideComponentView(comp, componentFactory);
-}
-
-export function clearOverrides() {
-  initServicesIfNeeded();
-  return Services.clearOverrides();
+  return Services.clearProviderOverrides();
 }
 
 // Attention: this function is called as top level function.

packages/core/src/view/index.ts

@@ -7,7 +7,7 @@
  */
 
 export {anchorDef, elementDef} from './element';
-export {clearOverrides, createNgModuleFactory, overrideComponentView, overrideProvider} from './entrypoint';
+export {clearProviderOverrides, createNgModuleFactory, overrideProvider} from './entrypoint';
 export {ngContentDef} from './ng_content';
 export {moduleDef, moduleProvideDef} from './ng_module';
 export {directiveDef, pipeDef, providerDef} from './provider';

packages/core/src/view/provider.ts

@@ -14,7 +14,7 @@ import {ViewContainerRef} from '../linker/view_container_ref';
 import {Renderer as RendererV1, Renderer2} from '../render/api';
 
 import {createChangeDetectorRef, createInjector, createRendererV1} from './refs';
-import {BindingDef, BindingFlags, DepDef, DepFlags, NodeDef, NodeFlags, OutputDef, OutputType, ProviderData, QueryValueType, Services, ViewData, ViewFlags, ViewState, asElementData, asProviderData, shouldCallLifecycleInitHook} from './types';
+import {BindingDef, BindingFlags, DepDef, DepFlags, NodeDef, NodeFlags, OutputDef, OutputType, ProviderData, QueryValueType, Services, ViewData, ViewFlags, ViewState, asElementData, asProviderData} from './types';
 import {calcBindingFlags, checkBinding, dispatchEvent, isComponentView, splitDepsDsl, splitMatchedQueriesDsl, tokenKey, viewParentEl} from './util';
 
 const RendererV1TokenKey = tokenKey(RendererV1);
@@ -198,8 +198,7 @@ export function checkAndUpdateDirectiveInline(
   if (changes) {
     directive.ngOnChanges(changes);
   }
-  if ((def.flags & NodeFlags.OnInit) &&
-      shouldCallLifecycleInitHook(view, ViewState.InitState_CallingOnInit, def.nodeIndex)) {
+  if ((view.state & ViewState.FirstCheck) && (def.flags & NodeFlags.OnInit)) {
     directive.ngOnInit();
   }
   if (def.flags & NodeFlags.DoCheck) {
@@ -223,8 +222,7 @@ export function checkAndUpdateDirectiveDynamic(
   if (changes) {
     directive.ngOnChanges(changes);
   }
-  if ((def.flags & NodeFlags.OnInit) &&
-      shouldCallLifecycleInitHook(view, ViewState.InitState_CallingOnInit, def.nodeIndex)) {
+  if ((view.state & ViewState.FirstCheck) && (def.flags & NodeFlags.OnInit)) {
     directive.ngOnInit();
   }
   if (def.flags & NodeFlags.DoCheck) {
@@ -449,61 +447,17 @@ function updateProp(
   return changes;
 }
 
-// This function calls the ngAfterContentCheck, ngAfterContentInit,
-// ngAfterViewCheck, and ngAfterViewInit lifecycle hooks (depending on the node
-// flags in lifecycle). Unlike ngDoCheck, ngOnChanges and ngOnInit, which are
-// called during a pre-order traversal of the view tree (that is calling the
-// parent hooks before the child hooks) these events are sent in using a
-// post-order traversal of the tree (children before parents). This changes the
-// meaning of initIndex in the view state. For ngOnInit, initIndex tracks the
-// expected nodeIndex which a ngOnInit should be called. When sending
-// ngAfterContentInit and ngAfterViewInit it is the expected count of
-// ngAfterContentInit or ngAfterViewInit methods that have been called. This
-// ensure that dispite being called recursively or after picking up after an
-// exception, the ngAfterContentInit or ngAfterViewInit will be called on the
-// correct nodes. Consider for example, the following (where E is an element
-// and D is a directive)
-//  Tree:       pre-order index  post-order index
-//    E1        0                6
-//      E2      1                1
-//       D3     2                0
-//      E4      3                5
-//       E5     4                4
-//        E6    5                2
-//        E7    6                3
-// As can be seen, the post-order index has an unclear relationship to the
-// pre-order index (postOrderIndex === preOrderIndex - parentCount +
-// childCount). Since number of calls to ngAfterContentInit and ngAfterViewInit
-// are stable (will be the same for the same view regardless of exceptions or
-// recursion) we just need to count them which will roughly correspond to the
-// post-order index (it skips elements and directives that do not have
-// lifecycle hooks).
-//
-// For example, if an exception is raised in the E6.onAfterViewInit() the
-// initIndex is left at 3 (by shouldCallLifecycleInitHook() which set it to
-// initIndex + 1). When checkAndUpdateView() is called again D3, E2 and E6 will
-// not have their ngAfterViewInit() called but, starting with E7, the rest of
-// the view will begin getting ngAfterViewInit() called until a check and
-// pass is complete.
-//
-// This algorthim also handles recursion. Consider if E4's ngAfterViewInit()
-// indirectly calls E1's ChangeDetectorRef.detectChanges(). The expected
-// initIndex is set to 6, the recusive checkAndUpdateView() starts walk again.
-// D3, E2, E6, E7, E5 and E4 are skipped, ngAfterViewInit() is called on E1.
-// When the recursion returns the initIndex will be 7 so E1 is skipped as it
-// has already been called in the recursively called checkAnUpdateView().
 export function callLifecycleHooksChildrenFirst(view: ViewData, lifecycles: NodeFlags) {
   if (!(view.def.nodeFlags & lifecycles)) {
     return;
   }
   const nodes = view.def.nodes;
-  let initIndex = 0;
   for (let i = 0; i < nodes.length; i++) {
     const nodeDef = nodes[i];
     let parent = nodeDef.parent;
     if (!parent && nodeDef.flags & lifecycles) {
       // matching root node (e.g. a pipe)
-      callProviderLifecycles(view, i, nodeDef.flags & lifecycles, initIndex++);
+      callProviderLifecycles(view, i, nodeDef.flags & lifecycles);
     }
     if ((nodeDef.childFlags & lifecycles) === 0) {
       // no child matches one of the lifecycles
@@ -513,28 +467,25 @@ export function callLifecycleHooksChildrenFirst(view: ViewData, lifecycles: Node
            i === parent.nodeIndex + parent.childCount) {
       // last child of an element
       if (parent.directChildFlags & lifecycles) {
-        initIndex = callElementProvidersLifecycles(view, parent, lifecycles, initIndex);
+        callElementProvidersLifecycles(view, parent, lifecycles);
       }
       parent = parent.parent;
     }
   }
 }
 
-function callElementProvidersLifecycles(
-    view: ViewData, elDef: NodeDef, lifecycles: NodeFlags, initIndex: number): number {
+function callElementProvidersLifecycles(view: ViewData, elDef: NodeDef, lifecycles: NodeFlags) {
   for (let i = elDef.nodeIndex + 1; i <= elDef.nodeIndex + elDef.childCount; i++) {
     const nodeDef = view.def.nodes[i];
     if (nodeDef.flags & lifecycles) {
-      callProviderLifecycles(view, i, nodeDef.flags & lifecycles, initIndex++);
+      callProviderLifecycles(view, i, nodeDef.flags & lifecycles);
     }
     // only visit direct children
     i += nodeDef.childCount;
   }
-  return initIndex;
 }
 
-function callProviderLifecycles(
-    view: ViewData, index: number, lifecycles: NodeFlags, initIndex: number) {
+function callProviderLifecycles(view: ViewData, index: number, lifecycles: NodeFlags) {
   const providerData = asProviderData(view, index);
   if (!providerData) {
     return;
@@ -544,15 +495,13 @@ function callProviderLifecycles(
     return;
   }
   Services.setCurrentNode(view, index);
-  if (lifecycles & NodeFlags.AfterContentInit &&
-      shouldCallLifecycleInitHook(view, ViewState.InitState_CallingAfterContentInit, initIndex)) {
+  if (lifecycles & NodeFlags.AfterContentInit) {
     provider.ngAfterContentInit();
   }
   if (lifecycles & NodeFlags.AfterContentChecked) {
     provider.ngAfterContentChecked();
   }
-  if (lifecycles & NodeFlags.AfterViewInit &&
-      shouldCallLifecycleInitHook(view, ViewState.InitState_CallingAfterViewInit, initIndex)) {
+  if (lifecycles & NodeFlags.AfterViewInit) {
     provider.ngAfterViewInit();
   }
   if (lifecycles & NodeFlags.AfterViewChecked) {

packages/core/src/view/services.ts

@@ -10,7 +10,6 @@ import {isDevMode} from '../application_ref';
 import {DebugElement, DebugNode, EventListener, getDebugNode, indexDebugNode, removeDebugNodeFromIndex} from '../debug/debug_node';
 import {Injector} from '../di';
 import {ErrorHandler} from '../error_handler';
-import {ComponentFactory} from '../linker/component_factory';
 import {NgModuleRef} from '../linker/ng_module_factory';
 import {Renderer2, RendererFactory2, RendererStyleFlags2, RendererType2} from '../render/api';
 import {Sanitizer} from '../security';
@@ -19,9 +18,9 @@ import {Type} from '../type';
 import {isViewDebugError, viewDestroyedError, viewWrappedDebugError} from './errors';
 import {resolveDep} from './provider';
 import {dirtyParentQueries, getQueryValue} from './query';
-import {createInjector, createNgModuleRef, getComponentViewDefinitionFactory} from './refs';
+import {createInjector, createNgModuleRef} from './refs';
 import {ArgumentType, BindingFlags, CheckType, DebugContext, DepDef, ElementData, NgModuleDefinition, NgModuleProviderDef, NodeDef, NodeFlags, NodeLogger, ProviderOverride, RootData, Services, ViewData, ViewDefinition, ViewState, asElementData, asPureExpressionData} from './types';
-import {NOOP, isComponentView, renderNode, resolveDefinition, splitDepsDsl, viewParentEl} from './util';
+import {NOOP, isComponentView, renderNode, splitDepsDsl, viewParentEl} from './util';
 import {checkAndUpdateNode, checkAndUpdateView, checkNoChangesNode, checkNoChangesView, createComponentView, createEmbeddedView, createRootView, destroyView} from './view';
 
 
@@ -39,8 +38,7 @@ export function initServicesIfNeeded() {
   Services.createComponentView = services.createComponentView;
   Services.createNgModuleRef = services.createNgModuleRef;
   Services.overrideProvider = services.overrideProvider;
-  Services.overrideComponentView = services.overrideComponentView;
-  Services.clearOverrides = services.clearOverrides;
+  Services.clearProviderOverrides = services.clearProviderOverrides;
   Services.checkAndUpdateView = services.checkAndUpdateView;
   Services.checkNoChangesView = services.checkNoChangesView;
   Services.destroyView = services.destroyView;
@@ -60,8 +58,7 @@ function createProdServices() {
     createComponentView: createComponentView,
     createNgModuleRef: createNgModuleRef,
     overrideProvider: NOOP,
-    overrideComponentView: NOOP,
-    clearOverrides: NOOP,
+    clearProviderOverrides: NOOP,
     checkAndUpdateView: checkAndUpdateView,
     checkNoChangesView: checkNoChangesView,
     destroyView: destroyView,
@@ -87,8 +84,7 @@ function createDebugServices() {
     createComponentView: debugCreateComponentView,
     createNgModuleRef: debugCreateNgModuleRef,
     overrideProvider: debugOverrideProvider,
-    overrideComponentView: debugOverrideComponentView,
-    clearOverrides: debugClearOverrides,
+    clearProviderOverrides: debugClearProviderOverrides,
     checkAndUpdateView: debugCheckAndUpdateView,
     checkNoChangesView: debugCheckNoChangesView,
     destroyView: debugDestroyView,
@@ -143,15 +139,10 @@ function debugCreateEmbeddedView(
 
 function debugCreateComponentView(
     parentView: ViewData, nodeDef: NodeDef, viewDef: ViewDefinition, hostElement: any): ViewData {
-  const overrideComponentView =
-      viewDefOverrides.get(nodeDef.element !.componentProvider !.provider !.token);
-  if (overrideComponentView) {
-    viewDef = overrideComponentView;
-  } else {
-    viewDef = applyProviderOverridesToView(viewDef);
-  }
+  const defWithOverride = applyProviderOverridesToView(viewDef);
   return callWithDebugContext(
-      DebugAction.create, createComponentView, null, [parentView, nodeDef, viewDef, hostElement]);
+      DebugAction.create, createComponentView, null,
+      [parentView, nodeDef, defWithOverride, hostElement]);
 }
 
 function debugCreateNgModuleRef(
@@ -162,21 +153,13 @@ function debugCreateNgModuleRef(
 }
 
 const providerOverrides = new Map<any, ProviderOverride>();
-const viewDefOverrides = new Map<any, ViewDefinition>();
 
 function debugOverrideProvider(override: ProviderOverride) {
   providerOverrides.set(override.token, override);
 }
 
-function debugOverrideComponentView(comp: any, compFactory: ComponentFactory<any>) {
-  const hostViewDef = resolveDefinition(getComponentViewDefinitionFactory(compFactory));
-  const compViewDef = resolveDefinition(hostViewDef.nodes[0].element !.componentView !);
-  viewDefOverrides.set(comp, compViewDef);
-}
-
-function debugClearOverrides() {
+function debugClearProviderOverrides() {
   providerOverrides.clear();
-  viewDefOverrides.clear();
 }
 
 // Notes about the algorithm:

packages/core/src/view/types.ts

@@ -8,7 +8,6 @@
 
 import {Injector} from '../di';
 import {ErrorHandler} from '../error_handler';
-import {ComponentFactory} from '../linker/component_factory';
 import {NgModuleRef} from '../linker/ng_module_factory';
 import {QueryList} from '../linker/query_list';
 import {TemplateRef} from '../linker/template_ref';
@@ -17,7 +16,6 @@ import {Renderer2, RendererFactory2, RendererType2} from '../render/api';
 import {Sanitizer, SecurityContext} from '../security';
 import {Type} from '../type';
 
-
 // -------------------------------------
 // Defs
 // -------------------------------------
@@ -354,7 +352,6 @@ export interface ViewData {
   state: ViewState;
   oldValues: any[];
   disposables: DisposableFn[]|null;
-  initIndex: number;
 }
 
 /**
@@ -370,52 +367,8 @@ export const enum ViewState {
   CheckProjectedViews = 1 << 6,
   Destroyed = 1 << 7,
 
-  // InitState Uses 3 bits
-  InitState_Mask = 7 << 8,
-  InitState_BeforeInit = 0 << 8,
-  InitState_CallingOnInit = 1 << 8,
-  InitState_CallingAfterContentInit = 2 << 8,
-  InitState_CallingAfterViewInit = 3 << 8,
-  InitState_AfterInit = 4 << 8,
-
   CatDetectChanges = Attached | ChecksEnabled,
-  CatInit = BeforeFirstCheck | CatDetectChanges | InitState_BeforeInit
-}
-
-// Called before each cycle of a view's check to detect whether this is in the
-// initState for which we need to call ngOnInit, ngAfterContentInit or ngAfterViewInit
-// lifecycle methods. Returns true if this check cycle should call lifecycle
-// methods.
-export function shiftInitState(
-    view: ViewData, priorInitState: ViewState, newInitState: ViewState): boolean {
-  // Only update the InitState if we are currently in the prior state.
-  // For example, only move into CallingInit if we are in BeforeInit. Only
-  // move into CallingContentInit if we are in CallingInit. Normally this will
-  // always be true because of how checkCycle is called in checkAndUpdateView.
-  // However, if checkAndUpdateView is called recursively or if an exception is
-  // thrown while checkAndUpdateView is running, checkAndUpdateView starts over
-  // from the beginning. This ensures the state is monotonically increasing,
-  // terminating in the AfterInit state, which ensures the Init methods are called
-  // at least once and only once.
-  const state = view.state;
-  const initState = state & ViewState.InitState_Mask;
-  if (initState === priorInitState) {
-    view.state = (state & ~ViewState.InitState_Mask) | newInitState;
-    view.initIndex = -1;
-    return true;
-  }
-  return initState === newInitState;
-}
-
-// Returns true if the lifecycle init method should be called for the node with
-// the given init index.
-export function shouldCallLifecycleInitHook(
-    view: ViewData, initState: ViewState, index: number): boolean {
-  if ((view.state & ViewState.InitState_Mask) === initState && view.initIndex <= index) {
-    view.initIndex = index + 1;
-    return true;
-  }
-  return false;
+  CatInit = BeforeFirstCheck | CatDetectChanges
 }
 
 export interface DisposableFn { (): void; }
@@ -569,8 +522,7 @@ export interface Services {
       moduleType: Type<any>, parent: Injector, bootstrapComponents: Type<any>[],
       def: NgModuleDefinition): NgModuleRef<any>;
   overrideProvider(override: ProviderOverride): void;
-  overrideComponentView(compType: Type<any>, compFactory: ComponentFactory<any>): void;
-  clearOverrides(): void;
+  clearProviderOverrides(): void;
   checkAndUpdateView(view: ViewData): void;
   checkNoChangesView(view: ViewData): void;
   destroyView(view: ViewData): void;
@@ -595,8 +547,7 @@ export const Services: Services = {
   createComponentView: undefined !,
   createNgModuleRef: undefined !,
   overrideProvider: undefined !,
-  overrideComponentView: undefined !,
-  clearOverrides: undefined !,
+  clearProviderOverrides: undefined !,
   checkAndUpdateView: undefined !,
   checkNoChangesView: undefined !,
   destroyView: undefined !,

packages/core/src/view/view.ts

@@ -16,7 +16,7 @@ import {checkAndUpdatePureExpressionDynamic, checkAndUpdatePureExpressionInline,
 import {checkAndUpdateQuery, createQuery} from './query';
 import {createTemplateData, createViewContainerData} from './refs';
 import {checkAndUpdateTextDynamic, checkAndUpdateTextInline, createText} from './text';
-import {ArgumentType, CheckType, ElementData, NodeData, NodeDef, NodeFlags, ProviderData, RootData, Services, ViewData, ViewDefinition, ViewFlags, ViewHandleEventFn, ViewState, ViewUpdateFn, asElementData, asQueryList, asTextData, shiftInitState} from './types';
+import {ArgumentType, CheckType, ElementData, NodeData, NodeDef, NodeFlags, ProviderData, RootData, Services, ViewData, ViewDefinition, ViewFlags, ViewHandleEventFn, ViewState, ViewUpdateFn, asElementData, asQueryList, asTextData} from './types';
 import {NOOP, checkBindingNoChanges, isComponentView, markParentViewsForCheckProjectedViews, resolveDefinition, tokenKey} from './util';
 import {detachProjectedView} from './view_attach';
 
@@ -236,8 +236,7 @@ function createView(
     context: null,
     component: null, nodes,
     state: ViewState.CatInit, root, renderer,
-    oldValues: new Array(def.bindingCount), disposables,
-    initIndex: -1
+    oldValues: new Array(def.bindingCount), disposables
   };
   return view;
 }
@@ -354,32 +353,29 @@ export function checkAndUpdateView(view: ViewData) {
   } else {
     view.state &= ~ViewState.FirstCheck;
   }
-  shiftInitState(view, ViewState.InitState_BeforeInit, ViewState.InitState_CallingOnInit);
   markProjectedViewsForCheck(view);
   Services.updateDirectives(view, CheckType.CheckAndUpdate);
   execEmbeddedViewsAction(view, ViewAction.CheckAndUpdate);
   execQueriesAction(
       view, NodeFlags.TypeContentQuery, NodeFlags.DynamicQuery, CheckType.CheckAndUpdate);
-  let callInit = shiftInitState(
-      view, ViewState.InitState_CallingOnInit, ViewState.InitState_CallingAfterContentInit);
+
   callLifecycleHooksChildrenFirst(
-      view, NodeFlags.AfterContentChecked | (callInit ? NodeFlags.AfterContentInit : 0));
+      view, NodeFlags.AfterContentChecked |
+          (view.state & ViewState.FirstCheck ? NodeFlags.AfterContentInit : 0));
 
   Services.updateRenderer(view, CheckType.CheckAndUpdate);
 
   execComponentViewsAction(view, ViewAction.CheckAndUpdate);
   execQueriesAction(
       view, NodeFlags.TypeViewQuery, NodeFlags.DynamicQuery, CheckType.CheckAndUpdate);
-  callInit = shiftInitState(
-      view, ViewState.InitState_CallingAfterContentInit, ViewState.InitState_CallingAfterViewInit);
   callLifecycleHooksChildrenFirst(
-      view, NodeFlags.AfterViewChecked | (callInit ? NodeFlags.AfterViewInit : 0));
+      view, NodeFlags.AfterViewChecked |
+          (view.state & ViewState.FirstCheck ? NodeFlags.AfterViewInit : 0));
 
   if (view.def.flags & ViewFlags.OnPush) {
     view.state &= ~ViewState.ChecksEnabled;
   }
   view.state &= ~(ViewState.CheckProjectedViews | ViewState.CheckProjectedView);
-  shiftInitState(view, ViewState.InitState_CallingAfterViewInit, ViewState.InitState_AfterInit);
 }
 
 export function checkAndUpdateNode(

packages/core/test/change_detection/differs/iterable_differs_spec.ts

@@ -61,10 +61,8 @@ export function main() {
         const injector = Injector.create([{provide: IterableDiffers, useValue: parent}]);
         const childInjector = Injector.create([IterableDiffers.extend([factory2])], injector);
 
-        expect(injector.get<IterableDiffers>(IterableDiffers).factories).toEqual([factory1]);
-        expect(childInjector.get<IterableDiffers>(IterableDiffers).factories).toEqual([
-          factory2, factory1
-        ]);
+        expect(injector.get(IterableDiffers).factories).toEqual([factory1]);
+        expect(childInjector.get(IterableDiffers).factories).toEqual([factory2, factory1]);
       });
     });
   });

packages/core/test/di/static_injector_spec.ts

@@ -98,7 +98,7 @@ export function main() {
 
     it('should resolve dependencies based on type information', () => {
       const injector = Injector.create([Engine.PROVIDER, Car.PROVIDER]);
-      const car = injector.get<Car>(Car);
+      const car = injector.get(Car);
 
       expect(car).toBeAnInstanceOf(Car);
       expect(car.engine).toBeAnInstanceOf(Engine);
@@ -138,7 +138,7 @@ export function main() {
       const injector = Injector.create(
           [Engine.PROVIDER, {provide: Car, useFactory: sportsCarFactory, deps: [Engine]}]);
 
-      const car = injector.get<Car>(Car);
+      const car = injector.get(Car);
       expect(car).toBeAnInstanceOf(SportsCar);
       expect(car.engine).toBeAnInstanceOf(Engine);
     });
@@ -208,7 +208,7 @@ export function main() {
         {provide: Car, useFactory: (e: Engine) => new SportsCar(e), deps: [Engine]}
       ]);
 
-      const car = injector.get<Car>(Car);
+      const car = injector.get(Car);
       expect(car).toBeAnInstanceOf(SportsCar);
       expect(car.engine).toBeAnInstanceOf(Engine);
     });
@@ -216,7 +216,7 @@ export function main() {
     it('should support optional dependencies', () => {
       const injector = Injector.create([CarWithOptionalEngine.PROVIDER]);
 
-      const car = injector.get<CarWithOptionalEngine>(CarWithOptionalEngine);
+      const car = injector.get(CarWithOptionalEngine);
       expect(car.engine).toEqual(null);
     });
 
@@ -364,7 +364,7 @@ export function main() {
          const parent = Injector.create([Car.PROVIDER, Engine.PROVIDER]);
          const child = Injector.create([TurboEngine.PROVIDER], parent);
 
-         const carFromChild = child.get<Car>(Car);
+         const carFromChild = child.get(Car);
          expect(carFromChild.engine).toBeAnInstanceOf(Engine);
        });
 
@@ -391,7 +391,7 @@ export function main() {
     it('should instantiate an object in the context of the injector', () => {
       const inj = Injector.create([Engine.PROVIDER]);
       const childInj = Injector.create([Car.PROVIDER], inj);
-      const car = childInj.get<Car>(Car);
+      const car = childInj.get(Car);
       expect(car).toBeAnInstanceOf(Car);
       expect(car.engine).toBe(inj.get(Engine));
     });
@@ -430,7 +430,7 @@ export function main() {
             ],
             parent);
 
-        expect(child.get<Car>(Car).engine).toBeAnInstanceOf(Engine);
+        expect(child.get(Car).engine).toBeAnInstanceOf(Engine);
       });
     });
   });

packages/core/test/linker/change_detection_integration_spec.ts

@@ -1152,6 +1152,7 @@ export function main() {
              ]);
            }));
       });
+
     });
 
     describe('enforce no new changes', () => {
@@ -1462,151 +1463,6 @@ export function main() {
         expect(divEl.nativeElement).toHaveCssClass('foo');
       });
     });
-
-    describe('lifecycle asserts', () => {
-      let logged: string[];
-
-      function log(value: string) { logged.push(value); }
-      function clearLog() { logged = []; }
-
-      function expectOnceAndOnlyOnce(log: string) {
-        expect(logged.indexOf(log) >= 0)
-            .toBeTruthy(`'${log}' not logged. Log was ${JSON.stringify(logged)}`);
-        expect(logged.lastIndexOf(log) === logged.indexOf(log))
-            .toBeTruthy(`'${log}' logged more than once. Log was ${JSON.stringify(logged)}`);
-      }
-
-      beforeEach(() => { clearLog(); });
-
-      enum LifetimeMethods {
-        None = 0,
-        ngOnInit = 1 << 0,
-        ngOnChanges = 1 << 1,
-        ngAfterViewInit = 1 << 2,
-        ngAfterContentInit = 1 << 3,
-        ngDoCheck = 1 << 4,
-        InitMethods = ngOnInit | ngAfterViewInit | ngAfterContentInit,
-        InitMethodsAndChanges = InitMethods | ngOnChanges,
-        All = InitMethodsAndChanges | ngDoCheck,
-      }
-
-      function forEachMethod(methods: LifetimeMethods, cb: (method: LifetimeMethods) => void) {
-        if (methods & LifetimeMethods.ngOnInit) cb(LifetimeMethods.ngOnInit);
-        if (methods & LifetimeMethods.ngOnChanges) cb(LifetimeMethods.ngOnChanges);
-        if (methods & LifetimeMethods.ngAfterContentInit) cb(LifetimeMethods.ngAfterContentInit);
-        if (methods & LifetimeMethods.ngAfterViewInit) cb(LifetimeMethods.ngAfterViewInit);
-        if (methods & LifetimeMethods.ngDoCheck) cb(LifetimeMethods.ngDoCheck);
-      }
-
-      interface Options {
-        childRecursion: LifetimeMethods;
-        childThrows: LifetimeMethods;
-      }
-
-      describe('calling init', () => {
-        function initialize(options: Options) {
-          @Component({selector: 'my-child', template: ''})
-          class MyChild {
-            private thrown = LifetimeMethods.None;
-
-            @Input() inp: boolean;
-            @Output() outp = new EventEmitter<any>();
-
-            constructor() {}
-
-            ngDoCheck() { this.check(LifetimeMethods.ngDoCheck); }
-            ngOnInit() { this.check(LifetimeMethods.ngOnInit); }
-            ngOnChanges() { this.check(LifetimeMethods.ngOnChanges); }
-            ngAfterViewInit() { this.check(LifetimeMethods.ngAfterViewInit); }
-            ngAfterContentInit() { this.check(LifetimeMethods.ngAfterContentInit); }
-
-            private check(method: LifetimeMethods) {
-              log(`MyChild::${LifetimeMethods[method]}()`);
-
-              if ((options.childRecursion & method) !== 0) {
-                if (logged.length < 20) {
-                  this.outp.emit(null);
-                } else {
-                  fail(`Unexpected MyChild::${LifetimeMethods[method]} recursion`);
-                }
-              }
-              if ((options.childThrows & method) !== 0) {
-                if ((this.thrown & method) === 0) {
-                  this.thrown |= method;
-                  log(`<THROW from MyChild::${LifetimeMethods[method]}>()`);
-                  throw new Error(`Throw from MyChild::${LifetimeMethods[method]}`);
-                }
-              }
-            }
-          }
-
-          @Component({
-            selector: 'my-component',
-            template: `<my-child [inp]='true' (outp)='onOutp()'></my-child>`
-          })
-          class MyComponent {
-            constructor(private changeDetectionRef: ChangeDetectorRef) {}
-            ngDoCheck() { this.check(LifetimeMethods.ngDoCheck); }
-            ngOnInit() { this.check(LifetimeMethods.ngOnInit); }
-            ngAfterViewInit() { this.check(LifetimeMethods.ngAfterViewInit); }
-            ngAfterContentInit() { this.check(LifetimeMethods.ngAfterContentInit); }
-            onOutp() {
-              log('<RECURSION START>');
-              this.changeDetectionRef.detectChanges();
-              log('<RECURSION DONE>');
-            }
-
-            private check(method: LifetimeMethods) {
-              log(`MyComponent::${LifetimeMethods[method]}()`);
-            }
-          }
-
-          TestBed.configureTestingModule({declarations: [MyChild, MyComponent]});
-
-          return createCompFixture(`<my-component></my-component>`);
-        }
-
-        function ensureOneInit(options: Options) {
-          const ctx = initialize(options);
-
-
-          const throws = options.childThrows != LifetimeMethods.None;
-          if (throws) {
-            log(`<CYCLE 0 START>`);
-            expect(() => {
-              // Expect child to throw.
-              ctx.detectChanges();
-            }).toThrow();
-            log(`<CYCLE 0 END>`);
-            log(`<CYCLE 1 START>`);
-          }
-          ctx.detectChanges();
-          if (throws) log(`<CYCLE 1 DONE>`);
-          expectOnceAndOnlyOnce('MyComponent::ngOnInit()');
-          expectOnceAndOnlyOnce('MyChild::ngOnInit()');
-          expectOnceAndOnlyOnce('MyComponent::ngAfterViewInit()');
-          expectOnceAndOnlyOnce('MyComponent::ngAfterContentInit()');
-          expectOnceAndOnlyOnce('MyChild::ngAfterViewInit()');
-          expectOnceAndOnlyOnce('MyChild::ngAfterContentInit()');
-        }
-
-        forEachMethod(LifetimeMethods.InitMethodsAndChanges, method => {
-          it(`should ensure that init hooks are called once an only once with recursion in ${LifetimeMethods[method]} `,
-             () => {
-               // Ensure all the init methods are called once.
-               ensureOneInit({childRecursion: method, childThrows: LifetimeMethods.None});
-             });
-        });
-        forEachMethod(LifetimeMethods.All, method => {
-          it(`should ensure that init hooks are called once an only once with a throw in ${LifetimeMethods[method]} `,
-             () => {
-               // Ensure all the init methods are called once.
-               // the first cycle throws but the next cycle should complete the inits.
-               ensureOneInit({childRecursion: LifetimeMethods.None, childThrows: method});
-             });
-        });
-      });
-    });
   });
 }
 

packages/core/test/linker/jit_summaries_integration_spec.ts

@@ -11,12 +11,10 @@ import {CompileMetadataResolver} from '@angular/compiler/src/metadata_resolver';
 import {MockResourceLoader} from '@angular/compiler/testing/src/resource_loader_mock';
 import {Component, Directive, Injectable, NgModule, Pipe, Type} from '@angular/core';
 import {TestBed, async, getTestBed} from '@angular/core/testing';
-import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 export function main() {
   describe('Jit Summaries', () => {
     let instances: Map<any, Base>;
-    let summaries: () => any[];
 
     class SomeDep {}
 
@@ -71,7 +69,7 @@ export function main() {
       TestBed.configureCompiler({providers: [{provide: ResourceLoader, useValue: resourceLoader}]});
       TestBed.configureTestingModule({imports: [SomeModule], providers: [SomeDep]});
 
-      let summariesPromise = TestBed.compileComponents().then(() => {
+      TestBed.compileComponents().then(() => {
         const metadataResolver = TestBed.get(CompileMetadataResolver) as CompileMetadataResolver;
         const summaries = [
           metadataResolver.getNgModuleSummary(SomeModule),
@@ -85,12 +83,10 @@ export function main() {
           metadataResolver.getInjectableSummary(SomeService)
         ];
         clearMetadata();
-        TestBed.resetTestingModule();
-        return () => summaries;
+        resetTestEnvironmentWithSummaries(() => summaries);
       });
 
       resourceLoader.flush();
-      return summariesPromise;
     }
 
     function setMetadata(resourceLoader: MockResourceLoader) {
@@ -127,14 +123,12 @@ export function main() {
 
     beforeEach(async(() => {
       instances = new Map<any, any>();
-      createSummaries().then(s => summaries = s);
+      createSummaries();
     }));
 
     afterEach(() => { resetTestEnvironmentWithSummaries(); });
 
     it('should use directive metadata from summaries', () => {
-      resetTestEnvironmentWithSummaries(summaries);
-
       @Component({template: '<div someDir></div>'})
       class TestComp {
       }
@@ -146,8 +140,6 @@ export function main() {
     });
 
     it('should use pipe metadata from summaries', () => {
-      resetTestEnvironmentWithSummaries(summaries);
-
       @Component({template: '{{1 | somePipe}}'})
       class TestComp {
       }
@@ -158,8 +150,6 @@ export function main() {
     });
 
     it('should use Service metadata from summaries', () => {
-      resetTestEnvironmentWithSummaries(summaries);
-
       TestBed.configureTestingModule({
         providers: [SomeService, SomeDep],
       });
@@ -168,8 +158,6 @@ export function main() {
     });
 
     it('should use NgModule metadata from summaries', () => {
-      resetTestEnvironmentWithSummaries(summaries);
-
       TestBed
           .configureTestingModule(
               {providers: [SomeDep], declarations: [TestComp3], imports: [SomeModule]})
@@ -182,16 +170,12 @@ export function main() {
     });
 
     it('should allow to create private components from imported NgModule summaries', () => {
-      resetTestEnvironmentWithSummaries(summaries);
-
       TestBed.configureTestingModule({providers: [SomeDep], imports: [SomeModule]})
           .createComponent(SomePrivateComponent);
       expectInstanceCreated(SomePrivateComponent);
     });
 
     it('should throw when trying to mock a type with a summary', () => {
-      resetTestEnvironmentWithSummaries(summaries);
-
       TestBed.resetTestingModule();
       expect(() => TestBed.overrideComponent(SomePrivateComponent, {add: {}}).compileComponents())
           .toThrowError(
@@ -206,47 +190,5 @@ export function main() {
       expect(() => TestBed.overrideModule(SomeModule, {add: {}}).compileComponents())
           .toThrowError('SomeModule was AOT compiled, so its metadata cannot be changed.');
     });
-
-    it('should allow to add summaries via configureTestingModule', () => {
-      resetTestEnvironmentWithSummaries();
-
-      @Component({template: '<div someDir></div>'})
-      class TestComp {
-      }
-
-      TestBed
-          .configureTestingModule({
-            providers: [SomeDep],
-            declarations: [TestComp, SomeDirective],
-            aotSummaries: summaries
-          })
-          .createComponent(TestComp);
-      expectInstanceCreated(SomeDirective);
-    });
-
-    it('should allow to override a provider', () => {
-      resetTestEnvironmentWithSummaries(summaries);
-
-      const overwrittenValue = {};
-
-      const fixture =
-          TestBed.overrideProvider(SomeDep, {useFactory: () => overwrittenValue, deps: []})
-              .configureTestingModule({providers: [SomeDep], imports: [SomeModule]})
-              .createComponent<SomePublicComponent>(SomePublicComponent);
-
-      expect(fixture.componentInstance.dep).toBe(overwrittenValue);
-    });
-
-    it('should allow to override a template', () => {
-      resetTestEnvironmentWithSummaries(summaries);
-
-      TestBed.overrideTemplateUsingTestingModule(SomePublicComponent, 'overwritten');
-
-      const fixture = TestBed.configureTestingModule({providers: [SomeDep], imports: [SomeModule]})
-                          .createComponent(SomePublicComponent);
-      expectInstanceCreated(SomePublicComponent);
-
-      expect(fixture.nativeElement).toHaveText('overwritten');
-    });
   });
 }

packages/core/testing/src/test_bed.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectionToken, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, StaticProvider, Type, ɵDepFlags as DepFlags, ɵNodeFlags as NodeFlags, ɵclearOverrides as clearOverrides, ɵgetComponentViewDefinitionFactory as getComponentViewDefinitionFactory, ɵoverrideComponentView as overrideComponentView, ɵoverrideProvider as overrideProvider, ɵstringify as stringify} from '@angular/core';
+import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectionToken, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, Type, ɵDepFlags as DepFlags, ɵNodeFlags as NodeFlags, ɵclearProviderOverrides as clearProviderOverrides, ɵoverrideProvider as overrideProvider, ɵstringify as stringify} from '@angular/core';
 
 import {AsyncTestCompleter} from './async_test_completer';
 import {ComponentFixture} from './component_fixture';
@@ -45,7 +45,6 @@ export type TestModuleMetadata = {
   declarations?: any[],
   imports?: any[],
   schemas?: Array<SchemaMetadata|any[]>,
-  aotSummaries?: () => any[],
 };
 
 /**
@@ -142,29 +141,15 @@ export class TestBed implements Injector {
     return TestBed;
   }
 
-  /**
-   * Overrides the template of the given component, compiling the template
-   * in the context of the TestingModule.
-   *
-   * Note: This works for JIT and AOTed components as well.
-   */
-  static overrideTemplateUsingTestingModule(component: Type<any>, template: string):
-      typeof TestBed {
-    getTestBed().overrideTemplateUsingTestingModule(component, template);
-    return TestBed;
-  }
-
 
   /**
    * Overwrites all providers for the given token with the given provider definition.
-   *
-   * Note: This works for JIT and AOTed components as well.
    */
   static overrideProvider(token: any, provider: {
     useFactory: Function,
     deps: any[],
-  }): typeof TestBed;
-  static overrideProvider(token: any, provider: {useValue: any;}): typeof TestBed;
+  }): void;
+  static overrideProvider(token: any, provider: {useValue: any;}): void;
   static overrideProvider(token: any, provider: {
     useFactory?: Function,
     useValue?: any,
@@ -220,9 +205,7 @@ export class TestBed implements Injector {
   private _schemas: Array<SchemaMetadata|any[]> = [];
   private _activeFixtures: ComponentFixture<any>[] = [];
 
-  private _testEnvAotSummaries: () => any[] = () => [];
-  private _aotSummaries: Array<() => any[]> = [];
-  private _templateOverrides: Array<{component: Type<any>, templateOf: Type<any>}> = [];
+  private _aotSummaries: () => any[] = () => [];
 
   platform: PlatformRef = null !;
 
@@ -249,7 +232,7 @@ export class TestBed implements Injector {
     this.platform = platform;
     this.ngModule = ngModule;
     if (aotSummaries) {
-      this._testEnvAotSummaries = aotSummaries;
+      this._aotSummaries = aotSummaries;
     }
   }
 
@@ -262,13 +245,11 @@ export class TestBed implements Injector {
     this.resetTestingModule();
     this.platform = null !;
     this.ngModule = null !;
-    this._testEnvAotSummaries = () => [];
+    this._aotSummaries = () => [];
   }
 
   resetTestingModule() {
-    clearOverrides();
-    this._aotSummaries = [];
-    this._templateOverrides = [];
+    clearProviderOverrides();
     this._compiler = null !;
     this._moduleOverrides = [];
     this._componentOverrides = [];
@@ -312,9 +293,6 @@ export class TestBed implements Injector {
     if (moduleDef.schemas) {
       this._schemas.push(...moduleDef.schemas);
     }
-    if (moduleDef.aotSummaries) {
-      this._aotSummaries.push(moduleDef.aotSummaries);
-    }
   }
 
   compileComponents(): Promise<any> {
@@ -349,11 +327,6 @@ export class TestBed implements Injector {
         }
       }
     }
-    for (const {component, templateOf} of this._templateOverrides) {
-      const compFactory = this._compiler.getComponentFactory(templateOf);
-      overrideComponentView(component, compFactory);
-    }
-
     const ngZone = new NgZone({enableLongStackTrace: true});
     const ngZoneInjector =
         Injector.create([{provide: NgZone, useValue: ngZone}], this.platform.injector);
@@ -366,8 +339,7 @@ export class TestBed implements Injector {
 
   private _createCompilerAndModule(): Type<any> {
     const providers = this._providers.concat([{provide: TestBed, useValue: this}]);
-    const declarations =
-        [...this._declarations, ...this._templateOverrides.map(entry => entry.templateOf)];
+    const declarations = this._declarations;
     const imports = [this.ngModule, this._imports];
     const schemas = this._schemas;
 
@@ -378,9 +350,7 @@ export class TestBed implements Injector {
     const compilerFactory: TestingCompilerFactory =
         this.platform.injector.get(TestingCompilerFactory);
     this._compiler = compilerFactory.createTestingCompiler(this._compilerOptions);
-    for (const summary of [this._testEnvAotSummaries, ...this._aotSummaries]) {
-      this._compiler.loadAotSummaries(summary);
-    }
+    this._compiler.loadAotSummaries(this._aotSummaries);
     this._moduleOverrides.forEach((entry) => this._compiler.overrideModule(entry[0], entry[1]));
     this._componentOverrides.forEach(
         (entry) => this._compiler.overrideComponent(entry[0], entry[1]));
@@ -500,16 +470,6 @@ export class TestBed implements Injector {
     overrideProvider({token, flags, deps, value, deprecatedBehavior: deprecated});
   }
 
-  overrideTemplateUsingTestingModule(component: Type<any>, template: string) {
-    this._assertNotInstantiated('overrideTemplateUsingTestingModule', 'override template');
-
-    @Component({selector: 'empty', template})
-    class OverrideComponent {
-    }
-
-    this._templateOverrides.push({component, templateOf: OverrideComponent});
-  }
-
   createComponent<T>(component: Type<T>): ComponentFixture<T> {
     this._initIfNeeded();
     const componentFactory = this._compiler.getComponentFactory(component);

packages/examples/upgrade/static/ts/module.ts

@@ -135,7 +135,7 @@ ng1AppModule.component('ng1Hero', {
 // This AngularJS service will be "upgraded" to be used in Angular
 ng1AppModule.factory(
     'titleCase',
-    (() => (value: string) => value.replace(/((^|\s)[a-z])/g, (_, c) => c.toUpperCase())) as any);
+    () => (value: string) => value.replace(/((^|\s)[a-z])/g, (_, c) => c.toUpperCase()));
 // #enddocregion
 
 // #docregion downgrade-ng2-heroes-service
@@ -154,20 +154,18 @@ ng1AppModule.component('exampleApp', {
   // We inject the "downgraded" HeroesService into this AngularJS component
   // (We don't need the `HeroesService` type for AngularJS DI - it just helps with TypeScript
   // compilation)
-  controller:
-      [
-        'heroesService',
-        function(heroesService: HeroesService) { this.heroesService = heroesService; }
-      ],
-      // This template make use of the downgraded `ng2-heroes` component
-      // Note that because its element is compiled by AngularJS we must use kebab-case attributes
-      // for inputs and outputs
-      template: `<link rel="stylesheet" href="./styles.css">
+  controller: [
+    'heroesService', function(heroesService: HeroesService) { this.heroesService = heroesService; }
+  ],
+  // This template make use of the downgraded `ng2-heroes` component
+  // Note that because its element is compiled by AngularJS we must use kebab-case attributes for
+  // inputs and outputs
+  template: `<link rel="stylesheet" href="./styles.css">
              <ng2-heroes [heroes]="$ctrl.heroesService.heroes" (add-hero)="$ctrl.heroesService.addHero()" (remove-hero)="$ctrl.heroesService.removeHero($event)">
                <h1>Heroes</h1>
                <p class="extra">There are {{ $ctrl.heroesService.heroes.length }} heroes.</p>
              </ng2-heroes>`
-} as any);
+});
 // #enddocregion
 // #enddocregion
 

packages/language-service/src/ts_plugin.ts

@@ -179,13 +179,7 @@ export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageS
   }
 
   function completionToEntry(c: Completion): ts.CompletionEntry {
-    return {
-      // TODO: remove any and fix type error.
-      kind: c.kind as any,
-      name: c.name,
-      sortText: c.sort,
-      kindModifiers: ''
-    };
+    return {kind: c.kind, name: c.name, sortText: c.sort, kindModifiers: ''};
   }
 
   function diagnosticToDiagnostic(d: Diagnostic, file: ts.SourceFile): ts.Diagnostic {
@@ -300,10 +294,9 @@ export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageS
                    fileName: loc.fileName,
                    textSpan: {start: loc.span.start, length: loc.span.end - loc.span.start},
                    name: '',
-                   // TODO: remove any and fix type error.
-                   kind: 'definition' as any,
+                   kind: 'definition',
                    containerName: loc.fileName,
-                   containerKind: 'file' as any,
+                   containerKind: 'file'
                  });
                }
              }

packages/language-service/src/typescript_host.ts

@@ -376,9 +376,6 @@ export class TypeScriptServiceHost implements LanguageServiceHost {
       if (compilerOptions && compilerOptions.baseUrl) {
         options.baseUrl = compilerOptions.baseUrl;
       }
-      if (compilerOptions && compilerOptions.paths) {
-        options.paths = compilerOptions.paths;
-      }
       result = this._reflectorHost =
           new ReflectorHost(() => this.tsService.getProgram(), this.host, options);
     }

packages/language-service/test/completions_spec.ts

@@ -160,33 +160,6 @@ export class MyComponent {
 
   });
 
-  it('should respect paths configuration', () => {
-    mockHost.overrideOptions(options => {
-      options.baseUrl = '/app';
-      options.paths = {'bar/*': ['foo/bar/*']};
-      return options;
-    });
-    mockHost.addScript('/app/foo/bar/shared.ts', `
-      export interface Node {
-        children: Node[];
-      }
-    `);
-    mockHost.addScript('/app/my.component.ts', `
-      import { Component } from '@angular/core';
-      import { Node } from 'bar/shared';
-
-      @Component({
-        selector: 'my-component',
-        template: '{{tree.~{tree} }}'
-      })
-      export class MyComponent {
-        tree: Node;
-      }
-    `);
-    ngHost.updateAnalyzedModules();
-    contains('/app/my.component.ts', 'tree', 'children');
-  });
-
   function addCode(code: string, cb: (fileName: string, content?: string) => void) {
     const fileName = '/app/app.component.ts';
     const originalContent = mockHost.getFileContent(fileName);

packages/platform-browser/test/testing_public_spec.ts

@@ -712,60 +712,6 @@ export function main() {
         });
       });
 
-      describe('overrideTemplateUsingTestingModule', () => {
-        it('should compile the template in the context of the testing module', () => {
-          @Component({selector: 'comp', template: 'a'})
-          class MyComponent {
-            prop = 'some prop';
-          }
-
-          let testDir: TestDir|undefined;
-
-          @Directive({selector: '[test]'})
-          class TestDir {
-            constructor() { testDir = this; }
-
-            @Input('test')
-            test: string;
-          }
-
-          TestBed.overrideTemplateUsingTestingModule(
-              MyComponent, '<div [test]="prop">Hello world!</div>');
-
-          const fixture = TestBed.configureTestingModule({declarations: [MyComponent, TestDir]})
-                              .createComponent(MyComponent);
-          fixture.detectChanges();
-          expect(fixture.nativeElement).toHaveText('Hello world!');
-          expect(testDir).toBeAnInstanceOf(TestDir);
-          expect(testDir !.test).toBe('some prop');
-        });
-
-        it('should throw if the TestBed is already created', () => {
-          @Component({selector: 'comp', template: 'a'})
-          class MyComponent {
-          }
-
-          TestBed.get(Injector);
-
-          expect(() => TestBed.overrideTemplateUsingTestingModule(MyComponent, 'b'))
-              .toThrowError(
-                  /Cannot override template when the test module has already been instantiated/);
-        });
-
-        it('should reset overrides when the testing module is resetted', () => {
-          @Component({selector: 'comp', template: 'a'})
-          class MyComponent {
-          }
-
-          TestBed.overrideTemplateUsingTestingModule(MyComponent, 'b');
-
-          const fixture = TestBed.resetTestingModule()
-                              .configureTestingModule({declarations: [MyComponent]})
-                              .createComponent(MyComponent);
-          expect(fixture.nativeElement).toHaveText('a');
-        });
-      });
-
       describe('setting up the compiler', () => {
 
         describe('providers', () => {

packages/platform-server/test/integration_spec.ts

@@ -592,7 +592,7 @@ export function main() {
            platform.bootstrapModule(ExampleModule).then(ref => {
              const mock = ref.injector.get(MockBackend);
              const http = ref.injector.get(Http);
-             ref.injector.get<NgZone>(NgZone).run(() => {
+             ref.injector.get(NgZone).run(() => {
                NgZone.assertInAngularZone();
                mock.connections.subscribe((mc: MockConnection) => {
                  NgZone.assertInAngularZone();
@@ -612,11 +612,11 @@ export function main() {
            platform.bootstrapModule(ExampleModule).then(ref => {
              const mock = ref.injector.get(MockBackend);
              const http = ref.injector.get(Http);
-             expect(ref.injector.get<NgZone>(NgZone).hasPendingMacrotasks).toBeFalsy();
-             ref.injector.get<NgZone>(NgZone).run(() => {
+             expect(ref.injector.get(NgZone).hasPendingMacrotasks).toBeFalsy();
+             ref.injector.get(NgZone).run(() => {
                NgZone.assertInAngularZone();
                mock.connections.subscribe((mc: MockConnection) => {
-                 expect(ref.injector.get<NgZone>(NgZone).hasPendingMacrotasks).toBeTruthy();
+                 expect(ref.injector.get(NgZone).hasPendingMacrotasks).toBeTruthy();
                  mc.mockRespond(new Response(new ResponseOptions({body: 'success!', status: 200})));
                });
                http.get('http://localhost/testing').subscribe(resp => {
@@ -631,11 +631,11 @@ export function main() {
            platform.bootstrapModule(HttpBeforeExampleModule).then(ref => {
              const mock = ref.injector.get(MockBackend);
              const http = ref.injector.get(Http);
-             expect(ref.injector.get<NgZone>(NgZone).hasPendingMacrotasks).toBeFalsy();
-             ref.injector.get<NgZone>(NgZone).run(() => {
+             expect(ref.injector.get(NgZone).hasPendingMacrotasks).toBeFalsy();
+             ref.injector.get(NgZone).run(() => {
                NgZone.assertInAngularZone();
                mock.connections.subscribe((mc: MockConnection) => {
-                 expect(ref.injector.get<NgZone>(NgZone).hasPendingMacrotasks).toBeTruthy();
+                 expect(ref.injector.get(NgZone).hasPendingMacrotasks).toBeTruthy();
                  mc.mockRespond(new Response(new ResponseOptions({body: 'success!', status: 200})));
                });
                http.get('http://localhost/testing').subscribe(resp => {
@@ -650,11 +650,11 @@ export function main() {
            platform.bootstrapModule(HttpAfterExampleModule).then(ref => {
              const mock = ref.injector.get(MockBackend);
              const http = ref.injector.get(Http);
-             expect(ref.injector.get<NgZone>(NgZone).hasPendingMacrotasks).toBeFalsy();
-             ref.injector.get<NgZone>(NgZone).run(() => {
+             expect(ref.injector.get(NgZone).hasPendingMacrotasks).toBeFalsy();
+             ref.injector.get(NgZone).run(() => {
                NgZone.assertInAngularZone();
                mock.connections.subscribe((mc: MockConnection) => {
-                 expect(ref.injector.get<NgZone>(NgZone).hasPendingMacrotasks).toBeTruthy();
+                 expect(ref.injector.get(NgZone).hasPendingMacrotasks).toBeTruthy();
                  mc.mockRespond(new Response(new ResponseOptions({body: 'success!', status: 200})));
                });
                http.get('http://localhost/testing').subscribe(resp => {
@@ -688,7 +688,7 @@ export function main() {
            platform.bootstrapModule(HttpClientExmapleModule).then(ref => {
              const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
              const http = ref.injector.get(HttpClient);
-             ref.injector.get<NgZone>(NgZone).run(() => {
+             ref.injector.get(NgZone).run(() => {
                http.get('http://localhost/testing').subscribe(body => {
                  NgZone.assertInAngularZone();
                  expect(body).toEqual('success!');
@@ -703,13 +703,13 @@ export function main() {
            platform.bootstrapModule(HttpClientExmapleModule).then(ref => {
              const mock = ref.injector.get(HttpTestingController) as HttpTestingController;
              const http = ref.injector.get(HttpClient);
-             ref.injector.get<NgZone>(NgZone).run(() => {
+             ref.injector.get(NgZone).run(() => {
                http.get('http://localhost/testing').subscribe(body => {
                  expect(body).toEqual('success!');
                });
-               expect(ref.injector.get<NgZone>(NgZone).hasPendingMacrotasks).toBeTruthy();
+               expect(ref.injector.get(NgZone).hasPendingMacrotasks).toBeTruthy();
                mock.expectOne('http://localhost/testing').flush('success!');
-               expect(ref.injector.get<NgZone>(NgZone).hasPendingMacrotasks).toBeFalsy();
+               expect(ref.injector.get(NgZone).hasPendingMacrotasks).toBeFalsy();
              });
            });
          }));

packages/platform-webworker/src/web_workers/ui/location_providers.ts

@@ -32,7 +32,7 @@ export const WORKER_UI_LOCATION_PROVIDERS = <StaticProvider[]>[
 
 function initUiLocation(injector: Injector): () => void {
   return () => {
-    const zone = injector.get<NgZone>(NgZone);
+    const zone = injector.get(NgZone);
 
     zone.runGuarded(() => injector.get(MessageBasedPlatformLocation).start());
   };

packages/platform-webworker/src/worker_render.ts

@@ -112,7 +112,7 @@ export const _WORKER_UI_PLATFORM_PROVIDERS: StaticProvider[] = [
 
 function initializeGenericWorkerRenderer(injector: Injector) {
   const bus = injector.get(MessageBus);
-  const zone = injector.get<NgZone>(NgZone);
+  const zone = injector.get(NgZone);
   bus.attachToZone(zone);
 
   // initialize message services after the bus has been created

packages/router/src/router.ts

@@ -43,12 +43,12 @@ declare let Zone: any;
  */
 export interface NavigationExtras {
   /**
-   * Enables relative navigation from the current ActivatedRoute.
-   *
-   * Configuration:
-   *
-   * ```
-   * [{
+  * Enables relative navigation from the current ActivatedRoute.
+  *
+  * Configuration:
+  *
+  * ```
+  * [{
   *   path: 'parent',
   *   component: ParentComponent,
   *   children: [{
@@ -59,92 +59,92 @@ export interface NavigationExtras {
   *     component: ChildComponent
   *   }]
   * }]
-   * ```
-   *
-   * Navigate to list route from child route:
-   *
-   * ```
-   *  @Component({...})
-   *  class ChildComponent {
+  * ```
+  *
+  * Navigate to list route from child route:
+  *
+  * ```
+  *  @Component({...})
+  *  class ChildComponent {
   *    constructor(private router: Router, private route: ActivatedRoute) {}
   *
   *    go() {
   *      this.router.navigate(['../list'], { relativeTo: this.route });
   *    }
   *  }
-   * ```
-   */
+  * ```
+  */
   relativeTo?: ActivatedRoute|null;
 
   /**
-   * Sets query parameters to the URL.
-   *
-   * ```
-   * // Navigate to /results?page=1
-   * this.router.navigate(['/results'], { queryParams: { page: 1 } });
-   * ```
-   */
+  * Sets query parameters to the URL.
+  *
+  * ```
+  * // Navigate to /results?page=1
+  * this.router.navigate(['/results'], { queryParams: { page: 1 } });
+  * ```
+  */
   queryParams?: Params|null;
 
   /**
-   * Sets the hash fragment for the URL.
-   *
-   * ```
-   * // Navigate to /results#top
-   * this.router.navigate(['/results'], { fragment: 'top' });
-   * ```
-   */
+  * Sets the hash fragment for the URL.
+  *
+  * ```
+  * // Navigate to /results#top
+  * this.router.navigate(['/results'], { fragment: 'top' });
+  * ```
+  */
   fragment?: string;
 
   /**
-   * Preserves the query parameters for the next navigation.
-   *
-   * deprecated, use `queryParamsHandling` instead
-   *
-   * ```
-   * // Preserve query params from /results?page=1 to /view?page=1
-   * this.router.navigate(['/view'], { preserveQueryParams: true });
-   * ```
-   *
-   * @deprecated since v4
-   */
+  * Preserves the query parameters for the next navigation.
+  *
+  * deprecated, use `queryParamsHandling` instead
+  *
+  * ```
+  * // Preserve query params from /results?page=1 to /view?page=1
+  * this.router.navigate(['/view'], { preserveQueryParams: true });
+  * ```
+  *
+  * @deprecated since v4
+  */
   preserveQueryParams?: boolean;
 
   /**
-   *  config strategy to handle the query parameters for the next navigation.
-   *
-   * ```
-   * // from /results?page=1 to /view?page=1&page=2
-   * this.router.navigate(['/view'], { queryParams: { page: 2 },  queryParamsHandling: "merge" });
-   * ```
-   */
+  *  config strategy to handle the query parameters for the next navigation.
+  *
+  * ```
+  * // from /results?page=1 to /view?page=1&page=2
+  * this.router.navigate(['/view'], { queryParams: { page: 2 },  queryParamsHandling: "merge" });
+  * ```
+  */
   queryParamsHandling?: QueryParamsHandling|null;
   /**
-   * Preserves the fragment for the next navigation
-   *
-   * ```
-   * // Preserve fragment from /results#top to /view#top
-   * this.router.navigate(['/view'], { preserveFragment: true });
-   * ```
-   */
+  * Preserves the fragment for the next navigation
+  *
+  * ```
+  * // Preserve fragment from /results#top to /view#top
+  * this.router.navigate(['/view'], { preserveFragment: true });
+  * ```
+  */
   preserveFragment?: boolean;
   /**
-   * Navigates without pushing a new state into history.
-   *
-   * ```
-   * // Navigate silently to /view
-   * this.router.navigate(['/view'], { skipLocationChange: true });
-   * ```
-   */
+  * Navigates without pushing a new state into history.
+  *
+  * ```
+  * // Navigate silently to /view
+  * this.router.navigate(['/view'], { skipLocationChange: true });
+  * ```
+  */
   skipLocationChange?: boolean;
   /**
-   * Navigates while replacing the current state in history.
-   *
-   * ```
-   * // Navigate to /view
-   * this.router.navigate(['/view'], { replaceUrl: true });
-   * ```
-   */
+  * Navigates while replacing the current state in history.
+  *
+  * ```
+  * // Navigate to /view
+  * this.router.navigate(['/view'], { replaceUrl: true });
+  * ```
+  */
   replaceUrl?: boolean;
 }
 
@@ -241,14 +241,6 @@ export class Router {
 
   routeReuseStrategy: RouteReuseStrategy = new DefaultRouteReuseStrategy();
 
-  /**
-   * Define what the router should do if it receives a navigation request to the current URL.
-   * By default, the router will ignore this navigation. However, this prevents features such
-   * as a "refresh" button. Use this option to configure the behavior when navigating to the
-   * current URL. Default is 'ignore'.
-   */
-  onSameUrlNavigation: 'reload'|'ignore' = 'ignore';
-
   /**
    * Creates the router service.
    */
@@ -526,18 +518,11 @@ export class Router {
 
     // Because of a bug in IE and Edge, the location class fires two events (popstate and
     // hashchange) every single time. The second one should be ignored. Otherwise, the URL will
-    // flicker. Handles the case when a popstate was emitted first.
+    // flicker.
     if (lastNavigation && source == 'hashchange' && lastNavigation.source === 'popstate' &&
         lastNavigation.rawUrl.toString() === rawUrl.toString()) {
       return Promise.resolve(true);  // return value is not used
     }
-    // Because of a bug in IE and Edge, the location class fires two events (popstate and
-    // hashchange) every single time. The second one should be ignored. Otherwise, the URL will
-    // flicker. Handles the case when a hashchange was emitted first.
-    if (lastNavigation && source == 'popstate' && lastNavigation.source === 'hashchange' &&
-        lastNavigation.rawUrl.toString() === rawUrl.toString()) {
-      return Promise.resolve(true);  // return value is not used
-    }
 
     let resolve: any = null;
     let reject: any = null;
@@ -560,8 +545,7 @@ export class Router {
     const url = this.urlHandlingStrategy.extract(rawUrl);
     const urlTransition = !this.navigated || url.toString() !== this.currentUrlTree.toString();
 
-    if ((this.onSameUrlNavigation === 'reload' ? true : urlTransition) &&
-        this.urlHandlingStrategy.shouldProcessUrl(rawUrl)) {
+    if (urlTransition && this.urlHandlingStrategy.shouldProcessUrl(rawUrl)) {
       (this.events as Subject<Event>).next(new NavigationStart(id, this.serializeUrl(url)));
       Promise.resolve()
           .then(
@@ -589,9 +573,10 @@ export class Router {
   }
 
   private runNavigate(
-      url: UrlTree, rawUrl: UrlTree, skipLocationChange: boolean, replaceUrl: boolean, id: number,
-      precreatedState: RouterStateSnapshot|null): Promise<boolean> {
+      url: UrlTree, rawUrl: UrlTree, shouldPreventPushState: boolean, shouldReplaceUrl: boolean,
+      id: number, precreatedState: RouterStateSnapshot|null): Promise<boolean> {
     if (id !== this.navigationId) {
+      this.location.go(this.urlSerializer.serialize(this.currentUrlTree));
       (this.events as Subject<Event>)
           .next(new NavigationCancel(
               id, this.serializeUrl(url),
@@ -713,9 +698,9 @@ export class Router {
 
             (this as{routerState: RouterState}).routerState = state;
 
-            if (!skipLocationChange) {
+            if (!shouldPreventPushState) {
               const path = this.urlSerializer.serialize(this.rawUrlTree);
-              if (this.location.isCurrentPathEqualTo(path) || replaceUrl) {
+              if (this.location.isCurrentPathEqualTo(path) || shouldReplaceUrl) {
                 this.location.replaceState(path);
               } else {
                 this.location.go(path);
@@ -763,13 +748,14 @@ export class Router {
                 (this as{routerState: RouterState}).routerState = storedState;
                 this.currentUrlTree = storedUrl;
                 this.rawUrlTree = this.urlHandlingStrategy.merge(this.currentUrlTree, rawUrl);
-                this.resetUrlToCurrentUrlTree();
+                this.location.replaceState(this.serializeUrl(this.rawUrlTree));
               });
     });
   }
 
   private resetUrlToCurrentUrlTree(): void {
-    this.location.replaceState(this.urlSerializer.serialize(this.rawUrlTree));
+    const path = this.urlSerializer.serialize(this.rawUrlTree);
+    this.location.replaceState(path);
   }
 }
 

packages/router/src/router_module.ts

@@ -129,15 +129,12 @@ export class RouterModule {
    * Creates a module with all the router providers and directives. It also optionally sets up an
    * application listener to perform an initial navigation.
    *
-   * Options (see {@link ExtraOptions}):
+   * Options:
    * * `enableTracing` makes the router log all its internal events to the console.
    * * `useHash` enables the location strategy that uses the URL fragment instead of the history
    * API.
    * * `initialNavigation` disables the initial navigation.
    * * `errorHandler` provides a custom error handler.
-   * * `preloadingStrategy` configures a preloading strategy (see {@link PreloadAllModules}).
-   * * `onSameUrlNavigation` configures how the router handles navigation to the current URL. See
-   * {@link ExtraOptions} for more details.
    */
   static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders {
     return {
@@ -270,14 +267,6 @@ export interface ExtraOptions {
    * Configures a preloading strategy. See {@link PreloadAllModules}.
    */
   preloadingStrategy?: any;
-
-  /**
-   * Define what the router should do if it receives a navigation request to the current URL.
-   * By default, the router will ignore this navigation. However, this prevents features such
-   * as a "refresh" button. Use this option to configure the behavior when navigating to the
-   * current URL. Default is 'ignore'.
-   */
-  onSameUrlNavigation?: 'reload'|'ignore';
 }
 
 export function setupRouter(
@@ -310,10 +299,6 @@ export function setupRouter(
     });
   }
 
-  if (opts.onSameUrlNavigation) {
-    router.onSameUrlNavigation = opts.onSameUrlNavigation;
-  }
-
   return router;
 }
 
@@ -381,7 +366,7 @@ export class RouterInitializer {
     const opts = this.injector.get(ROUTER_CONFIGURATION);
     const preloader = this.injector.get(RouterPreloader);
     const router = this.injector.get(Router);
-    const ref = this.injector.get<ApplicationRef>(ApplicationRef);
+    const ref = this.injector.get(ApplicationRef);
 
     if (bootstrappedComponentRef !== ref.components[0]) {
       return;

packages/router/test/integration.spec.ts

@@ -12,7 +12,6 @@ import {ComponentFixture, TestBed, fakeAsync, inject, tick} from '@angular/core/
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {ActivatedRoute, ActivatedRouteSnapshot, ActivationEnd, ActivationStart, CanActivate, CanDeactivate, ChildActivationEnd, ChildActivationStart, DetachedRouteHandle, Event, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, PRIMARY_OUTLET, ParamMap, Params, PreloadAllModules, PreloadingStrategy, Resolve, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, Router, RouterEvent, RouterModule, RouterPreloader, RouterStateSnapshot, RoutesRecognized, RunGuardsAndResolvers, UrlHandlingStrategy, UrlSegmentGroup, UrlTree} from '@angular/router';
-import {SpyLocation} from 'common/testing';
 import {Observable} from 'rxjs/Observable';
 import {Observer} from 'rxjs/Observer';
 import {of } from 'rxjs/observable/of';
@@ -51,89 +50,6 @@ describe('Integration', () => {
        expect(fixture.nativeElement).toHaveText('route');
      })));
 
-  describe('navigation', function() {
-    it('should navigate to the current URL', fakeAsync(inject([Router], (router: Router) => {
-         router.onSameUrlNavigation = 'reload';
-         router.resetConfig([
-           {path: '', component: SimpleCmp},
-           {path: 'simple', component: SimpleCmp},
-         ]);
-
-         const fixture = createRoot(router, RootCmp);
-         const events: Event[] = [];
-         router.events.subscribe(e => onlyNavigationStartAndEnd(e) && events.push(e));
-
-         router.navigateByUrl('/simple');
-         tick();
-
-         router.navigateByUrl('/simple');
-         tick();
-
-         expectEvents(events, [
-           [NavigationStart, '/simple'], [NavigationEnd, '/simple'], [NavigationStart, '/simple'],
-           [NavigationEnd, '/simple']
-         ]);
-       })));
-
-    it('should not pollute browser history when replaceUrl is set to true',
-       fakeAsync(inject([Router, Location], (router: Router, location: SpyLocation) => {
-         router.resetConfig([
-           {path: '', component: SimpleCmp}, {path: 'a', component: SimpleCmp},
-           {path: 'b', component: SimpleCmp}
-         ]);
-
-         const fixture = createRoot(router, RootCmp);
-
-         router.navigateByUrl('/a', {replaceUrl: true});
-         router.navigateByUrl('/b', {replaceUrl: true});
-         tick();
-
-         expect(location.urlChanges).toEqual(['replace: /', 'replace: /b']);
-       })));
-
-    it('should skip navigation if another navigation is already scheduled',
-       fakeAsync(inject([Router, Location], (router: Router, location: SpyLocation) => {
-         router.resetConfig([
-           {path: '', component: SimpleCmp}, {path: 'a', component: SimpleCmp},
-           {path: 'b', component: SimpleCmp}
-         ]);
-
-         const fixture = createRoot(router, RootCmp);
-
-         router.navigate(
-             ['/a'], {queryParams: {a: true}, queryParamsHandling: 'merge', replaceUrl: true});
-         router.navigate(
-             ['/b'], {queryParams: {b: true}, queryParamsHandling: 'merge', replaceUrl: true});
-         tick();
-
-         /**
-          * Why do we have '/b?b=true' and not '/b?a=true&b=true'?
-          *
-          * This is because the router has the right to stop a navigation mid-flight if another
-          * navigation has been already scheduled. This is why we can use a top-level guard
-          * to perform redirects. Calling `navigate` in such a guard will stop the navigation, and
-          * the components won't be instantiated.
-          *
-          * This is a fundamental property of the router: it only cares about its latest state.
-          *
-          * This means that components should only map params to something else, not reduce them.
-          * In other words, the following component is asking for trouble:
-          *
-          * ```
-          * class MyComponent {
-          *  constructor(a: ActivatedRoute) {
-          *    a.params.scan(...)
-          *  }
-          * }
-          * ```
-          *
-          * This also means "queryParamsHandling: 'merge'" should only be used to merge with
-          * long-living query parameters (e.g., debug).
-          */
-         expect(router.url).toEqual('/b?b=true');
-       })));
-  });
-
   describe('should execute navigations serially', () => {
     let log: any[] = [];
 
@@ -512,7 +428,7 @@ describe('Integration', () => {
        }]);
 
        const recordedEvents: any[] = [];
-       router.events.forEach(e => onlyNavigationStartAndEnd(e) && recordedEvents.push(e));
+       router.events.forEach(e => e instanceof RouterEvent && recordedEvents.push(e));
 
        router.navigateByUrl('/team/22/user/victor');
        advance(fixture);
@@ -526,8 +442,15 @@ describe('Integration', () => {
        expect(fixture.nativeElement).toHaveText('team 22 [ user fedor, right:  ]');
 
        expectEvents(recordedEvents, [
-         [NavigationStart, '/team/22/user/victor'], [NavigationEnd, '/team/22/user/victor'],
-         [NavigationStart, '/team/22/user/fedor'], [NavigationEnd, '/team/22/user/fedor']
+         [NavigationStart, '/team/22/user/victor'], [RoutesRecognized, '/team/22/user/victor'],
+         [GuardsCheckStart, '/team/22/user/victor'], [GuardsCheckEnd, '/team/22/user/victor'],
+         [ResolveStart, '/team/22/user/victor'], [ResolveEnd, '/team/22/user/victor'],
+         [NavigationEnd, '/team/22/user/victor'],
+
+         [NavigationStart, '/team/22/user/fedor'], [RoutesRecognized, '/team/22/user/fedor'],
+         [GuardsCheckStart, '/team/22/user/fedor'], [GuardsCheckEnd, '/team/22/user/fedor'],
+         [ResolveStart, '/team/22/user/fedor'], [ResolveEnd, '/team/22/user/fedor'],
+         [NavigationEnd, '/team/22/user/fedor']
        ]);
      })));
 
@@ -3715,10 +3638,6 @@ function expectEvents(events: Event[], pairs: any[]) {
   }
 }
 
-function onlyNavigationStartAndEnd(e: Event): boolean {
-  return e instanceof NavigationStart || e instanceof NavigationEnd;
-}
-
 @Component(
     {selector: 'link-cmp', template: `<a routerLink="/team/33/simple" [target]="'_self'">link</a>`})
 class StringLinkCmp {

packages/upgrade/src/dynamic/upgrade_adapter.ts

@@ -399,7 +399,7 @@ export class UpgradeAdapter {
 
     Promise.all([this.ng2BootstrapDeferred.promise, ng1BootstrapPromise]).then(([ng1Injector]) => {
       angular.element(element).data !(controllerKey(INJECTOR_KEY), this.moduleRef !.injector);
-      this.moduleRef !.injector.get<NgZone>(NgZone).run(
+      this.moduleRef !.injector.get(NgZone).run(
           () => { (<any>upgrade)._bootstrapDone(this.moduleRef, ng1Injector); });
     }, onError);
     return upgrade;

packages/upgrade/src/dynamic/upgrade_ng1_adapter.ts

@@ -67,7 +67,7 @@ export class UpgradeNg1ComponentAdapterBuilder {
 
   extractBindings() {
     const btcIsObject = typeof this.directive !.bindToController === 'object';
-    if (btcIsObject && Object.keys(this.directive !.scope !).length) {
+    if (btcIsObject && Object.keys(this.directive !.scope).length) {
       throw new Error(
           `Binding definitions on scope and controller at the same time are not supported.`);
     }

packages/upgrade/src/static/upgrade_component.ts

@@ -227,7 +227,7 @@ export class UpgradeComponent implements OnInit, OnChanges, DoCheck, OnDestroy {
 
   private initializeBindings(directive: angular.IDirective) {
     const btcIsObject = typeof directive.bindToController === 'object';
-    if (btcIsObject && Object.keys(directive.scope !).length) {
+    if (btcIsObject && Object.keys(directive.scope).length) {
       throw new Error(
           `Binding definitions on scope and controller at the same time is not supported.`);
     }

tools/bazel.rc

@@ -1,46 +0,0 @@
-###############################
-# Typescript / Angular / Sass #
-###############################
-
-# Make compilation fast, by keeping a few copies of the compilers
-# running as daemons, and cache SourceFile AST's to reduce parse time.
-build --strategy=TypeScriptCompile=worker
-build --strategy=AngularTemplateCompile=worker
-
-###############################
-# Filesystem interactions     #
-###############################
-
-# Don't create bazel-* symlinks in the WORKSPACE directory.
-# These require .gitignore and may scare users.
-# Also, it's a workaround for https://github.com/bazelbuild/rules_typescript/issues/12
-# which affects the common case of having `tsconfig.json` in the WORKSPACE directory.
-#
-# Instead, you should run `bazel info bazel-bin` to find out where the outputs went.
-build --symlink_prefix=/
-
-# Performance: avoid stat'ing input files
-build --watchfs
-
-###############################
-# Output                      #
-###############################
-
-# Don't print all the .d.ts output locations after builds
-build --show_result=0
-
-# A more useful default output mode for bazel query
-# Prints eg. "ng_module rule //foo:bar" rather than just "//foo:bar"
-query --output=label_kind
-
-# Don't print every dependency in :node_modules, for example
-query --noimplicit_deps
-
-# By default, failing tests don't print any output, it goes to the log file
-test --test_output=errors
-
-# Show which actions are run under workers,
-# and print all the actions running in parallel.
-# Helps to demonstrate that bazel uses all the cores on the machine.
-build --experimental_ui
-test --experimental_ui

tools/public_api_guard/core/testing.d.ts

@@ -71,13 +71,13 @@ export declare class TestBed implements Injector {
     }): void;
     configureTestingModule(moduleDef: TestModuleMetadata): void;
     createComponent<T>(component: Type<T>): ComponentFixture<T>;
-    deprecatedOverrideProvider(token: any, provider: {
-        useValue: any;
-    }): void;
     /** @deprecated */ deprecatedOverrideProvider(token: any, provider: {
         useFactory: Function;
         deps: any[];
     }): void;
+    deprecatedOverrideProvider(token: any, provider: {
+        useValue: any;
+    }): void;
     execute(tokens: any[], fn: Function, context?: any): any;
     get(token: any, notFoundValue?: any): any;
     /** @experimental */ initTestEnvironment(ngModule: Type<any> | Type<any>[], platform: PlatformRef, aotSummaries?: () => any[]): void;
@@ -92,7 +92,6 @@ export declare class TestBed implements Injector {
     overrideProvider(token: any, provider: {
         useValue: any;
     }): void;
-    overrideTemplateUsingTestingModule(component: Type<any>, template: string): void;
     /** @experimental */ resetTestEnvironment(): void;
     resetTestingModule(): void;
     static compileComponents(): Promise<any>;
@@ -102,13 +101,13 @@ export declare class TestBed implements Injector {
     }): typeof TestBed;
     static configureTestingModule(moduleDef: TestModuleMetadata): typeof TestBed;
     static createComponent<T>(component: Type<T>): ComponentFixture<T>;
-    static deprecatedOverrideProvider(token: any, provider: {
-        useValue: any;
-    }): void;
     /** @deprecated */ static deprecatedOverrideProvider(token: any, provider: {
         useFactory: Function;
         deps: any[];
     }): void;
+    static deprecatedOverrideProvider(token: any, provider: {
+        useValue: any;
+    }): void;
     static get(token: any, notFoundValue?: any): any;
     /** @experimental */ static initTestEnvironment(ngModule: Type<any> | Type<any>[], platform: PlatformRef, aotSummaries?: () => any[]): TestBed;
     static overrideComponent(component: Type<any>, override: MetadataOverride<Component>): typeof TestBed;
@@ -118,12 +117,11 @@ export declare class TestBed implements Injector {
     static overrideProvider(token: any, provider: {
         useFactory: Function;
         deps: any[];
-    }): typeof TestBed;
+    }): void;
     static overrideProvider(token: any, provider: {
         useValue: any;
-    }): typeof TestBed;
+    }): void;
     static overrideTemplate(component: Type<any>, template: string): typeof TestBed;
-    static overrideTemplateUsingTestingModule(component: Type<any>, template: string): typeof TestBed;
     /** @experimental */ static resetTestEnvironment(): void;
     static resetTestingModule(): typeof TestBed;
 }
@@ -139,7 +137,6 @@ export declare type TestModuleMetadata = {
     declarations?: any[];
     imports?: any[];
     schemas?: Array<SchemaMetadata | any[]>;
-    aotSummaries?: () => any[];
 };
 
 /** @experimental */

tools/public_api_guard/platform-webworker/platform-webworker.d.ts

@@ -93,7 +93,7 @@ export declare const WORKER_APP_LOCATION_PROVIDERS: ({
 } | {
     provide: InjectionToken<Promise<any>>;
     useFactory: (platformLocation: WebWorkerPlatformLocation) => Promise<any>;
-    deps: (typeof PlatformLocation)[];
+    deps: typeof PlatformLocation[];
 })[];
 
 /** @experimental */

tools/public_api_guard/router/router.d.ts

@@ -126,7 +126,6 @@ export interface ExtraOptions {
     enableTracing?: boolean;
     errorHandler?: ErrorHandler;
     initialNavigation?: InitialNavigation;
-    onSameUrlNavigation?: 'reload' | 'ignore';
     preloadingStrategy?: any;
     useHash?: boolean;
 }
@@ -328,7 +327,6 @@ export declare class Router {
     errorHandler: ErrorHandler;
     readonly events: Observable<Event>;
     navigated: boolean;
-    onSameUrlNavigation: 'reload' | 'ignore';
     routeReuseStrategy: RouteReuseStrategy;
     readonly routerState: RouterState;
     readonly url: string;

yarn.lock

@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@bazel/typescript@0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.3.1.tgz#54367df8f30fa0fb25e41106eb7aa558534c36dd"
+"@bazel/typescript@0.2.x":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.2.2.tgz#0a0d09924508c946de32e6acdb2b5cc1ee32c506"
   dependencies:
     "@types/node" "7.0.18"
     "@types/source-map" "^0.5.1"
     protobufjs "5.0.0"
-    tsickle "0.25.x"
-    typescript "2.5.x"
+    tsickle "0.24.x"
+    typescript "2.4.x"
 
 "@google-cloud/common@^0.13.0":
   version "0.13.5"
@@ -7102,18 +7102,9 @@ ts-api-guardian@0.2.2:
     minimist "^1.2.0"
     typescript "2.0.10"
 
-tsickle@0.25.5:
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.5.tgz#2891d29f97c4aab1306e06378d8496d1765a4bfe"
-  dependencies:
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.5.6"
-    source-map-support "^0.4.2"
-
-tsickle@0.25.x:
-  version "0.25.5"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.5.tgz#2891d29f97c4aab1306e06378d8496d1765a4bfe"
+tsickle@0.24.x:
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.24.1.tgz#039343b205bf517a333b0703978892f80a7d848e"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -7208,9 +7199,9 @@ typescript@2.0.10:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.10.tgz#ccdd4ed86fd5550a407101a0814012e1b3fac3dd"
 
-typescript@2.5.x:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
+typescript@2.4.2, typescript@2.4.x:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
 
 uglify-js@1.2.6, uglify-js@~1.2.5:
   version "1.2.6"